[kaffe] CVS kaffe (guilhem): New standalone library for the GC.
Kaffe CVS
cvs-commits at kaffe.org
Mon Jul 12 12:18:52 PDT 2004
PatchSet 4956
Date: 2004/07/12 17:51:02
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
New standalone library for the GC.
* configure.ac: Added a point to chose different
garbage collector.
* kaffe/kaffevm/mem/Makefile.am,
kaffe/kaffevm/mem/Makefile.frag: New files.
* kaffe/kaffevm/Makefile.am: Added libkaffevmgc.la
dependency and removed references to gc-mem.c
* kaffe/kaffevm/gc.c: Removed gc-incremental.c
Added gc.h
* Makefile.in,
configure
config/Makefile.in,
include/Makefile.in,
kaffe/Makefile.in,
kaffe/jvmpi/Makefile.in,
kaffe/kaffe/Makefile.in,
kaffe/kaffeh/Makefile.in,
kaffe/kaffevm/Makefile.in,
kaffe/kaffevm/gcj/Makefile.in,
kaffe/kaffevm/intrp/Makefile.in,
kaffe/kaffevm/jit/Makefile.in,
kaffe/kaffevm/jit3/Makefile.in,
kaffe/kaffevm/jni/Makefile.in,
kaffe/kaffevm/systems/Makefile.in,
kaffe/kaffevm/systems/beos-native/Makefile.in,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
kaffe/kaffevm/verifier/Makefile.in,
kaffe/man/Makefile.in,
kaffe/scripts/Makefile.in,
kaffe/scripts/bat/Makefile.in,
kaffe/scripts/compat/Makefile.in,
kaffe/xprof/Makefile.in,
libraries/Makefile.in,
libraries/clib/Makefile.in,
libraries/clib/awt/Makefile.in,
libraries/clib/awt/X/Makefile.in,
libraries/clib/awt/qt/Makefile.in,
libraries/clib/io/Makefile.in,
libraries/clib/libxmlj/Makefile.in,
libraries/clib/management/Makefile.in,
libraries/clib/math/Makefile.in,
libraries/clib/native/Makefile.in,
libraries/clib/net/Makefile.in,
libraries/clib/nio/Makefile.in,
libraries/clib/security/Makefile.in,
libraries/clib/sound/Makefile.in,
libraries/clib/sound/alsa/Makefile.in,
libraries/clib/sound/common/Makefile.in,
libraries/clib/sound/esd/Makefile.in,
libraries/clib/zip/Makefile.in,
libraries/extensions/Makefile.in,
libraries/extensions/comm/Makefile.in,
libraries/extensions/comm/javalib/Makefile.in,
libraries/extensions/microsoft/Makefile.in,
libraries/extensions/microsoft/clib/Makefile.in,
libraries/extensions/microsoft/javalib/Makefile.in,
libraries/extensions/pjava/Makefile.in,
libraries/extensions/pjava/javalib/Makefile.in,
libraries/extensions/servlet/Makefile.in,
libraries/extensions/servlet/javalib/Makefile.in,
libraries/javalib/Makefile.in,
replace/Makefile.in,
test/Makefile.in,
test/internal/Makefile.in,
test/jni/Makefile.in,
test/regression/Makefile.in,
test/regression/compile_time/Makefile.in,
test/regression/compiler/Makefile.in,
test/regression/run_time/Makefile.in,
tools/Makefile.in,
tools/gjdoc/Makefile.in,
tools/gjdoc/javalib/Makefile.in: Regenerated.
Members:
ChangeLog:1.2520->1.2521
Makefile.in:1.166->1.167
configure:1.352->1.353
configure.ac:1.50->1.51
config/Makefile.in:1.142->1.143
config/mips/irix5/md.h:1.4->1.5
include/Makefile.in:1.168->1.169
kaffe/Makefile.in:1.118->1.119
kaffe/jvmpi/Makefile.in:1.40->1.41
kaffe/kaffe/Makefile.in:1.135->1.136
kaffe/kaffeh/Makefile.in:1.117->1.118
kaffe/kaffevm/Makefile.am:1.64->1.65
kaffe/kaffevm/Makefile.in:1.162->1.163
kaffe/kaffevm/gc.c:1.5->1.6
kaffe/kaffevm/gcj/Makefile.in:1.98->1.99
kaffe/kaffevm/intrp/Makefile.in:1.106->1.107
kaffe/kaffevm/jit/Makefile.in:1.112->1.113
kaffe/kaffevm/jit3/Makefile.in:1.83->1.84
kaffe/kaffevm/jni/Makefile.in:1.10->1.11
kaffe/kaffevm/mem/Makefile.am:INITIAL->1.1
kaffe/kaffevm/mem/Makefile.frag:INITIAL->1.1
kaffe/kaffevm/mem/Makefile.in:INITIAL->1.1
kaffe/kaffevm/systems/Makefile.in:1.106->1.107
kaffe/kaffevm/systems/beos-native/Makefile.in:1.98->1.99
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.104->1.105
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.108->1.109
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.79->1.80
kaffe/kaffevm/verifier/Makefile.in:1.9->1.10
kaffe/man/Makefile.in:1.104->1.105
kaffe/scripts/Makefile.in:1.141->1.142
kaffe/scripts/bat/Makefile.in:1.97->1.98
kaffe/scripts/compat/Makefile.in:1.122->1.123
kaffe/xprof/Makefile.in:1.72->1.73
libraries/Makefile.in:1.101->1.102
libraries/clib/Makefile.in:1.110->1.111
libraries/clib/awt/Makefile.in:1.114->1.115
libraries/clib/awt/X/Makefile.in:1.105->1.106
libraries/clib/awt/qt/Makefile.in:1.61->1.62
libraries/clib/io/Makefile.in:1.109->1.110
libraries/clib/libxmlj/Makefile.in:1.13->1.14
libraries/clib/management/Makefile.in:1.117->1.118
libraries/clib/math/Makefile.in:1.112->1.113
libraries/clib/native/Makefile.in:1.145->1.146
libraries/clib/net/Makefile.in:1.121->1.122
libraries/clib/nio/Makefile.in:1.36->1.37
libraries/clib/security/Makefile.in:1.83->1.84
libraries/clib/sound/Makefile.in:1.10->1.11
libraries/clib/sound/alsa/Makefile.in:1.10->1.11
libraries/clib/sound/common/Makefile.in:1.10->1.11
libraries/clib/sound/esd/Makefile.in:1.10->1.11
libraries/clib/zip/Makefile.in:1.114->1.115
libraries/extensions/Makefile.in:1.93->1.94
libraries/extensions/comm/Makefile.in:1.87->1.88
libraries/extensions/comm/javalib/Makefile.in:1.87->1.88
libraries/extensions/microsoft/Makefile.in:1.79->1.80
libraries/extensions/microsoft/clib/Makefile.in:1.83->1.84
libraries/extensions/microsoft/javalib/Makefile.in:1.80->1.81
libraries/extensions/pjava/Makefile.in:1.87->1.88
libraries/extensions/pjava/javalib/Makefile.in:1.87->1.88
libraries/extensions/servlet/Makefile.in:1.87->1.88
libraries/extensions/servlet/javalib/Makefile.in:1.87->1.88
libraries/javalib/Makefile.in:1.271->1.272
replace/Makefile.in:1.52->1.53
test/Makefile.in:1.108->1.109
test/internal/Makefile.in:1.66->1.67
test/jni/Makefile.in:1.2->1.3
test/regression/Makefile.in:1.176->1.177
test/regression/compile_time/Makefile.in:1.38->1.39
test/regression/compiler/Makefile.in:1.19->1.20
test/regression/run_time/Makefile.in:1.37->1.38
tools/Makefile.in:1.11->1.12
tools/gjdoc/Makefile.in:1.11->1.12
tools/gjdoc/javalib/Makefile.in:1.14->1.15
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2520 kaffe/ChangeLog:1.2521
--- kaffe/ChangeLog:1.2520 Mon Jul 12 16:34:36 2004
+++ kaffe/ChangeLog Mon Jul 12 17:51:02 2004
@@ -1,3 +1,83 @@
+2004-07-12 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * configure.ac: Added a point to chose different
+ garbage collector.
+
+ * kaffe/kaffevm/mem/Makefile.am,
+ kaffe/kaffevm/mem/Makefile.frag: New files.
+
+ * kaffe/kaffevm/Makefile.am: Added libkaffevmgc.la
+ dependency and removed references to gc-mem.c
+
+ * kaffe/kaffevm/gc.c: Removed gc-incremental.c
+ Added gc.h
+
+ * Makefile.in,
+ configure
+ config/Makefile.in,
+ include/Makefile.in,
+ kaffe/Makefile.in,
+ kaffe/jvmpi/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/kaffeh/Makefile.in,
+ kaffe/kaffevm/Makefile.in,
+ kaffe/kaffevm/gcj/Makefile.in,
+ kaffe/kaffevm/intrp/Makefile.in,
+ kaffe/kaffevm/jit/Makefile.in,
+ kaffe/kaffevm/jit3/Makefile.in,
+ kaffe/kaffevm/jni/Makefile.in,
+ kaffe/kaffevm/systems/Makefile.in,
+ kaffe/kaffevm/systems/beos-native/Makefile.in,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+ kaffe/kaffevm/verifier/Makefile.in,
+ kaffe/man/Makefile.in,
+ kaffe/scripts/Makefile.in,
+ kaffe/scripts/bat/Makefile.in,
+ kaffe/scripts/compat/Makefile.in,
+ kaffe/xprof/Makefile.in,
+ libraries/Makefile.in,
+ libraries/clib/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/clib/awt/X/Makefile.in,
+ libraries/clib/awt/qt/Makefile.in,
+ libraries/clib/io/Makefile.in,
+ libraries/clib/libxmlj/Makefile.in,
+ libraries/clib/management/Makefile.in,
+ libraries/clib/math/Makefile.in,
+ libraries/clib/native/Makefile.in,
+ libraries/clib/net/Makefile.in,
+ libraries/clib/nio/Makefile.in,
+ libraries/clib/security/Makefile.in,
+ libraries/clib/sound/Makefile.in,
+ libraries/clib/sound/alsa/Makefile.in,
+ libraries/clib/sound/common/Makefile.in,
+ libraries/clib/sound/esd/Makefile.in,
+ libraries/clib/zip/Makefile.in,
+ libraries/extensions/Makefile.in,
+ libraries/extensions/comm/Makefile.in,
+ libraries/extensions/comm/javalib/Makefile.in,
+ libraries/extensions/microsoft/Makefile.in,
+ libraries/extensions/microsoft/clib/Makefile.in,
+ libraries/extensions/microsoft/javalib/Makefile.in,
+ libraries/extensions/pjava/Makefile.in,
+ libraries/extensions/pjava/javalib/Makefile.in,
+ libraries/extensions/servlet/Makefile.in,
+ libraries/extensions/servlet/javalib/Makefile.in,
+ libraries/javalib/Makefile.in,
+ replace/Makefile.in,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/jni/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/compiler/Makefile.in,
+ test/regression/run_time/Makefile.in,
+ tools/Makefile.in,
+ tools/gjdoc/Makefile.in,
+ tools/gjdoc/javalib/Makefile.in: Regenerated.
+
2004-07-12 Dalibor Topic <robilad at kaffe.org>
* config/Makefile.am:
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.166 kaffe/Makefile.in:1.167
--- kaffe/Makefile.in:1.166 Sun Jul 11 08:54:17 2004
+++ kaffe/Makefile.in Mon Jul 12 17:51:04 2004
@@ -170,6 +170,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/configure
diff -u kaffe/configure:1.352 kaffe/configure:1.353
--- kaffe/configure:1.352 Sun Jul 11 20:15:27 2004
+++ kaffe/configure Mon Jul 12 17:51:05 2004
@@ -490,8 +490,8 @@
#endif"
ac_subdirs_all="$ac_subdirs_all libltdl"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS BINRELOC_CFLAGS ENABLE_BINRELOC_TRUE ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS'
-ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C GC_NAME CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS BINRELOC_CFLAGS ENABLE_BINRELOC_TRUE ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS'
+ac_subst_files='cpu_os_frag cpu_frag gc_frag engine_frag threads_frag'
# Initialize some variables set by options.
ac_init_help=
@@ -26279,6 +26279,14 @@
+gc_frag=$srcdir/kaffe/kaffevm/mem/Makefile.frag
+
+
+GC_NAME=mem
+
+
+
+
# Check whether --with-engine or --without-engine was given.
if test "${with_engine+set}" = set; then
@@ -55357,6 +55365,8 @@
ac_config_files="$ac_config_files kaffe/kaffevm/verifier/Makefile"
+ ac_config_files="$ac_config_files kaffe/kaffevm/mem/Makefile"
+
ac_config_files="$ac_config_files kaffe/kaffevm/jni/Makefile"
ac_config_files="$ac_config_files kaffe/kaffe/Makefile"
@@ -56243,6 +56253,7 @@
"kaffe/kaffevm/systems/beos-native/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/kaffevm/systems/beos-native/Makefile" ;;
"kaffe/kaffevm/systems/unix-pthreads/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/kaffevm/systems/unix-pthreads/Makefile" ;;
"kaffe/kaffevm/verifier/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/kaffevm/verifier/Makefile" ;;
+ "kaffe/kaffevm/mem/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/kaffevm/mem/Makefile" ;;
"kaffe/kaffevm/jni/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/kaffevm/jni/Makefile" ;;
"kaffe/kaffe/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/kaffe/Makefile" ;;
"kaffe/kaffeh/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/kaffeh/Makefile" ;;
@@ -56498,6 +56509,7 @@
s, at CONFIG_MD_H@,$CONFIG_MD_H,;t t
s, at CONFIG_CALLKAFFEEXCEPTION_H@,$CONFIG_CALLKAFFEEXCEPTION_H,;t t
s, at KAFFEVM_MD_C@,$KAFFEVM_MD_C,;t t
+s, at GC_NAME@,$GC_NAME,;t t
s, at CONFIG_JIT_MD_H@,$CONFIG_JIT_MD_H,;t t
s, at KAFFEVM_JIT_DEF@,$KAFFEVM_JIT_DEF,;t t
s, at KAFFEVM_ICODE_H@,$KAFFEVM_ICODE_H,;t t
@@ -56628,6 +56640,8 @@
s, at cpu_os_frag@,,;t t
/@cpu_frag@/r $cpu_frag
s, at cpu_frag@,,;t t
+/@gc_frag@/r $gc_frag
+s, at gc_frag@,,;t t
/@engine_frag@/r $engine_frag
s, at engine_frag@,,;t t
/@threads_frag@/r $threads_frag
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.50 kaffe/configure.ac:1.51
--- kaffe/configure.ac:1.50 Sun Jul 11 20:15:33 2004
+++ kaffe/configure.ac Mon Jul 12 17:51:16 2004
@@ -333,6 +333,18 @@
dnl =========================================================================
dnl =========================================================================
+dnl Select the right garbage collector.
+dnl -------------------------------------------------------------------------
+
+gc_frag=$srcdir/kaffe/kaffevm/mem/Makefile.frag
+AC_SUBST_FILE(gc_frag)
+
+GC_NAME=mem
+AC_SUBST(GC_NAME)
+
+dnl =========================================================================
+
+dnl =========================================================================
dnl Allow selection of a specific execution engine
dnl -------------------------------------------------------------------------
@@ -1987,6 +1999,7 @@
AC_CONFIG_FILES([kaffe/kaffevm/systems/beos-native/Makefile])
AC_CONFIG_FILES([kaffe/kaffevm/systems/unix-pthreads/Makefile])
AC_CONFIG_FILES([kaffe/kaffevm/verifier/Makefile])
+AC_CONFIG_FILES([kaffe/kaffevm/mem/Makefile])
AC_CONFIG_FILES([kaffe/kaffevm/jni/Makefile])
AC_CONFIG_FILES([kaffe/kaffe/Makefile])
AC_CONFIG_FILES([kaffe/kaffeh/Makefile])
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.142 kaffe/config/Makefile.in:1.143
--- kaffe/config/Makefile.in:1.142 Mon Jul 12 16:34:38 2004
+++ kaffe/config/Makefile.in Mon Jul 12 17:51:19 2004
@@ -142,6 +142,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/config/mips/irix5/md.h
diff -u kaffe/config/mips/irix5/md.h:1.4 kaffe/config/mips/irix5/md.h:1.5
--- kaffe/config/mips/irix5/md.h:1.4 Sat Dec 13 19:31:28 2003
+++ kaffe/config/mips/irix5/md.h Mon Jul 12 17:51:19 2004
@@ -20,4 +20,12 @@
#include "mips/threads.h"
+#define SIGNAL_ARGS(sig, sc) int sig, int code UNUSED, struct sigcontext *sc
+#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext *scp
+#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
+#define SIGNAL_PC(scp)
+#define STACK_POINTER(scp) ((scp)->sc_badvaddr)
+
+#include "kaffe-unix-stack.h"
+
#endif
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.168 kaffe/include/Makefile.in:1.169
--- kaffe/include/Makefile.in:1.168 Sun Jul 11 08:54:30 2004
+++ kaffe/include/Makefile.in Mon Jul 12 17:51:20 2004
@@ -151,6 +151,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.118 kaffe/kaffe/Makefile.in:1.119
--- kaffe/kaffe/Makefile.in:1.118 Sun Jul 11 08:54:31 2004
+++ kaffe/kaffe/Makefile.in Mon Jul 12 17:51:20 2004
@@ -144,6 +144,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.40 kaffe/kaffe/jvmpi/Makefile.in:1.41
--- kaffe/kaffe/jvmpi/Makefile.in:1.40 Sun Jul 11 08:54:32 2004
+++ kaffe/kaffe/jvmpi/Makefile.in Mon Jul 12 17:51:21 2004
@@ -151,6 +151,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.135 kaffe/kaffe/kaffe/Makefile.in:1.136
--- kaffe/kaffe/kaffe/Makefile.in:1.135 Sun Jul 11 08:54:33 2004
+++ kaffe/kaffe/kaffe/Makefile.in Mon Jul 12 17:51:21 2004
@@ -162,6 +162,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.117 kaffe/kaffe/kaffeh/Makefile.in:1.118
--- kaffe/kaffe/kaffeh/Makefile.in:1.117 Sun Jul 11 08:54:34 2004
+++ kaffe/kaffe/kaffeh/Makefile.in Mon Jul 12 17:51:22 2004
@@ -171,6 +171,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.64 kaffe/kaffe/kaffevm/Makefile.am:1.65
--- kaffe/kaffe/kaffevm/Makefile.am:1.64 Mon Jul 5 16:40:28 2004
+++ kaffe/kaffe/kaffevm/Makefile.am Mon Jul 12 17:51:22 2004
@@ -9,15 +9,11 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-SUBDIRS = $(ENGINE_NAME) systems gcj verifier jni
-DIST_SUBDIRS = intrp jit jit3 systems gcj verifier jni
+SUBDIRS = $(ENGINE_NAME) $(GC_NAME) systems gcj verifier jni
+DIST_SUBDIRS = mem intrp jit jit3 systems gcj verifier jni
EXTRA_DIST = \
kaffe.def \
- mem/gc-incremental.c \
- mem/gc-incremental.h \
- mem/gc-mem.c \
- mem/gc-mem.h \
systems/win32/winio.c \
systems/win32/winthread.c \
systems/win32/winthread.h
@@ -40,6 +36,7 @@
@cpu_frag@
@cpu_os_frag@
@threads_frag@
+ at gc_frag@
if HAVE_GCJ_SUPPORT
libgcj = gcj/libgcj.la
@@ -58,6 +55,7 @@
$(libgcj) \
systems/$(THREAD_SYSTEM)/libkthread.la \
verifier/libkaffeverifier.la \
+ $(GC_NAME)/libkaffegc.la \
jni/libkaffejni.la
libkaffevm_la_LIBADD = \
@@ -66,7 +64,6 @@
$(M_LIBS)
libkaffevm_la_GEN_SRCS = \
- gc-mem.c \
md.c
nodist_libkaffevm_la_SOURCES = \
@@ -156,13 +153,7 @@
reflect.h \
../../binreloc/prefix.h
-gc-mem.c: stamp-h01
- @if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
- else :; fi
-stamp-h01: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(srcdir)/mem/gc-mem.c gc-mem.c $@
-
-md.c: stamp-h02
+md.c: stamp-h01
@if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
else :; fi
stamp-h02: $(top_builddir)/config.status
@@ -170,7 +161,7 @@
CLEANFILES = so_locations
-DISTCLEANFILES = gc-mem.c md.c stamp-h01 stamp-h02
+DISTCLEANFILES = md.c stamp-h01
dist-hook:
@for file in $(DISTCLEANFILES); do \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.162 kaffe/kaffe/kaffevm/Makefile.in:1.163
--- kaffe/kaffe/kaffevm/Makefile.in:1.162 Sun Jul 11 08:54:35 2004
+++ kaffe/kaffe/kaffevm/Makefile.in Mon Jul 12 17:51:22 2004
@@ -83,7 +83,8 @@
@HAVE_GCJ_SUPPORT_TRUE at am__DEPENDENCIES_2 = gcj/libgcj.la
am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(ENGINE_NAME)/libengine.la \
$(am__DEPENDENCIES_2) systems/$(THREAD_SYSTEM)/libkthread.la \
- verifier/libkaffeverifier.la jni/libkaffejni.la
+ verifier/libkaffeverifier.la $(GC_NAME)/libkaffegc.la \
+ jni/libkaffejni.la
am__libkaffevm_la_SOURCES_DIST = access.c baseClasses.c classMethod.c \
classPool.c methodCache.c code-analyse.c code.c constants.c \
debug.c exception.c external.c file.c findInJar.c fp.c gc.c \
@@ -100,7 +101,7 @@
soft.lo stackTrace.lo stats.lo string.lo stringParsing.lo \
support.lo thread.lo utf8const.lo gcFuncs.lo gcRefs.lo \
reflect.lo $(am__objects_1)
-am__objects_2 = gc-mem.lo md.lo
+am__objects_2 = md.lo
nodist_libkaffevm_la_OBJECTS = $(am__objects_2)
libkaffevm_la_OBJECTS = $(am_libkaffevm_la_OBJECTS) \
$(nodist_libkaffevm_la_OBJECTS)
@@ -115,17 +116,17 @@
@AMDEP_TRUE@ ./$(DEPDIR)/constants.Plo ./$(DEPDIR)/debug.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/exception.Plo ./$(DEPDIR)/external.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/file.Plo ./$(DEPDIR)/findInJar.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/fp.Plo ./$(DEPDIR)/gc-mem.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/gc.Plo ./$(DEPDIR)/gcFuncs.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/gcRefs.Plo ./$(DEPDIR)/hashtab.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/inflate.Plo ./$(DEPDIR)/itypes.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/jar.Plo ./$(DEPDIR)/ksem.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/locks.Plo ./$(DEPDIR)/lookup.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/md.Plo ./$(DEPDIR)/methodCache.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/object.Plo ./$(DEPDIR)/prefix.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/readClass.Plo ./$(DEPDIR)/reflect.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/soft.Plo ./$(DEPDIR)/stackTrace.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/stats.Plo ./$(DEPDIR)/string.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/fp.Plo ./$(DEPDIR)/gc.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/gcFuncs.Plo ./$(DEPDIR)/gcRefs.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/hashtab.Plo ./$(DEPDIR)/inflate.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/itypes.Plo ./$(DEPDIR)/jar.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/ksem.Plo ./$(DEPDIR)/locks.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/lookup.Plo ./$(DEPDIR)/md.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/methodCache.Plo ./$(DEPDIR)/object.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/prefix.Plo ./$(DEPDIR)/readClass.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/reflect.Plo ./$(DEPDIR)/soft.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/stackTrace.Plo ./$(DEPDIR)/stats.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/string.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/stringParsing.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/support.Plo ./$(DEPDIR)/thread.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/utf8const.Plo
@@ -212,6 +213,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
@@ -395,14 +397,10 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
-SUBDIRS = $(ENGINE_NAME) systems gcj verifier jni
-DIST_SUBDIRS = intrp jit jit3 systems gcj verifier jni
+SUBDIRS = $(ENGINE_NAME) $(GC_NAME) systems gcj verifier jni
+DIST_SUBDIRS = mem intrp jit jit3 systems gcj verifier jni
EXTRA_DIST = \
kaffe.def \
- mem/gc-incremental.c \
- mem/gc-incremental.h \
- mem/gc-mem.c \
- mem/gc-mem.h \
systems/win32/winio.c \
systems/win32/winthread.c \
systems/win32/winthread.h
@@ -433,6 +431,7 @@
$(libgcj) \
systems/$(THREAD_SYSTEM)/libkthread.la \
verifier/libkaffeverifier.la \
+ $(GC_NAME)/libkaffegc.la \
jni/libkaffejni.la
libkaffevm_la_LIBADD = \
@@ -441,7 +440,6 @@
$(M_LIBS)
libkaffevm_la_GEN_SRCS = \
- gc-mem.c \
md.c
nodist_libkaffevm_la_SOURCES = \
@@ -530,7 +528,7 @@
../../binreloc/prefix.h
CLEANFILES = so_locations
-DISTCLEANFILES = gc-mem.c md.c stamp-h01 stamp-h02
+DISTCLEANFILES = md.c stamp-h01
all: all-recursive
.SUFFIXES:
@@ -613,7 +611,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/file.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/findInJar.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fp.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gc-mem.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gc.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gcFuncs.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gcRefs.Plo at am__quote@
@@ -818,7 +815,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../../binreloc $(distdir)/mem $(distdir)/systems/win32
+ $(mkdir_p) $(distdir)/../../binreloc $(distdir)/systems/win32
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -969,14 +966,9 @@
@cpu_frag@
@cpu_os_frag@
@threads_frag@
+ at gc_frag@
-gc-mem.c: stamp-h01
- @if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
- else :; fi
-stamp-h01: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(srcdir)/mem/gc-mem.c gc-mem.c $@
-
-md.c: stamp-h02
+md.c: stamp-h01
@if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
else :; fi
stamp-h02: $(top_builddir)/config.status
Index: kaffe/kaffe/kaffevm/gc.c
diff -u kaffe/kaffe/kaffevm/gc.c:1.5 kaffe/kaffe/kaffevm/gc.c:1.6
--- kaffe/kaffe/kaffevm/gc.c:1.5 Tue Jan 21 11:28:16 2003
+++ kaffe/kaffe/kaffevm/gc.c Mon Jul 12 17:51:22 2004
@@ -10,9 +10,8 @@
*/
/* Use the incremental garbage collector */
-/* XXX put this in a make that a separate file !!! */
#include "config-std.h"
-#include "mem/gc-incremental.c"
+#include "gc.h"
Collector* main_collector;
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.98 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.99
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.98 Sun Jul 11 08:54:36 2004
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Mon Jul 12 17:51:23 2004
@@ -166,6 +166,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.106 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.107
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.106 Sun Jul 11 08:54:37 2004
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Mon Jul 12 17:51:24 2004
@@ -156,6 +156,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.112 kaffe/kaffe/kaffevm/jit/Makefile.in:1.113
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.112 Sun Jul 11 08:54:38 2004
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Mon Jul 12 17:51:24 2004
@@ -163,6 +163,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.83 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.84
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.83 Sun Jul 11 08:54:39 2004
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Mon Jul 12 17:51:25 2004
@@ -163,6 +163,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.10 kaffe/kaffe/kaffevm/jni/Makefile.in:1.11
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.10 Sun Jul 11 08:54:39 2004
+++ kaffe/kaffe/kaffevm/jni/Makefile.in Mon Jul 12 17:51:25 2004
@@ -164,6 +164,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
===================================================================
Checking out kaffe/kaffe/kaffevm/mem/Makefile.am
RCS: /home/cvs/kaffe/kaffe/kaffe/kaffevm/mem/Makefile.am,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/kaffe/kaffevm/mem/Makefile.am Mon Jul 12 19:18:52 2004
@@ -0,0 +1,31 @@
+# Makefile.am for the garbage collector - original Kaffe's GC.
+#
+# Copyright (c) 2004
+# Kaffe.org contributors, see ChangeLogs for details. All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file.
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/config \
+ -I$(top_srcdir)/config \
+ -I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/kaffe/kaffevm \
+ -I$(top_srcdir)/kaffe/jvmpi
+
+native_LTLIBRARIES = libkaffegc.la
+
+libkaffegc_la_LDFLAGS = \
+ $(KVMLIBFLAGS) \
+ -export-dynamic \
+ -release $(PACKAGE_VERSION)
+
+libkaffegc_la_SOURCES= \
+ gc-incremental.c \
+ gc-mem.c \
+ gc-incremental.h \
+ gc-mem.h
+
+noinst_HEADERS= gc-mem.h gc-incremental.h
===================================================================
Checking out kaffe/kaffe/kaffevm/mem/Makefile.frag
RCS: /home/cvs/kaffe/kaffe/kaffe/kaffevm/mem/Makefile.frag,v
VERS: 1.1
***************
===================================================================
Checking out kaffe/kaffe/kaffevm/mem/Makefile.in
RCS: /home/cvs/kaffe/kaffe/kaffe/kaffevm/mem/Makefile.in,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/kaffe/kaffevm/mem/Makefile.in Mon Jul 12 19:18:52 2004
@@ -0,0 +1,648 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Makefile.am for the garbage collector - original Kaffe's GC.
+#
+# Copyright (c) 2004
+# Kaffe.org contributors, see ChangeLogs for details. All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file.
+
+
+SOURCES = $(libkaffegc_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = kaffe/kaffevm/mem
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+ $(top_srcdir)/m4/alsa.m4 \
+ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+ $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \
+ $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/gcc_attribute.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibcver.m4 \
+ $(top_srcdir)/m4/gnu-crypto.m4 $(top_srcdir)/m4/gwqt.m4 \
+ $(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lcmessage.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/libxml.m4 $(top_srcdir)/m4/libxslt.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
+ $(top_srcdir)/m4/sockinttypes.m4 \
+ $(top_srcdir)/m4/solarispthread.m4 $(top_srcdir)/m4/valist.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config/config.h \
+ $(top_builddir)/include/kaffe/jni_md.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(nativedir)"
+nativeLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(native_LTLIBRARIES)
+libkaffegc_la_LIBADD =
+am_libkaffegc_la_OBJECTS = gc-incremental.lo gc-mem.lo
+libkaffegc_la_OBJECTS = $(am_libkaffegc_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gc-incremental.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/gc-mem.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libkaffegc_la_SOURCES)
+DIST_SOURCES = $(libkaffegc_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+AWT_DIR = @AWT_DIR@
+AWT_LIBS = @AWT_LIBS@
+BCEL_JAR = @BCEL_JAR@
+BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CCLD = @CCLD@
+CFLAGS = @CFLAGS@
+CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
+COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
+COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
+COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
+COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
+COND_SOUND_ALSA_TRUE = @COND_SOUND_ALSA_TRUE@
+COND_SOUND_ESD_FALSE = @COND_SOUND_ESD_FALSE@
+COND_SOUND_ESD_TRUE = @COND_SOUND_ESD_TRUE@
+CONFIG_CALLKAFFEEXCEPTION_H = @CONFIG_CALLKAFFEEXCEPTION_H@
+CONFIG_JIT_MD_H = @CONFIG_JIT_MD_H@
+CONFIG_MD_H = @CONFIG_MD_H@
+CONFIG_XPROFILE_MD_H = @CONFIG_XPROFILE_MD_H@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIRSEP = @DIRSEP@
+DLLTOOL = @DLLTOOL@
+DLOPEN_JAVA_LIBS = @DLOPEN_JAVA_LIBS@
+DNSJAVA_JAR = @DNSJAVA_JAR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_BINRELOC_FALSE = @ENABLE_BINRELOC_FALSE@
+ENABLE_BINRELOC_TRUE = @ENABLE_BINRELOC_TRUE@
+ENABLE_JVMPI_FALSE = @ENABLE_JVMPI_FALSE@
+ENABLE_JVMPI_TRUE = @ENABLE_JVMPI_TRUE@
+ENABLE_XPROF_FALSE = @ENABLE_XPROF_FALSE@
+ENABLE_XPROF_TRUE = @ENABLE_XPROF_TRUE@
+ENGINE_NAME = @ENGINE_NAME@
+ESD_CFLAGS = @ESD_CFLAGS@
+ESD_CONFIG = @ESD_CONFIG@
+ESD_LIBS = @ESD_LIBS@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GC_NAME = @GC_NAME@
+GMSGFMT = @GMSGFMT@
+GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
+GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
+HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
+HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
+HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@
+HAVE_DNSJAVA_FALSE = @HAVE_DNSJAVA_FALSE@
+HAVE_DNSJAVA_TRUE = @HAVE_DNSJAVA_TRUE@
+HAVE_GCJ_SUPPORT_FALSE = @HAVE_GCJ_SUPPORT_FALSE@
+HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
+HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
+HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
+HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
+HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
+HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
+HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
+HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
+HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
+INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+JASMIN = @JASMIN@
+JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVAX_CRYPTO_JAR = @JAVAX_CRYPTO_JAR@
+JAVAX_SECURITY_JAR = @JAVAX_SECURITY_JAR@
+JAVA_LIBS = @JAVA_LIBS@
+JIKES = @JIKES@
+JIKESPROG = @JIKESPROG@
+KAFFEH = @KAFFEH@
+KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
+KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
+KAFFEVM_MD_C = @KAFFEVM_MD_C@
+KAFFEVM_TRAMPOLINES_C = @KAFFEVM_TRAMPOLINES_C@
+KAFFE_ARCHOS = @KAFFE_ARCHOS@
+KAFFE_LIBS = @KAFFE_LIBS@
+KLIBFLAGS = @KLIBFLAGS@
+KPREFIX = @KPREFIX@
+KVMBINFLAGS = @KVMBINFLAGS@
+KVMLIBFLAGS = @KVMLIBFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBLTDL = @LIBLTDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
*** Patch too long, truncated ***
More information about the kaffe
mailing list