PatchSet 7331
Date: 2006/07/11 13:08:15
Author: robilad
Branch: HEAD
Tag: (none)
Log:
cleaned up regen-forward in jits
2006-07-11 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac (AC_CONFIG_LINKS) Link icode.h,
jit.def and tromplines.S into kaffe/kaffevm/jit*
directory. Don't AC_SUBST KAFFEVM_JIT_DEF,
KAFFEVM_ICODE_H and KAFFEVM_TRAMPOLINES_S.
* kaffe/kaffevm/jit/Makefile.am,
kaffe/kaffevm/jit3/Makefile.am:
Cleaned up from regen-forward leftovers.
Members:
ChangeLog:1.4834->1.4835
Makefile.in:1.256->1.257
configure:1.550->1.551
configure.ac:1.228->1.229
config/Makefile.in:1.222->1.223
external/Makefile.in:1.13->1.14
external/gcc/Makefile.in:1.14->1.15
external/gcc/zlib/Makefile.in:1.13->1.14
include/Makefile.in:1.280->1.281
kaffe/Makefile.in:1.176->1.177
kaffe/jvmpi/Makefile.in:1.100->1.101
kaffe/kaffe/Makefile.in:1.198->1.199
kaffe/kaffeh/Makefile.in:1.180->1.181
kaffe/kaffevm/Makefile.in:1.234->1.235
kaffe/kaffevm/boehm-gc/Makefile.in:1.63->1.64
kaffe/kaffevm/gcj/Makefile.in:1.156->1.157
kaffe/kaffevm/intrp/Makefile.in:1.165->1.166
kaffe/kaffevm/jit/Makefile.am:1.24->1.25
kaffe/kaffevm/jit/Makefile.in:1.175->1.176
kaffe/kaffevm/jit3/Makefile.am:1.18->1.19
kaffe/kaffevm/jit3/Makefile.in:1.145->1.146
kaffe/kaffevm/jni/Makefile.in:1.69->1.70
kaffe/kaffevm/kaffe-gc/Makefile.in:1.62->1.63
kaffe/kaffevm/systems/Makefile.in:1.165->1.166
kaffe/kaffevm/systems/beos-native/Makefile.in:1.156->1.157
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.19->1.20
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.162->1.163
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.166->1.167
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.141->1.142
kaffe/kaffevm/verifier/Makefile.in:1.68->1.69
kaffe/man/Makefile.in:1.163->1.164
kaffe/scripts/Makefile.in:1.204->1.205
kaffe/scripts/bat/Makefile.in:1.155->1.156
kaffe/scripts/compat/Makefile.in:1.182->1.183
kaffe/xprof/Makefile.in:1.131->1.132
libraries/Makefile.in:1.159->1.160
libraries/clib/Makefile.in:1.176->1.177
libraries/clib/awt/Makefile.in:1.174->1.175
libraries/clib/awt/X/Makefile.in:1.167->1.168
libraries/clib/awt/nano-X/Makefile.in:1.40->1.41
libraries/clib/awt/qt/Makefile.in:1.122->1.123
libraries/clib/io/Makefile.in:1.172->1.173
libraries/clib/management/Makefile.in:1.176->1.177
libraries/clib/math/Makefile.in:1.171->1.172
libraries/clib/native/Makefile.in:1.221->1.222
libraries/clib/net/Makefile.in:1.182->1.183
libraries/clib/nio/Makefile.in:1.107->1.108
libraries/clib/security/Makefile.in:1.142->1.143
libraries/clib/sound/Makefile.in:1.68->1.69
libraries/clib/sound/alsa/Makefile.in:1.69->1.70
libraries/clib/sound/common/Makefile.in:1.68->1.69
libraries/clib/sound/esd/Makefile.in:1.69->1.70
libraries/clib/target/Makefile.in:1.28->1.29
libraries/clib/target/Linux/Makefile.in:1.28->1.29
libraries/clib/target/generic/Makefile.in:1.28->1.29
libraries/clib/zip/Makefile.in:1.174->1.175
libraries/extensions/Makefile.in:1.151->1.152
libraries/extensions/comm/Makefile.in:1.145->1.146
libraries/extensions/comm/javalib/Makefile.in:1.146->1.147
libraries/extensions/microsoft/Makefile.in:1.137->1.138
libraries/extensions/microsoft/clib/Makefile.in:1.141->1.142
libraries/extensions/microsoft/javalib/Makefile.in:1.139->1.140
libraries/extensions/pjava/Makefile.in:1.145->1.146
libraries/extensions/pjava/javalib/Makefile.in:1.146->1.147
libraries/extensions/servlet/Makefile.in:1.145->1.146
libraries/extensions/servlet/javalib/Makefile.in:1.146->1.147
libraries/javalib/Makefile.in:1.544->1.545
libraries/javalib/awt-implementations/Makefile.in:1.53->1.54
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.67->1.68
libraries/javalib/gmp-math/Makefile.in:1.60->1.61
replace/Makefile.in:1.118->1.119
test/Makefile.in:1.168->1.169
test/internal/Makefile.in:1.140->1.141
test/jni/Makefile.in:1.71->1.72
test/regression/Makefile.in:1.244->1.245
test/regression/compile_time/Makefile.in:1.96->1.97
test/regression/compiler/Makefile.in:1.80->1.81
test/regression/run_time/Makefile.in:1.95->1.96
tools/Makefile.in:1.70->1.71
tools/gjdoc/Makefile.in:1.69->1.70
tools/gjdoc/javalib/Makefile.in:1.85->1.86
tools/javatools/Makefile.in:1.23->1.24
tools/javatools/javalib/Makefile.in:1.25->1.26
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4834 kaffe/ChangeLog:1.4835
--- kaffe/ChangeLog:1.4834 Tue Jul 11 10:16:50 2006
+++ kaffe/ChangeLog Tue Jul 11 13:08:15 2006
@@ -1,5 +1,16 @@
2006-07-11 Dalibor Topic <[EMAIL PROTECTED]>
+ * configure.ac (AC_CONFIG_LINKS) Link icode.h,
+ jit.def and tromplines.S into kaffe/kaffevm/jit*
+ directory. Don't AC_SUBST KAFFEVM_JIT_DEF,
+ KAFFEVM_ICODE_H and KAFFEVM_TRAMPOLINES_S.
+
+ * kaffe/kaffevm/jit/Makefile.am,
+ kaffe/kaffevm/jit3/Makefile.am:
+ Cleaned up from regen-forward leftovers.
+
+2006-07-11 Dalibor Topic <[EMAIL PROTECTED]>
+
* configure.ac (AC_CONFIG_LINKS) Link md.c into
kaffevm directory.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.256 kaffe/Makefile.in:1.257
--- kaffe/Makefile.in:1.256 Tue Jul 11 10:16:55 2006
+++ kaffe/Makefile.in Tue Jul 11 13:08:22 2006
@@ -224,9 +224,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/configure
diff -u kaffe/configure:1.550 kaffe/configure:1.551
--- kaffe/configure:1.550 Tue Jul 11 10:16:55 2006
+++ kaffe/configure Tue Jul 11 13:08:23 2006
@@ -493,7 +493,7 @@
ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
ac_subdirs_all="$ac_subdirs_all external/gcc/fastjar"
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 install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar 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 CCAS
CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor
host_os Khost_cpu Khost_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
MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE LIBOBJS GETOPT_H REPLACE_GETOPT_TRUE
REPLACE_GETOPT_FALSE REGEN_FORWARD KAFFEVM_JIT_DEF KAFFEVM_ICODE_H USE_JIT_TRUE
USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE
ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE
JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE
SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS
PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS CREATE_XMLJ_LIBRARY_TRUE
CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE
CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE
CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE
CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE
USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR
JIKESPROG JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine
THREAD_SYSTEM KPREFIX KAFFE_ARCHOS MKTEMP JASMIN HAVE_JAVAC_TRUE
HAVE_JAVAC_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE
HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP
SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE
HAVE_GCJ_SUPPORT_FALSE USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE
COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE
COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS
XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED
QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD
COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS 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_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE
COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS COND_GJDOC_TRUE
COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE
DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS
COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_SYSTEM_ZLIB_TRUE
COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_FALSE BINRELOC_CFLAGS
BINRELOC_LIBS KAFFEH MAKE_KAFFEH kaffe_builddir FASTJAR toolslibdir jredir
jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF
kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES KAFFE_CFLAGS
LTLIBOBJS'
+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 install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar 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 CCAS
CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor
host_os Khost_cpu Khost_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
MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE LIBOBJS GETOPT_H REPLACE_GETOPT_TRUE
REPLACE_GETOPT_FALSE REGEN_FORWARD USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME
BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE
ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE JAVAC_FLAGS NEED_LIBXPROF_TRUE
NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR
acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS
CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE
CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE
CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE
CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE
USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR
JIKESPROG JAVA_COMPILER JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX
KAFFE_ARCHOS MKTEMP JASMIN HAVE_JAVAC_TRUE HAVE_JAVAC_FALSE HAVE_MKTEMP_TRUE
HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS
ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs
BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE
USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE
COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS
X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE
COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK
QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE
NANOX_CFLAGS 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_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE
COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS
COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE
COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS
KVMBINFLAGS KVMLIBFLAGS COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE
COND_SYSTEM_ZLIB_TRUE COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE
COND_FASTJAR_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH
kaffe_builddir FASTJAR toolslibdir jredir jrebindir jrelibdir nativedir
securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF
CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES KAFFE_CFLAGS LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -23538,10 +23538,8 @@
if test x"$with_engine" != x"intrp" ; then
CONFIG_JIT_MD_H="config/$Khost_cpu/$Khost_os/$with_engine-md.h"
-
KAFFEVM_JIT_DEF="\$(top_srcdir)/config/$Khost_cpu/$with_engine-$Khost_cpu.def"
-
- KAFFEVM_ICODE_H="\$(top_srcdir)/config/$Khost_cpu/$with_engine-icode.h"
-
+ KAFFEVM_JIT_DEF="config/$Khost_cpu/$with_engine-$Khost_cpu.def"
+ KAFFEVM_ICODE_H="config/$Khost_cpu/$with_engine-icode.h"
fi
echo "$as_me:$LINENO: checking execution engine" >&5
@@ -25553,7 +25551,6 @@
echo $ECHO_N "checking for trampolines... $ECHO_C" >&6
if test -f $srcdir/config/$Khost_cpu/trampolines.S ; then
KAFFEVM_TRAMPOLINES_S="\$(top_srcdir)/config/$Khost_cpu/trampolines.S"
-
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
@@ -51229,6 +51226,12 @@
ac_config_links="$ac_config_links
config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H"
+ ac_config_links="$ac_config_links
kaffe/kaffevm/$with_engine/icode.h:$KAFFEVM_ICODE_H"
+
+ ac_config_links="$ac_config_links
kaffe/kaffevm/$with_engine/jit.def:$KAFFEVM_JIT_DEF"
+
+ ac_config_links="$ac_config_links
kaffe/kaffevm/$with_engine/trampolines.S:$KAFFEVM_TRAMPOLINES_S"
+
fi
if test x"$xprofiling" = x"yes"; then
@@ -52175,6 +52178,9 @@
"kaffe/kaffeh/binreloc.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffeh/binreloc.c:kaffe/kaffevm/binreloc.c" ;;
"config/jit-md.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/jit-md.h:$CONFIG_JIT_MD_H" ;;
"config/callKaffeException.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H" ;;
+ "kaffe/kaffevm/$with_engine/icode.h" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffevm/$with_engine/icode.h:$KAFFEVM_ICODE_H" ;;
+ "kaffe/kaffevm/$with_engine/jit.def" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffevm/$with_engine/jit.def:$KAFFEVM_JIT_DEF" ;;
+ "kaffe/kaffevm/$with_engine/trampolines.S" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffevm/$with_engine/trampolines.S:$KAFFEVM_TRAMPOLINES_S" ;;
"config/xprofile-md.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/xprofile-md.h:$CONFIG_XPROFILE_MD_H" ;;
"config/md.h" ) CONFIG_LINKS="$CONFIG_LINKS config/md.h:$CONFIG_MD_H" ;;
"kaffe/kaffevm/md.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffevm/md.c:$KAFFEVM_MD_C" ;;
@@ -52369,8 +52375,6 @@
s,@REPLACE_GETOPT_TRUE@,$REPLACE_GETOPT_TRUE,;t t
s,@REPLACE_GETOPT_FALSE@,$REPLACE_GETOPT_FALSE,;t t
s,@REGEN_FORWARD@,$REGEN_FORWARD,;t t
-s,@KAFFEVM_JIT_DEF@,$KAFFEVM_JIT_DEF,;t t
-s,@KAFFEVM_ICODE_H@,$KAFFEVM_ICODE_H,;t t
s,@USE_JIT_TRUE@,$USE_JIT_TRUE,;t t
s,@USE_JIT_FALSE@,$USE_JIT_FALSE,;t t
s,@ENGINE_NAME@,$ENGINE_NAME,;t t
@@ -52409,7 +52413,6 @@
s,@PATH_TO_RT_JAR@,$PATH_TO_RT_JAR,;t t
s,@JIKESPROG@,$JIKESPROG,;t t
s,@JAVA_COMPILER@,$JAVA_COMPILER,;t t
-s,@KAFFEVM_TRAMPOLINES_S@,$KAFFEVM_TRAMPOLINES_S,;t t
s,@JAVA_LIBS@,$JAVA_LIBS,;t t
s,@with_engine@,$with_engine,;t t
s,@THREAD_SYSTEM@,$THREAD_SYSTEM,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.228 kaffe/configure.ac:1.229
--- kaffe/configure.ac:1.228 Tue Jul 11 10:17:06 2006
+++ kaffe/configure.ac Tue Jul 11 13:08:30 2006
@@ -477,10 +477,8 @@
if test x"$with_engine" != x"intrp" ; then
CONFIG_JIT_MD_H="config/$Khost_cpu/$Khost_os/$with_engine-md.h"
-
KAFFEVM_JIT_DEF="\$(top_srcdir)/config/$Khost_cpu/$with_engine-$Khost_cpu.def"
- AC_SUBST(KAFFEVM_JIT_DEF)
- KAFFEVM_ICODE_H="\$(top_srcdir)/config/$Khost_cpu/$with_engine-icode.h"
- AC_SUBST(KAFFEVM_ICODE_H)
+ KAFFEVM_JIT_DEF="config/$Khost_cpu/$with_engine-$Khost_cpu.def"
+ KAFFEVM_ICODE_H="config/$Khost_cpu/$with_engine-icode.h"
fi
AC_MSG_CHECKING(execution engine)
@@ -945,7 +943,6 @@
AC_MSG_CHECKING(for trampolines)
if test -f $srcdir/config/$Khost_cpu/trampolines.S ; then
KAFFEVM_TRAMPOLINES_S="\$(top_srcdir)/config/$Khost_cpu/trampolines.S"
- AC_SUBST(KAFFEVM_TRAMPOLINES_S)
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR(does not support trampolines - now mandatory)
@@ -2622,6 +2619,9 @@
if test x"$with_engine" != x"intrp" ; then
AC_CONFIG_LINKS([config/jit-md.h:$CONFIG_JIT_MD_H])
AC_CONFIG_LINKS([config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H])
+ AC_CONFIG_LINKS([kaffe/kaffevm/$with_engine/icode.h:$KAFFEVM_ICODE_H])
+ AC_CONFIG_LINKS([kaffe/kaffevm/$with_engine/jit.def:$KAFFEVM_JIT_DEF])
+
AC_CONFIG_LINKS([kaffe/kaffevm/$with_engine/trampolines.S:$KAFFEVM_TRAMPOLINES_S])
fi
if test x"$xprofiling" = x"yes"; then
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.222 kaffe/config/Makefile.in:1.223
--- kaffe/config/Makefile.in:1.222 Tue Jul 11 10:17:10 2006
+++ kaffe/config/Makefile.in Tue Jul 11 13:08:41 2006
@@ -198,9 +198,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/external/Makefile.in
diff -u kaffe/external/Makefile.in:1.13 kaffe/external/Makefile.in:1.14
--- kaffe/external/Makefile.in:1.13 Tue Jul 11 10:17:10 2006
+++ kaffe/external/Makefile.in Tue Jul 11 13:08:41 2006
@@ -191,9 +191,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/external/gcc/Makefile.in
diff -u kaffe/external/gcc/Makefile.in:1.14 kaffe/external/gcc/Makefile.in:1.15
--- kaffe/external/gcc/Makefile.in:1.14 Tue Jul 11 10:17:11 2006
+++ kaffe/external/gcc/Makefile.in Tue Jul 11 13:08:42 2006
@@ -191,9 +191,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/external/gcc/zlib/Makefile.in
diff -u kaffe/external/gcc/zlib/Makefile.in:1.13
kaffe/external/gcc/zlib/Makefile.in:1.14
--- kaffe/external/gcc/zlib/Makefile.in:1.13 Tue Jul 11 10:17:11 2006
+++ kaffe/external/gcc/zlib/Makefile.in Tue Jul 11 13:08:42 2006
@@ -203,9 +203,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.280 kaffe/include/Makefile.in:1.281
--- kaffe/include/Makefile.in:1.280 Tue Jul 11 10:17:12 2006
+++ kaffe/include/Makefile.in Tue Jul 11 13:08:43 2006
@@ -213,9 +213,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.176 kaffe/kaffe/Makefile.in:1.177
--- kaffe/kaffe/Makefile.in:1.176 Tue Jul 11 10:17:13 2006
+++ kaffe/kaffe/Makefile.in Tue Jul 11 13:08:43 2006
@@ -199,9 +199,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.100 kaffe/kaffe/jvmpi/Makefile.in:1.101
--- kaffe/kaffe/jvmpi/Makefile.in:1.100 Tue Jul 11 10:17:18 2006
+++ kaffe/kaffe/jvmpi/Makefile.in Tue Jul 11 13:08:44 2006
@@ -209,9 +209,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.198 kaffe/kaffe/kaffe/Makefile.in:1.199
--- kaffe/kaffe/kaffe/Makefile.in:1.198 Tue Jul 11 10:17:18 2006
+++ kaffe/kaffe/kaffe/Makefile.in Tue Jul 11 13:08:49 2006
@@ -214,9 +214,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.180
kaffe/kaffe/kaffeh/Makefile.in:1.181
--- kaffe/kaffe/kaffeh/Makefile.in:1.180 Tue Jul 11 10:17:19 2006
+++ kaffe/kaffe/kaffeh/Makefile.in Tue Jul 11 13:08:50 2006
@@ -223,9 +223,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.234
kaffe/kaffe/kaffevm/Makefile.in:1.235
--- kaffe/kaffe/kaffevm/Makefile.in:1.234 Tue Jul 11 10:17:20 2006
+++ kaffe/kaffe/kaffevm/Makefile.in Tue Jul 11 13:08:51 2006
@@ -256,9 +256,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.63
kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.64
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.63 Tue Jul 11 10:17:22 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Tue Jul 11 13:08:52 2006
@@ -222,9 +222,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.156
kaffe/kaffe/kaffevm/gcj/Makefile.in:1.157
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.156 Tue Jul 11 10:17:23 2006
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Tue Jul 11 13:08:52 2006
@@ -217,9 +217,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.165
kaffe/kaffe/kaffevm/intrp/Makefile.in:1.166
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.165 Tue Jul 11 10:17:24 2006
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Tue Jul 11 13:08:53 2006
@@ -208,9 +208,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/jit/Makefile.am
diff -u kaffe/kaffe/kaffevm/jit/Makefile.am:1.24
kaffe/kaffe/kaffevm/jit/Makefile.am:1.25
--- kaffe/kaffe/kaffevm/jit/Makefile.am:1.24 Sun Jul 9 16:58:47 2006
+++ kaffe/kaffe/kaffevm/jit/Makefile.am Tue Jul 11 13:08:56 2006
@@ -34,58 +34,32 @@
libengine_la_SOURCES = \
basecode.c \
- constpool.c \
- funcs.c \
- icode.c \
- labels.c \
- registers.c \
- slots.c \
- machine.c \
- seq.c \
- native-wrapper.c \
- methodcalls.c
-
-BUILT_SOURCES = \
- trampolines.S
-
-nodist_libengine_la_SOURCES = \
- trampolines.S
-
-EXTRA_DIST = \
- Makefile.frag \
basecode.h \
checks.h \
codeproto.h \
+ constpool.c \
constpool.h \
+ funcs.c \
+ icode.c \
icode_internal.h \
+ labels.c \
labels.h \
+ registers.c \
+ machine.c \
machine.h \
+ methodcalls.c \
+ methodcalls.h \
+ native-wrapper.c \
+ native-wrapper.h \
registers.h \
+ seq.c \
seq.h \
+ slots.c \
slots.h \
- stackTrace-impl.h \
- native-wrapper.h \
- methodcalls.h
-
-DISTCLEANFILES = icode.h jit.def trampolines.S
-
-basecode.lo icode.lo machine.lo registers.lo: icode.h
-funcs.lo: jit.def trampolines.S
+ stackTrace-impl.h
-icode.h: stamp-h01
- @if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
- else :; fi
-stamp-h01: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_ICODE_H) icode.h $@
-
-jit.def: stamp-h02
- @if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
- else :; fi
-stamp-h02: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_JIT_DEF) jit.def $@
+nodist_libengine_la_SOURCES = \
+ trampolines.S
-trampolines.S: stamp-h03
- @if test ! -f $@; then rm -f stamp-h03; $(MAKE) stamp-h03; \
- else :; fi
-stamp-h03: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_TRAMPOLINES_S) trampolines.S $@
+EXTRA_DIST = \
+ Makefile.frag
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.175
kaffe/kaffe/kaffevm/jit/Makefile.in:1.176
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.175 Tue Jul 11 10:17:25 2006
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Tue Jul 11 13:08:58 2006
@@ -75,8 +75,8 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libengine_la_LIBADD =
am_libengine_la_OBJECTS = basecode.lo constpool.lo funcs.lo icode.lo \
- labels.lo registers.lo slots.lo machine.lo seq.lo \
- native-wrapper.lo methodcalls.lo
+ labels.lo registers.lo machine.lo methodcalls.lo \
+ native-wrapper.lo seq.lo slots.lo
nodist_libengine_la_OBJECTS = trampolines.lo
libengine_la_OBJECTS = $(am_libengine_la_OBJECTS) \
$(nodist_libengine_la_OBJECTS)
@@ -214,9 +214,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
@@ -394,42 +391,37 @@
libengine_la_SOURCES = \
basecode.c \
+ basecode.h \
+ checks.h \
+ codeproto.h \
constpool.c \
+ constpool.h \
funcs.c \
icode.c \
+ icode_internal.h \
labels.c \
+ labels.h \
registers.c \
- slots.c \
machine.c \
- seq.c \
+ machine.h \
+ methodcalls.c \
+ methodcalls.h \
native-wrapper.c \
- methodcalls.c
-
-BUILT_SOURCES = \
- trampolines.S
+ native-wrapper.h \
+ registers.h \
+ seq.c \
+ seq.h \
+ slots.c \
+ slots.h \
+ stackTrace-impl.h
nodist_libengine_la_SOURCES = \
trampolines.S
EXTRA_DIST = \
- Makefile.frag \
- basecode.h \
- checks.h \
- codeproto.h \
- constpool.h \
- icode_internal.h \
- labels.h \
- machine.h \
- registers.h \
- seq.h \
- slots.h \
- stackTrace-impl.h \
- native-wrapper.h \
- methodcalls.h
+ Makefile.frag
-DISTCLEANFILES = icode.h jit.def trampolines.S
-all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj
@@ -608,12 +600,10 @@
fi; \
done
check-am: all-am
-check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -633,12 +623,10 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -704,27 +692,6 @@
@engine_frag@
-
-basecode.lo icode.lo machine.lo registers.lo: icode.h
-funcs.lo: jit.def trampolines.S
-
-icode.h: stamp-h01
- @if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
- else :; fi
-stamp-h01: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_ICODE_H) icode.h $@
-
-jit.def: stamp-h02
- @if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
- else :; fi
-stamp-h02: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_JIT_DEF) jit.def $@
-
-trampolines.S: stamp-h03
- @if test ! -f $@; then rm -f stamp-h03; $(MAKE) stamp-h03; \
- else :; fi
-stamp-h03: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_TRAMPOLINES_S) trampolines.S $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: kaffe/kaffe/kaffevm/jit3/Makefile.am
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.am:1.18
kaffe/kaffe/kaffevm/jit3/Makefile.am:1.19
--- kaffe/kaffe/kaffevm/jit3/Makefile.am:1.18 Sun Jul 9 16:58:48 2006
+++ kaffe/kaffe/kaffevm/jit3/Makefile.am Tue Jul 11 13:08:59 2006
@@ -62,39 +62,8 @@
methodcalls.c \
methodcalls.h
-BUILT_SOURCES = \
- trampolines.S
-
nodist_libengine_la_SOURCES = \
trampolines.S
EXTRA_DIST = \
Makefile.frag
-
-DISTCLEANFILES = icode.h jit.def trampolines.S stamp-h01 stamp-h02 stamp-h03
-
-basecode.lo icode.lo machine.lo registers.lo: icode.h
-funcs.lo: jit.def trampolines.S
-
-icode.h: stamp-h01
- @if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
- else :; fi
-stamp-h01: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_ICODE_H) icode.h $@
-
-jit.def: stamp-h02
- @if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
- else :; fi
-stamp-h02: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_JIT_DEF) jit.def $@
-
-trampolines.S: stamp-h03
- @if test ! -f $@; then rm -f stamp-h03; $(MAKE) stamp-h03; \
- else :; fi
-stamp-h03: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_TRAMPOLINES_S) trampolines.S $@
-
-dist-hook:
- @for file in $(DISTCLEANFILES); do \
- rm -f $(distdir)/$$file; \
- done
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.145
kaffe/kaffe/kaffevm/jit3/Makefile.in:1.146
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.145 Tue Jul 11 10:17:27 2006
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Tue Jul 11 13:08:59 2006
@@ -214,9 +214,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
@@ -421,18 +418,13 @@
methodcalls.c \
methodcalls.h
-BUILT_SOURCES = \
- trampolines.S
-
nodist_libengine_la_SOURCES = \
trampolines.S
EXTRA_DIST = \
Makefile.frag
-DISTCLEANFILES = icode.h jit.def trampolines.S stamp-h01 stamp-h02 stamp-h03
-all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj
@@ -611,16 +603,11 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
-check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -640,12 +627,10 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -698,45 +683,19 @@
uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \
- distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am
@engine_frag@
-
-basecode.lo icode.lo machine.lo registers.lo: icode.h
-funcs.lo: jit.def trampolines.S
-
-icode.h: stamp-h01
- @if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
- else :; fi
-stamp-h01: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_ICODE_H) icode.h $@
-
-jit.def: stamp-h02
- @if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
- else :; fi
-stamp-h02: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_JIT_DEF) jit.def $@
-
-trampolines.S: stamp-h03
- @if test ! -f $@; then rm -f stamp-h03; $(MAKE) stamp-h03; \
- else :; fi
-stamp-h03: $(top_builddir)/config.status
- $(SHELL) $(REGEN_FORWARD) $(KAFFEVM_TRAMPOLINES_S) trampolines.S $@
-
-dist-hook:
- @for file in $(DISTCLEANFILES); do \
- rm -f $(distdir)/$$file; \
- done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.69
kaffe/kaffe/kaffevm/jni/Makefile.in:1.70
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.69 Tue Jul 11 10:17:28 2006
+++ kaffe/kaffe/kaffevm/jni/Makefile.in Tue Jul 11 13:09:00 2006
@@ -212,9 +212,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.62
kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.63
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.62 Tue Jul 11 10:17:29 2006
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in Tue Jul 11 13:09:00 2006
@@ -208,9 +208,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.165
kaffe/kaffe/kaffevm/systems/Makefile.in:1.166
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.165 Tue Jul 11 10:17:31 2006
+++ kaffe/kaffe/kaffevm/systems/Makefile.in Tue Jul 11 13:09:01 2006
@@ -198,9 +198,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.156
kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.157
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.156 Tue Jul 11
10:17:32 2006
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Tue Jul 11 13:09:01 2006
@@ -207,9 +207,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.19
kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.20
--- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.19 Tue Jul
11 10:17:34 2006
+++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in Tue Jul 11
13:09:02 2006
@@ -202,9 +202,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.162
kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.163
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.162 Tue Jul
11 10:17:34 2006
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in Tue Jul 11
13:09:02 2006
@@ -207,9 +207,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.166
kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.167
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.166 Tue Jul 11
10:17:35 2006
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in Tue Jul 11
13:09:03 2006
@@ -208,9 +208,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.141
kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.142
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.141 Tue Jul 11
10:17:36 2006
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in Tue Jul 11
13:09:05 2006
@@ -213,9 +213,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/kaffevm/verifier/Makefile.in
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.in:1.68
kaffe/kaffe/kaffevm/verifier/Makefile.in:1.69
--- kaffe/kaffe/kaffevm/verifier/Makefile.in:1.68 Tue Jul 11 10:17:38 2006
+++ kaffe/kaffe/kaffevm/verifier/Makefile.in Tue Jul 11 13:09:05 2006
@@ -209,9 +209,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.163 kaffe/kaffe/man/Makefile.in:1.164
--- kaffe/kaffe/man/Makefile.in:1.163 Tue Jul 11 10:17:39 2006
+++ kaffe/kaffe/man/Makefile.in Tue Jul 11 13:09:06 2006
@@ -195,9 +195,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.204
kaffe/kaffe/scripts/Makefile.in:1.205
--- kaffe/kaffe/scripts/Makefile.in:1.204 Tue Jul 11 10:17:40 2006
+++ kaffe/kaffe/scripts/Makefile.in Tue Jul 11 13:09:06 2006
@@ -212,9 +212,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.155
kaffe/kaffe/scripts/bat/Makefile.in:1.156
--- kaffe/kaffe/scripts/bat/Makefile.in:1.155 Tue Jul 11 10:17:40 2006
+++ kaffe/kaffe/scripts/bat/Makefile.in Tue Jul 11 13:09:07 2006
@@ -190,9 +190,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.182
kaffe/kaffe/scripts/compat/Makefile.in:1.183
--- kaffe/kaffe/scripts/compat/Makefile.in:1.182 Tue Jul 11 10:17:41 2006
+++ kaffe/kaffe/scripts/compat/Makefile.in Tue Jul 11 13:09:07 2006
@@ -196,9 +196,6 @@
JAVA_LIBS = @JAVA_LIBS@
JIKESPROG = @JIKESPROG@
KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
KAFFE_ARCHOS = @KAFFE_ARCHOS@
KAFFE_CFLAGS = @KAFFE_CFLAGS@
KAFFE_LIBS = @KAFFE_LIBS@
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
