[kaffe] CVS kaffe (guilhem): Fix for boehm-gc layer

Kaffe CVS cvs-commits at kaffe.org
Wed Jul 26 23:40:18 PDT 2006


PatchSet 7369 
Date: 2006/07/27 06:31:08
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Fix for boehm-gc layer

        * kaffe/kaffevm/boehm-gc/gc-refs.c
        (KaffeGC_addWeakRef, resizeWeakReferenceObject): Use the right
        allocation routine.

        * kaffe/kaffevm/boehm-gc/boehm/configure.ac: Updated.

        * kaffe/kaffevm/boehm-gc/boehm/configure: Regenerated.

Members: 
	ChangeLog:1.4873->1.4874 
	kaffe/kaffevm/boehm-gc/gc-refs.c:1.5->1.6 
	kaffe/kaffevm/boehm-gc/boehm/configure:1.15->1.16 
	kaffe/kaffevm/boehm-gc/boehm/configure.ac:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4873 kaffe/ChangeLog:1.4874
--- kaffe/ChangeLog:1.4873	Sun Jul 23 15:48:20 2006
+++ kaffe/ChangeLog	Thu Jul 27 06:31:08 2006
@@ -1,3 +1,13 @@
+2006-07-27  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* kaffe/kaffevm/boehm-gc/gc-refs.c
+	(KaffeGC_addWeakRef, resizeWeakReferenceObject): Use the right
+	allocation routine.
+
+	* kaffe/kaffevm/boehm-gc/boehm/configure.ac: Updated.
+
+	* kaffe/kaffevm/boehm-gc/boehm/configure: Regenerated.
+	
 2006-07-23  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/clib/native/ZipFile.c: Removed. Moved ...
Index: kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c
diff -u kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c:1.5 kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c:1.6
--- kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c:1.5	Sat Oct  1 18:25:04 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c	Thu Jul 27 06:31:11 2006
@@ -219,7 +219,7 @@
   }
 
   /* Not found - create a new one */
-  obj = (weakRefObject*)GC_malloc_uncollectable(sizeof(weakRefObject));
+  obj = (weakRefObject*)GC_malloc_atomic_uncollectable(sizeof(weakRefObject));
   if (obj == NULL)
     {
       unlockStaticMutex(&weakRefLock);
@@ -229,7 +229,7 @@
   obj->mem = mem;
   obj->ref = 1;
   unlockStaticMutex(&weakRefLock);
-  obj->allRefs = (void ***)GC_malloc(sizeof(void ***));
+  obj->allRefs = (void ***)GC_malloc_uncollectable(sizeof(void ***));
   lockStaticMutex(&weakRefLock);
   obj->allRefs[0] = refobj;
   obj->next = weakRefObjects.hash[idx];
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/configure
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/configure:1.15 kaffe/kaffe/kaffevm/boehm-gc/boehm/configure:1.16
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/configure:1.15	Fri Apr 14 22:23:04 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/configure	Thu Jul 27 06:31:11 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.5 .
+# From configure.ac Revision: 1.3 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gc 6.6.
+# Generated by GNU Autoconf 2.59 for gc 6.7.
 #
 # Report bugs to <Hans.Boehm at hp.com>.
 #
@@ -429,8 +429,8 @@
 # Identity of this package.
 PACKAGE_NAME='gc'
 PACKAGE_TARNAME='gc'
-PACKAGE_VERSION='6.6'
-PACKAGE_STRING='gc 6.6'
+PACKAGE_VERSION='6.7'
+PACKAGE_STRING='gc 6.7'
 PACKAGE_BUGREPORT='Hans.Boehm at hp.com'
 
 ac_unique_file="gcj_mlc.c"
@@ -956,7 +956,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gc 6.6 to adapt to many kinds of systems.
+\`configure' configures gc 6.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1023,7 +1023,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gc 6.6:";;
+     short | recursive ) echo "Configuration of gc 6.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1167,7 +1167,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-gc configure 6.6
+gc configure 6.7
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1181,7 +1181,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gc $as_me 6.6, which was
+It was created by gc $as_me 6.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1953,7 +1953,7 @@
 
 # Define the identity of the package.
  PACKAGE='gc'
- VERSION='6.6'
+ VERSION='6.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3998,7 +3998,7 @@
 _ACEOF
 
 	;;
-     *-*-linux*|*-*-uclinux*)
+     *-*-linux*)
 	cat >>confdefs.h <<\_ACEOF
 #define GC_LINUX_THREADS 1
 _ACEOF
@@ -4051,6 +4051,23 @@
 	INCLUDES="$INCLUDES -pthread"
 	THREADDLLIBS=-pthread
       	;;
+     *-*-netbsd*)
+	{ echo "$as_me:$LINENO: WARNING: \"Only on NetBSD 2.0 or later.\"" >&5
+echo "$as_me: WARNING: \"Only on NetBSD 2.0 or later.\"" >&2;}
+	cat >>confdefs.h <<\_ACEOF
+#define GC_NETBSD_THREADS 1
+_ACEOF
+
+	cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
+
+	cat >>confdefs.h <<\_ACEOF
+#define _PTHREADS 1
+_ACEOF
+
+	THREADDLLIBS="-lpthread -lrt"
+	;;
      *-*-solaris*)
 	cat >>confdefs.h <<\_ACEOF
 #define GC_SOLARIS_THREADS 1
@@ -6067,7 +6084,7 @@
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6070 "configure"' > conftest.$ac_ext
+  echo '#line 6087 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6643,7 +6660,7 @@
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:6646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:6663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -8578,7 +8595,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8581 "configure"
+#line 8598 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8676,7 +8693,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8679 "configure"
+#line 8696 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10300,7 +10317,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by gc $as_me 6.6, which was
+This file was extended by gc $as_me 6.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10358,7 +10375,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gc config.status 6.6
+gc config.status 6.7
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.ac
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.ac:1.5 kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.ac:1.6
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.ac:1.5	Thu Mar 23 19:26:13 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.ac	Thu Jul 27 06:31:12 2006
@@ -17,12 +17,12 @@
 # Initialization
 # ==============
 
-AC_INIT(gc,6.6,Hans.Boehm at hp.com) 
+AC_INIT(gc,6.7,Hans.Boehm at hp.com) 
     ## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)?
 AC_CONFIG_SRCDIR(gcj_mlc.c)
 AC_CANONICAL_TARGET 
 AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.5 $)
+AC_REVISION($Revision: 1.6 $)
 GC_SET_VERSION
 AM_INIT_AUTOMAKE
 
@@ -86,7 +86,7 @@
 	fi
 	AC_DEFINE(THREAD_LOCAL_ALLOC)
 	;;
-     *-*-linux*|*-*-uclinux*)
+     *-*-linux*)
 	AC_DEFINE(GC_LINUX_THREADS)
 	AC_DEFINE(_REENTRANT)
 	;;
@@ -110,6 +110,13 @@
 	INCLUDES="$INCLUDES -pthread"
 	THREADDLLIBS=-pthread
       	;;
+     *-*-netbsd*)
+	AC_MSG_WARN("Only on NetBSD 2.0 or later.")
+	AC_DEFINE(GC_NETBSD_THREADS)
+	AC_DEFINE(_REENTRANT)
+	AC_DEFINE(_PTHREADS)
+	THREADDLLIBS="-lpthread -lrt"
+	;;
      *-*-solaris*)
 	AC_DEFINE(GC_SOLARIS_THREADS)
 	AC_DEFINE(GC_SOLARIS_PTHREADS)




More information about the kaffe mailing list