PatchSet 7511
Date: 2007/08/07 01:44:47
Author: robilad
Branch: HEAD
Tag: (none)
Log:
2007-08-07 Dalibor Topic <[EMAIL PROTECTED]>
Fixed boehm gc to no longer fail most tests. Adapted code
to use a system wide install of the library.
Members:
ChangeLog:1.5009->1.5010
Makefile.in:1.278->1.279
configure:1.589->1.590
configure.ac:1.264->1.265
config/Makefile.in:1.235->1.236
config/config.h.in:1.166->1.167
include/Makefile.in:1.299->1.300
kaffe/Makefile.in:1.189->1.190
kaffe/jvmpi/Makefile.in:1.114->1.115
kaffe/kaffe/Makefile.in:1.213->1.214
kaffe/kaffeh/Makefile.in:1.194->1.195
kaffe/kaffevm/Makefile.in:1.261->1.262
kaffe/kaffevm/gc.h:1.38->1.39
kaffe/kaffevm/boehm-gc/Makefile.am:1.10->1.11
kaffe/kaffevm/boehm-gc/Makefile.in:1.76->1.77
kaffe/kaffevm/boehm-gc/gc-kaffe.c:1.4->1.5
kaffe/kaffevm/boehm-gc/gc-kaffe.h:1.1->1.2
kaffe/kaffevm/boehm-gc/gc-refs.c:1.8->1.9
kaffe/kaffevm/boehm-gc/gc2.c:1.15->1.16
kaffe/kaffevm/boehm-gc/gc2.h:1.4->1.5
kaffe/kaffevm/gcj/Makefile.in:1.169->1.170
kaffe/kaffevm/intrp/Makefile.in:1.178->1.179
kaffe/kaffevm/jit/Makefile.in:1.188->1.189
kaffe/kaffevm/jit3/Makefile.in:1.158->1.159
kaffe/kaffevm/jni/Makefile.in:1.82->1.83
kaffe/kaffevm/kaffe-gc/Makefile.in:1.75->1.76
kaffe/kaffevm/systems/Makefile.in:1.178->1.179
kaffe/kaffevm/systems/beos-native/Makefile.in:1.169->1.170
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.32->1.33
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.175->1.176
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.179->1.180
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.155->1.156
kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.23->1.24
kaffe/kaffevm/systems/unix-pthreads/signal.c:1.27->1.28
kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.95->1.96
kaffe/kaffevm/verifier/Makefile.in:1.81->1.82
kaffe/man/Makefile.in:1.176->1.177
kaffe/scripts/Makefile.in:1.218->1.219
kaffe/scripts/bat/Makefile.in:1.169->1.170
kaffe/scripts/compat/Makefile.in:1.196->1.197
kaffe/xprof/Makefile.in:1.144->1.145
libraries/Makefile.in:1.172->1.173
libraries/clib/Makefile.in:1.193->1.194
libraries/clib/awt/Makefile.in:1.187->1.188
libraries/clib/awt/X/Makefile.in:1.181->1.182
libraries/clib/awt/nano-X/Makefile.in:1.53->1.54
libraries/clib/awt/qt/Makefile.in:1.135->1.136
libraries/clib/awt/xynth/Makefile.in:1.9->1.10
libraries/clib/management/Makefile.in:1.191->1.192
libraries/clib/math/Makefile.in:1.185->1.186
libraries/clib/security/Makefile.in:1.157->1.158
libraries/clib/sound/Makefile.in:1.81->1.82
libraries/clib/sound/alsa/Makefile.in:1.82->1.83
libraries/clib/sound/common/Makefile.in:1.81->1.82
libraries/clib/sound/esd/Makefile.in:1.82->1.83
libraries/clib/zip/Makefile.in:1.190->1.191
libraries/javalib/Makefile.in:1.578->1.579
libraries/javalib/awt-implementations/Makefile.in:1.66->1.67
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.86->1.87
libraries/javalib/dnsjava/Makefile.in:1.12->1.13
libraries/javalib/gmp-math/Makefile.in:1.75->1.76
libraries/javalib/gnu-inet/Makefile.in:1.9->1.10
libraries/javalib/tritonus-sound/Makefile.in:1.12->1.13
libraries/javalib/vmspecific/Makefile.in:1.13->1.14
libraries/javalib/zlib-zip/Makefile.in:1.12->1.13
replace/Makefile.in:1.131->1.132
test/Makefile.in:1.181->1.182
test/internal/Makefile.in:1.157->1.158
test/jni/Makefile.in:1.87->1.88
test/regression/Makefile.in:1.258->1.259
test/regression/compile_time/Makefile.in:1.109->1.110
test/regression/compiler/Makefile.in:1.93->1.94
test/regression/run_time/Makefile.in:1.108->1.109
tools/Makefile.in:1.83->1.84
tools/gjdoc/Makefile.in:1.82->1.83
tools/gjdoc/javalib/Makefile.in:1.100->1.101
tools/javatools/Makefile.in:1.39->1.40
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5009 kaffe/ChangeLog:1.5010
--- kaffe/ChangeLog:1.5009 Mon Aug 6 13:33:11 2007
+++ kaffe/ChangeLog Tue Aug 7 01:44:47 2007
@@ -1,3 +1,64 @@
+2007-08-07 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Fixed boehm gc to no longer fail most tests. Adapted code
+ to use a system wide install of the library.
+
+ * configure.ac (KAFFE_BOEHM_GC): Define when using boehm-gc.
+ Check for gc library. Check for gc/gc.h header. Removed
+ boehm gc configuration option. Removed boehm gc settings block.
+ Removed BOEHMGC_SPECIFIC_FLAGS.
+
+ * kaffe/kaffevm/gc.h (GarbageCollectorInterface_Ops): Set
+ return value of getObjectIndex to gc_alloc_type_t.
+
+ * kaffe/kaffevm/boehm-gc/Makefile.am (SUBDIRS): Don't
+ recurse into boehm subdirectory.
+ (AM_CPPFLAGS) Removed BOEHMGC_SPECIFIC_FLAGS.
+ (libkaffegc_la_LIBADD) Removed, use system install instead.
+
+ * kaffe/kaffevm/boehm-gc/gc-kaffe.c: Cleaned up include files to
+ use system installation. Added missing standard headers.
+ (maybe_finalize, GC_kaffe_malloc) Rewritten to use exported boehm APIs.
+ (GENERAL_MALLOC) Removed.
+ (GC_kaffe_init) Use numerical constants per boehm API spec,
+ rather than TRUE or FALSE.
+
+ * kaffe/kaffevm/boehm-gc/gc-kaffe.h: Include system header for
gc_mark.h.
+
+ * kaffe/kaffevm/boehm-gc/gc-refs.c: Include system header for gc.h.
+ (KaffeGC_addRef, resizeWeakReferenceObject, KaffeGC_rmRef,
KaffeGC_addWeakRef,
+ KaffeGC_rmWeakRef, KaffeGC_clearWeakRef) Use GC_MALLOC_UNCOLLECTABLE
and
+ GC_FREE rather than lower case variants for debuggability.
+
+ * kaffe/kaffevm/boehm-gc/gc2.c: Include system header for gc.h and
gc_mark.h.
+ (KaffeGC_realloc, KaffeGC_free, KaffeGC_malloc)
+ Use GC_REALLOC, GC_FREE and GC_MALLOC_UNCOLLECTABLE rather than lower
case
+ variants for debuggability.
+ (KaffeGC_malloc) Don't use GC_malloc_atomic_uncollectable, as it's only
available
+ conditionally.
+ (KaffeGC_GetObjectBase) Added assert.
+ (KaffeGC_GetObjectIndex) Changed prototype to return gc_alloc_type_t.
+ Added assert.
+ (KaffeGC_GetObjectDescription) Changed type if idx to gc_alloc_type_t,
and
+ simplified.
+ (KaffeGC_Init) Added comments. Use GC_INIT rather than explicitly
calling
+ GC_init. Fixed boehm gc initialization order. Removed unnecessary
setting of
+ heap size to its default unlimited value. Simplified code for setting
the
+ minimal heap size.
+
+ * kaffe/kaffevm/boehm-gc/gc2.h: Include system header for gc.h and
gc_mark.h.
+ (MemDescriptor) Changed type of memtype to gc_alloc_type_t.
+
+ * kaffe/kaffevm/systems/unix-pthreads/lock-impl.c,
+ kaffe/kaffevm/systems/unix-pthreads/signal.c,
+ kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:
+ Include system header for gc.h.
+
+ * kaffe/kaffevm/systems/unix-pthreads/thread-impl.c
(jthread_suspendall):
+ Use GC_disable instead of GC_stop_world and hope for the best.
+ (jthread_unsuspendall) Use GC_enable instead of GC_start_world and hope
+ for the best.
+
2007-08-06 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac: Mention configure.ac in copryght information.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.278 kaffe/Makefile.in:1.279
--- kaffe/Makefile.in:1.278 Wed Jun 13 02:19:29 2007
+++ kaffe/Makefile.in Tue Aug 7 01:44:47 2007
@@ -122,7 +122,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
Index: kaffe/configure
diff -u kaffe/configure:1.589 kaffe/configure:1.590
--- kaffe/configure:1.589 Mon Aug 6 13:33:11 2007
+++ kaffe/configure Tue Aug 7 01:44:47 2007
@@ -996,8 +996,6 @@
USE_GMP
SECURITY_LIBS
GC_NAME
-subdirs
-BOEHMGC_SPECIFIC_FLAGS
HAVE_GCJ_SUPPORT_TRUE
HAVE_GCJ_SUPPORT_FALSE
USE_COMPAT_IFADDRS_TRUE
@@ -1074,6 +1072,7 @@
CFLAGS_WITHOUT_PG
KAFFE_CFLAGS
KAFFE_CCASFLAGS
+subdirs
LTLIBOBJS'
ac_subst_files='cpu_os_frag
cpu_frag
@@ -1098,8 +1097,7 @@
F77
FFLAGS
XMKMF'
-ac_subdirs_all='kaffe/kaffevm/boehm-gc/boehm
-libraries/javalib/external/classpath
+ac_subdirs_all='libraries/javalib/external/classpath
libltdl'
# Initialize some variables set by options.
@@ -1714,9 +1712,6 @@
default=yes
--enable-plugin compile gcjwebplugin (disabled by --disable-plugin)
default=yes
- --disable-boehm-gc-configuration
- Don't run boehm-gc configure script. Boehm gc does
- not work on all platforms. Default is to run it.
--enable-gcj Enable GCJ support
--disable-mips2 Disable MIPS II instructions
--enable-xscale Enable XScale support
@@ -2231,6 +2226,7 @@
ac_header_list="$ac_header_list fcntl.h"
ac_header_list="$ac_header_list features.h"
ac_header_list="$ac_header_list gmp.h"
+ac_header_list="$ac_header_list gc/gc.h"
ac_header_list="$ac_header_list iconv.h"
ac_header_list="$ac_header_list jpeglib.h"
ac_header_list="$ac_header_list kernel/OS.h"
@@ -7177,7 +7173,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7180 "configure"' > conftest.$ac_ext
+ echo '#line 7176 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9730,11 +9726,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9729: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9737: \$? = $ac_status" >&5
+ echo "$as_me:9733: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9998,11 +9994,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10001: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9997: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10005: \$? = $ac_status" >&5
+ echo "$as_me:10001: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10102,11 +10098,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10105: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10101: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10109: \$? = $ac_status" >&5
+ echo "$as_me:10105: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12410,7 +12406,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12413 "configure"
+#line 12409 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12510,7 +12506,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12513 "configure"
+#line 12509 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14850,11 +14846,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14853: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14849: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14857: \$? = $ac_status" >&5
+ echo "$as_me:14853: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14954,11 +14950,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14957: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14953: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14961: \$? = $ac_status" >&5
+ echo "$as_me:14957: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16524,11 +16520,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16527: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16523: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16531: \$? = $ac_status" >&5
+ echo "$as_me:16527: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16628,11 +16624,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16631: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16627: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16635: \$? = $ac_status" >&5
+ echo "$as_me:16631: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18830,11 +18826,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18833: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18829: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18837: \$? = $ac_status" >&5
+ echo "$as_me:18833: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -19098,11 +19094,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19101: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19097: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19105: \$? = $ac_status" >&5
+ echo "$as_me:19101: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -19202,11 +19198,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19205: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19201: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19209: \$? = $ac_status" >&5
+ echo "$as_me:19205: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -25822,6 +25818,22 @@
fi
+
+if test x$GC_NAME = xboehm-gc ; then
+ if test x"$with_threads" != x"unix-pthreads"; then
+ { { echo "$as_me:$LINENO: error: BoehmGC only supports unix-pthreads
threads. Please switch to unix-pthreads using --with-threads=unix-pthreads or
use the standard kaffe's gc." >&5
+echo "$as_me: error: BoehmGC only supports unix-pthreads threads. Please
switch to unix-pthreads using --with-threads=unix-pthreads or use the standard
kaffe's gc." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define KAFFE_BOEHM_GC 1
+_ACEOF
+
+fi
+
+
# Check whether --enable-portable-native-sync was given.
if test "${enable_portable_native_sync+set}" = set; then
enableval=$enable_portable_native_sync; case "${enableval}" in
@@ -30171,6 +30183,82 @@
;;
esac
+KSAVE_LIBS="$LIBS"
+LIBS="$VM_LIBS $KSAVE_LIBS"
+
+{ echo "$as_me:$LINENO: checking for GC_free in -lgc" >&5
+echo $ECHO_N "checking for GC_free in -lgc... $ECHO_C" >&6; }
+if test "${ac_cv_lib_gc_GC_free+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgc $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char GC_free ();
+int
+main ()
+{
+return GC_free ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_gc_GC_free=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gc_GC_free=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_free" >&5
+echo "${ECHO_T}$ac_cv_lib_gc_GC_free" >&6; }
+if test $ac_cv_lib_gc_GC_free = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGC 1
+_ACEOF
+
+ LIBS="-lgc $LIBS"
+
+fi
+
+VM_LIBS=`echo "$LIBS" | sed "s% $KSAVE_LIBS$%%"`
+LIBS="$KSAVE_LIBS"
+
@@ -31411,6 +31499,10 @@
+
+
+
+
# check sys/sysctl.h seperately, as it requires other headers on at least
OpenBSD
for ac_header in sys/sysctl.h
@@ -33715,66 +33807,6 @@
gc_frag=$srcdir/kaffe/kaffevm/$GC_NAME/Makefile.frag
-
-if test x"${GC_NAME}" = x"boehm-gc"; then
- if test x"$with_threads" != x"unix-pthreads"; then
- { { echo "$as_me:$LINENO: error: BoehmGC only supports
unix-pthreads threads. Please switch to unix-pthreads using
--with-threads=unix-pthreads or use the standard kaffe's gc." >&5
-echo "$as_me: error: BoehmGC only supports unix-pthreads threads. Please
switch to unix-pthreads using --with-threads=unix-pthreads or use the standard
kaffe's gc." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- BOEHMGC_SPECIFIC_FLAGS="-DSILENT -DATOMIC_UNCOLLECTABLE
-DGC_GCJ_SUPPORT -DALL_INTERIOR_POINTERS"
-
- if test x"${Khost_cpu+set}" = "xi686"; then
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DUSE_I686_PREFETCH"
- fi
-
- case "$Khost_os" in
- solaris*)
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS"
- ;;
- irix*)
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_IRIX_THREADS"
- ;;
- hpux*)
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_HPUX_THREADS"
- ;;
- linux*)
- if test "$ac_cv_c_compile_value_glibc" -le "2"; then
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_LINUX_THREADS"
- if test "$Khost_cpu" = "i386"; then
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DTHREAD_LOCAL_ALLOC"
- fi
- fi
- ;;
- darwin*)
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_DARWIN_THREADS"
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DTHREAD_LOCAL_ALLOC"
- ;;
- *)
- { { echo "$as_me:$LINENO: error: Threads support for
$Khost_os unavailable in the boehm-gc. Please use the standard kaffe's gc." >&5
-echo "$as_me: error: Threads support for $Khost_os unavailable in the
boehm-gc. Please use the standard kaffe's gc." >&2;}
- { (exit 1); exit 1; }; }
- esac
-
- ac_configure_args="$ac_configure_args --enable-libgc-convenience"
-fi
-
-# Check whether --enable-boehm-gc-configuration was given.
-if test "${enable_boehm_gc_configuration+set}" = set; then
- enableval=$enable_boehm_gc_configuration;
-else
- enable_boehm_gc_configuration=yes
-fi
-
-
-if test x"$enable_boehm_gc_configuration" = x"yes" ; then
- subdirs="$subdirs kaffe/kaffevm/boehm-gc/boehm"
-
-fi
-
-
-
{ echo "$as_me:$LINENO: result: $GC_NAME" >&5
echo "${ECHO_T}$GC_NAME" >&6; }
@@ -49734,8 +49766,6 @@
USE_GMP!$USE_GMP$ac_delim
SECURITY_LIBS!$SECURITY_LIBS$ac_delim
GC_NAME!$GC_NAME$ac_delim
-subdirs!$subdirs$ac_delim
-BOEHMGC_SPECIFIC_FLAGS!$BOEHMGC_SPECIFIC_FLAGS$ac_delim
HAVE_GCJ_SUPPORT_TRUE!$HAVE_GCJ_SUPPORT_TRUE$ac_delim
HAVE_GCJ_SUPPORT_FALSE!$HAVE_GCJ_SUPPORT_FALSE$ac_delim
USE_COMPAT_IFADDRS_TRUE!$USE_COMPAT_IFADDRS_TRUE$ac_delim
@@ -49809,6 +49839,8 @@
kaffe_TRANSF!$kaffe_TRANSF$ac_delim
kaffeh_TRANSF!$kaffeh_TRANSF$ac_delim
kaffebin_TRANSF!$kaffebin_TRANSF$ac_delim
+CFLAGS_WITHOUT_PG!$CFLAGS_WITHOUT_PG$ac_delim
+KAFFE_CFLAGS!$KAFFE_CFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -49850,13 +49882,12 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-CFLAGS_WITHOUT_PG!$CFLAGS_WITHOUT_PG$ac_delim
-KAFFE_CFLAGS!$KAFFE_CFLAGS$ac_delim
KAFFE_CCASFLAGS!$KAFFE_CCASFLAGS$ac_delim
+subdirs!$subdirs$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.264 kaffe/configure.ac:1.265
--- kaffe/configure.ac:1.264 Mon Aug 6 13:33:12 2007
+++ kaffe/configure.ac Tue Aug 7 01:44:47 2007
@@ -731,6 +731,16 @@
[ GC_NAME="$withval" ]
)
+
+if test x$GC_NAME = xboehm-gc ; then
+ if test x"$with_threads" != x"unix-pthreads"; then
+ AC_MSG_ERROR(BoehmGC only supports unix-pthreads threads. Please switch
to unix-pthreads using --with-threads=unix-pthreads or use the standard kaffe's
gc.)
+ fi
+
+ AC_DEFINE([KAFFE_BOEHM_GC], 1, [Defined if we are using the Boehm-Weiser
garbage collector])
+fi
+
+
dnl -----------------------------------------------------------
dnl This sets the build-time default, which can now be overridden
dnl by setting the system property gnu.classpath.awt.gtk.portable.native.sync
@@ -1122,8 +1132,7 @@
AC_CHECK_LIBRARY(gcc,__moddi3,VM_LIBS);;
esac
-dnl Check for libraries for native library.
-dnl None required.
+AC_CHECK_LIBRARY([gc],[GC_free],[VM_LIBS])
dnl Check for libraries for net library.
AC_CHECK_FUNCS_ONCE(gethostname)
@@ -1171,6 +1180,7 @@
fcntl.h \
features.h \
gmp.h \
+gc/gc.h \
iconv.h \
jpeglib.h \
kernel/OS.h \
@@ -1315,60 +1325,6 @@
gc_frag=$srcdir/kaffe/kaffevm/$GC_NAME/Makefile.frag
AC_SUBST(GC_NAME)
AC_SUBST_FILE(gc_frag)
-
-dnl If the user has chosen the boehm-gc, build the specific flags.
-if test x"${GC_NAME}" = x"boehm-gc"; then
- if test x"$with_threads" != x"unix-pthreads"; then
- AC_MSG_ERROR(BoehmGC only supports unix-pthreads threads.
Please switch to unix-pthreads using --with-threads=unix-pthreads or use the
standard kaffe's gc.)
- fi
-
- BOEHMGC_SPECIFIC_FLAGS="-DSILENT -DATOMIC_UNCOLLECTABLE
-DGC_GCJ_SUPPORT -DALL_INTERIOR_POINTERS"
-
- if test x"${Khost_cpu+set}" = "xi686"; then
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DUSE_I686_PREFETCH"
- fi
-
- case "$Khost_os" in
- solaris*)
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS"
- ;;
- irix*)
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_IRIX_THREADS"
- ;;
- hpux*)
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_HPUX_THREADS"
- ;;
- linux*)
- if test "$ac_cv_c_compile_value_glibc" -le "2"; then
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_LINUX_THREADS"
- if test "$Khost_cpu" = "i386"; then
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DTHREAD_LOCAL_ALLOC"
- fi
- fi
- ;;
- darwin*)
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DGC_DARWIN_THREADS"
- BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS
-DTHREAD_LOCAL_ALLOC"
- ;;
- *)
- AC_MSG_ERROR(Threads support for $Khost_os unavailable
in the boehm-gc. Please use the standard kaffe's gc.)
- esac
-
- ac_configure_args="$ac_configure_args --enable-libgc-convenience"
-fi
-
-AC_ARG_ENABLE([boehm-gc-configuration],
- AS_HELP_STRING([--disable-boehm-gc-configuration],
- [Don't run boehm-gc configure script. Boehm gc
does not work on all platforms. Default is to run it.]),
- [],
- [enable_boehm_gc_configuration=yes])
-
-if test x"$enable_boehm_gc_configuration" = x"yes" ; then
- AC_CONFIG_SUBDIRS([kaffe/kaffevm/boehm-gc/boehm])
-fi
-
-AC_SUBST(BOEHMGC_SPECIFIC_FLAGS)
-
AC_MSG_RESULT($GC_NAME)
dnl =========================================================================
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.235 kaffe/config/Makefile.in:1.236
--- kaffe/config/Makefile.in:1.235 Wed Jun 13 02:19:30 2007
+++ kaffe/config/Makefile.in Tue Aug 7 01:44:48 2007
@@ -92,7 +92,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.166 kaffe/config/config.h.in:1.167
--- kaffe/config/config.h.in:1.166 Thu Jun 14 13:17:19 2007
+++ kaffe/config/config.h.in Tue Aug 7 01:44:48 2007
@@ -166,6 +166,9 @@
/* Enable GCJ support. */
#undef HAVE_GCJ_SUPPORT
+/* Define to 1 if you have the <gc/gc.h> header file. */
+#undef HAVE_GC_GC_H
+
/* Define to 1 if you have the `getaddrinfo' function. */
#undef HAVE_GETADDRINFO
@@ -300,6 +303,9 @@
/* Define to 1 if you have the `ffi' library (-lffi). */
#undef HAVE_LIBFFI
+/* Define to 1 if you have the `gc' library (-lgc). */
+#undef HAVE_LIBGC
+
/* Define to 1 if you have the `gcc' library (-lgcc). */
#undef HAVE_LIBGCC
@@ -786,6 +792,9 @@
/* additional directories to search for native jni libraries */
#undef JNI_LIBRARY_PATH
+
+/* Defined if we are using the Boehm-Weiser garbage collector */
+#undef KAFFE_BOEHM_GC
/* Defined on NetBSD because sigwait needs the handle not to be registered */
#undef KAFFE_BUGGY_NETBSD_SIGWAIT
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.299 kaffe/include/Makefile.in:1.300
--- kaffe/include/Makefile.in:1.299 Wed Jun 13 02:19:30 2007
+++ kaffe/include/Makefile.in Tue Aug 7 01:44:48 2007
@@ -107,7 +107,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.189 kaffe/kaffe/Makefile.in:1.190
--- kaffe/kaffe/Makefile.in:1.189 Wed Jun 13 02:19:30 2007
+++ kaffe/kaffe/Makefile.in Tue Aug 7 01:44:48 2007
@@ -96,7 +96,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.114 kaffe/kaffe/jvmpi/Makefile.in:1.115
--- kaffe/kaffe/jvmpi/Makefile.in:1.114 Sun Jul 1 19:09:13 2007
+++ kaffe/kaffe/jvmpi/Makefile.in Tue Aug 7 01:44:48 2007
@@ -107,7 +107,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.213 kaffe/kaffe/kaffe/Makefile.in:1.214
--- kaffe/kaffe/kaffe/Makefile.in:1.213 Mon Jul 2 02:58:28 2007
+++ kaffe/kaffe/kaffe/Makefile.in Tue Aug 7 01:44:48 2007
@@ -108,7 +108,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.194
kaffe/kaffe/kaffeh/Makefile.in:1.195
--- kaffe/kaffe/kaffeh/Makefile.in:1.194 Wed Jun 13 02:19:31 2007
+++ kaffe/kaffe/kaffeh/Makefile.in Tue Aug 7 01:44:48 2007
@@ -114,7 +114,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.261
kaffe/kaffe/kaffevm/Makefile.in:1.262
--- kaffe/kaffe/kaffevm/Makefile.in:1.261 Sun Jul 1 19:09:13 2007
+++ kaffe/kaffe/kaffevm/Makefile.in Tue Aug 7 01:44:48 2007
@@ -172,7 +172,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
Index: kaffe/kaffe/kaffevm/gc.h
diff -u kaffe/kaffe/kaffevm/gc.h:1.38 kaffe/kaffe/kaffevm/gc.h:1.39
--- kaffe/kaffe/kaffevm/gc.h:1.38 Sun Jul 1 19:09:13 2007
+++ kaffe/kaffe/kaffevm/gc.h Tue Aug 7 01:44:48 2007
@@ -135,7 +135,7 @@
void (*markObject)(Collector *, void *gc_info, const void* obj);
uint32 (*getObjectSize)(Collector *, const void* obj);
const char* (*getObjectDescription)(Collector *, const void* obj);
- int (*getObjectIndex)(Collector *, const void* obj);
+ gc_alloc_type_t (*getObjectIndex)(Collector *, const void* obj);
void* (*getObjectBase)(Collector *, void* obj);
void (*registerFixedTypeByIndex)(Collector *,
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.am
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.10
kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.11
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.10 Sun Jul 9 16:58:46 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.am Tue Aug 7 01:44:48 2007
@@ -8,8 +8,6 @@
AM_CFLAGS= $(KAFFE_CFLAGS)
-SUBDIRS= boehm
-
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_builddir)/config \
@@ -18,10 +16,9 @@
-I$(top_builddir)/include \
-I$(top_srcdir)/kaffe/kaffevm \
-I$(top_srcdir)/kaffe/jvmpi \
- -I$(top_srcdir)/kaffe/kaffevm/boehm-gc/boehm/include \
-I$(top_srcdir)/config/$(Khost_cpu) \
- -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) \
- $(BOEHMGC_SPECIFIC_FLAGS)
+ -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os)
+
native_LTLIBRARIES = libkaffegc.la
@@ -29,9 +26,6 @@
$(KVMLIBFLAGS) \
-export-dynamic \
-release $(PACKAGE_VERSION)
-
-libkaffegc_la_LIBADD= \
- boehm/libgc.la
libkaffegc_la_SOURCES= \
gc2.c \
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.76
kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.77
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.76 Wed Jun 13 02:19:31 2007
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Tue Aug 7 01:44:48 2007
@@ -77,7 +77,7 @@
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
-libkaffegc_la_DEPENDENCIES = boehm/libgc.la
+libkaffegc_la_LIBADD =
am_libkaffegc_la_OBJECTS = gc2.lo gc-refs.lo gc-kaffe.lo
libkaffegc_la_OBJECTS = $(am_libkaffegc_la_OBJECTS)
libkaffegc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -96,18 +96,8 @@
$(LDFLAGS) -o $@
SOURCES = $(libkaffegc_la_SOURCES)
DIST_SOURCES = $(libkaffegc_la_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -123,7 +113,6 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@@ -322,7 +311,6 @@
top_srcdir = @top_srcdir@
with_engine = @with_engine@
AM_CFLAGS = $(KAFFE_CFLAGS)
-SUBDIRS = boehm
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_builddir)/config \
@@ -331,10 +319,8 @@
-I$(top_builddir)/include \
-I$(top_srcdir)/kaffe/kaffevm \
-I$(top_srcdir)/kaffe/jvmpi \
- -I$(top_srcdir)/kaffe/kaffevm/boehm-gc/boehm/include \
-I$(top_srcdir)/config/$(Khost_cpu) \
- -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) \
- $(BOEHMGC_SPECIFIC_FLAGS)
+ -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os)
native_LTLIBRARIES = libkaffegc.la
libkaffegc_la_LDFLAGS = \
@@ -342,9 +328,6 @@
-export-dynamic \
-release $(PACKAGE_VERSION)
-libkaffegc_la_LIBADD = \
- boehm/libgc.la
-
libkaffegc_la_SOURCES = \
gc2.c \
gc2.h \
@@ -353,7 +336,7 @@
gc-kaffe.c \
gc-kaffe.h
-all: all-recursive
+all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -453,76 +436,6 @@
clean-libtool:
-rm -rf .libs _libs
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
