PatchSet 7345 Date: 2006/07/15 18:35:12 Author: robilad Branch: HEAD Tag: (none) Log: cross-compilation fixes for x86_64
2006-07-15 Dalibor Topic <[EMAIL PROTECTED]> Cross-compilation fixes for Debian's gcc 4.1 cross-compilation toolchain. * configure.ac: Propagate KAFFE_CFLAGS to sub-configure invocations. * config/x86_64/linux/config.frag: (KAFFE_CFLAGS) Added with -m64 to make sure Debian's gcc cross-compilation toolchain picks is up. * external/gcc/zlib/Makefile.am: (AM_CFLAGS) Added. * kaffe/kaffeh/Makefile.am (kaffeh_CFLAGS), kaffe/kaffevm/Makefile.am (libkaffevm_la_CFLAGS), kaffe/kaffevm/systems/unix-pthreads/Makefile.am (libkthread_la_CFLAGS), libraries/clib/io/Makefile.am (libjavaio_la_CFLAGS), libraries/clib/management/Makefile.am (libmanagement_la_CFLAGS), libraries/clib/native/Makefile.am (libjavalang_la_CFLAGS), libraries/clib/net/Makefile.am (libjavanet_la_CFLAGS), libraries/clib/native/Makefile.am (libjavalang_la_CFLAGS), libraries/clib/net/Makefile.am (libjavanet_la_CFLAGS), libraries/clib/nio/Makefile.am (libjavanio_la_CFLAGS), libraries/clib/security/Makefile.am (libsecurity_la_CFLAGS), libraries/clib/zip/Makefile.am (libzip_la_CFLAGS): Added KAFFE_CFLAGS via AM_CFLAGS. * libraries/clib/Makefile.am (MAYBE_NATIVE_MATH_DIR) New variable. (SUBDIRS) Only compile native java.math implementation if pure java java.math has not been configured. Members: ChangeLog:1.4848->1.4849 configure:1.557->1.558 configure.ac:1.235->1.236 config/x86_64/linux/config.frag:1.4->1.5 external/gcc/zlib/Makefile.am:1.1->1.2 external/gcc/zlib/Makefile.in:1.16->1.17 kaffe/kaffeh/Makefile.am:1.26->1.27 kaffe/kaffeh/Makefile.in:1.183->1.184 kaffe/kaffevm/Makefile.am:1.83->1.84 kaffe/kaffevm/Makefile.in:1.237->1.238 kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.16->1.17 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.144->1.145 libraries/clib/Makefile.am:1.23->1.24 libraries/clib/Makefile.in:1.179->1.180 libraries/clib/io/Makefile.am:1.21->1.22 libraries/clib/io/Makefile.in:1.175->1.176 libraries/clib/management/Makefile.am:1.17->1.18 libraries/clib/management/Makefile.in:1.179->1.180 libraries/clib/native/Makefile.am:1.57->1.58 libraries/clib/native/Makefile.in:1.224->1.225 libraries/clib/net/Makefile.am:1.23->1.24 libraries/clib/net/Makefile.in:1.185->1.186 libraries/clib/nio/Makefile.am:1.22->1.23 libraries/clib/nio/Makefile.in:1.110->1.111 libraries/clib/security/Makefile.am:1.19->1.20 libraries/clib/security/Makefile.in:1.145->1.146 libraries/clib/zip/Makefile.am:1.16->1.17 libraries/clib/zip/Makefile.in:1.177->1.178 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.4848 kaffe/ChangeLog:1.4849 --- kaffe/ChangeLog:1.4848 Sat Jul 15 15:01:01 2006 +++ kaffe/ChangeLog Sat Jul 15 18:35:12 2006 @@ -1,5 +1,37 @@ 2006-07-15 Dalibor Topic <[EMAIL PROTECTED]> + Cross-compilation fixes for Debian's gcc 4.1 cross-compilation + toolchain. + + * configure.ac: Propagate KAFFE_CFLAGS to sub-configure + invocations. + + * config/x86_64/linux/config.frag: (KAFFE_CFLAGS) Added + with -m64 to make sure Debian's gcc cross-compilation + toolchain picks is up. + + * external/gcc/zlib/Makefile.am: (AM_CFLAGS) Added. + + * kaffe/kaffeh/Makefile.am (kaffeh_CFLAGS), + kaffe/kaffevm/Makefile.am (libkaffevm_la_CFLAGS), + kaffe/kaffevm/systems/unix-pthreads/Makefile.am (libkthread_la_CFLAGS), + libraries/clib/io/Makefile.am (libjavaio_la_CFLAGS), + libraries/clib/management/Makefile.am (libmanagement_la_CFLAGS), + libraries/clib/native/Makefile.am (libjavalang_la_CFLAGS), + libraries/clib/net/Makefile.am (libjavanet_la_CFLAGS), + libraries/clib/native/Makefile.am (libjavalang_la_CFLAGS), + libraries/clib/net/Makefile.am (libjavanet_la_CFLAGS), + libraries/clib/nio/Makefile.am (libjavanio_la_CFLAGS), + libraries/clib/security/Makefile.am (libsecurity_la_CFLAGS), + libraries/clib/zip/Makefile.am (libzip_la_CFLAGS): + Added KAFFE_CFLAGS via AM_CFLAGS. + + * libraries/clib/Makefile.am (MAYBE_NATIVE_MATH_DIR) New variable. + (SUBDIRS) Only compile native java.math implementation if pure java + java.math has not been configured. + +2006-07-15 Dalibor Topic <[EMAIL PROTECTED]> + Fix for #47. * config/ia64/atomic.h: Updated to the Index: kaffe/configure diff -u kaffe/configure:1.557 kaffe/configure:1.558 --- kaffe/configure:1.557 Sat Jul 15 13:37:26 2006 +++ kaffe/configure Sat Jul 15 18:35:17 2006 @@ -50986,6 +50986,8 @@ ac_configure_args="$ac_configure_args --with-glibj=none"; fi +ac_configure_args="$ac_configure_args CFLAGS=\"${KAFFE_CFLAGS} ${CFLAGS}\""; + subdirs="$subdirs libraries/javalib/external/classpath" Index: kaffe/configure.ac diff -u kaffe/configure.ac:1.235 kaffe/configure.ac:1.236 --- kaffe/configure.ac:1.235 Sat Jul 15 13:37:33 2006 +++ kaffe/configure.ac Sat Jul 15 18:35:24 2006 @@ -2495,6 +2495,8 @@ ac_configure_args="$ac_configure_args --with-glibj=none"; fi +ac_configure_args="$ac_configure_args CFLAGS=\"${KAFFE_CFLAGS} ${CFLAGS}\""; + AC_CONFIG_SUBDIRS([libraries/javalib/external/classpath]) AC_CONFIG_SUBDIRS([external/gcc/fastjar]) Index: kaffe/config/x86_64/linux/config.frag diff -u kaffe/config/x86_64/linux/config.frag:1.4 kaffe/config/x86_64/linux/config.frag:1.5 --- kaffe/config/x86_64/linux/config.frag:1.4 Tue Jan 31 02:27:41 2006 +++ kaffe/config/x86_64/linux/config.frag Sat Jul 15 18:35:25 2006 @@ -5,6 +5,9 @@ CPPFLAGS="$CPPFLAGS -D_REENTRANT" fi +# Make sure that the compiler knows about the additional registers +KAFFE_CFLAGS="$KAFFE_CFLAGS -m64" + # if we use cross environment, following values may not be detected. if [ "$cross_compiling" = yes ]; then ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'} Index: kaffe/external/gcc/zlib/Makefile.am diff -u kaffe/external/gcc/zlib/Makefile.am:1.1 kaffe/external/gcc/zlib/Makefile.am:1.2 --- kaffe/external/gcc/zlib/Makefile.am:1.1 Tue Jan 3 15:27:03 2006 +++ kaffe/external/gcc/zlib/Makefile.am Sat Jul 15 18:35:26 2006 @@ -1,5 +1,8 @@ ## Process this file with automake to create Makefile.in. +AM_CFLAGS = \ + $(KAFFE_CFLAGS) + ZLIB_SOURCES = adler32.c compress.c crc32.c crc32.h deflate.c \ deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c \ inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h \ Index: kaffe/external/gcc/zlib/Makefile.in diff -u kaffe/external/gcc/zlib/Makefile.in:1.16 kaffe/external/gcc/zlib/Makefile.in:1.17 --- kaffe/external/gcc/zlib/Makefile.in:1.16 Thu Jul 13 20:23:00 2006 +++ kaffe/external/gcc/zlib/Makefile.in Sat Jul 15 18:35:26 2006 @@ -355,6 +355,9 @@ target_alias = @target_alias@ toolslibdir = @toolslibdir@ with_engine = @with_engine@ +AM_CFLAGS = \ + $(KAFFE_CFLAGS) + ZLIB_SOURCES = adler32.c compress.c crc32.c crc32.h deflate.c \ deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c \ inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h \ Index: kaffe/kaffe/kaffeh/Makefile.am diff -u kaffe/kaffe/kaffeh/Makefile.am:1.26 kaffe/kaffe/kaffeh/Makefile.am:1.27 --- kaffe/kaffe/kaffeh/Makefile.am:1.26 Tue Jul 11 00:00:18 2006 +++ kaffe/kaffe/kaffeh/Makefile.am Sat Jul 15 18:35:27 2006 @@ -29,6 +29,7 @@ bin_PROGRAMS = kaffeh kaffeh_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) kaffeh_LDADD = \ Index: kaffe/kaffe/kaffeh/Makefile.in diff -u kaffe/kaffe/kaffeh/Makefile.in:1.183 kaffe/kaffe/kaffeh/Makefile.in:1.184 --- kaffe/kaffe/kaffeh/Makefile.in:1.183 Thu Jul 13 20:23:08 2006 +++ kaffe/kaffe/kaffeh/Makefile.in Sat Jul 15 18:35:27 2006 @@ -391,6 +391,7 @@ $(MAYBE_INTERNAL_ZIP_INCLUDES) kaffeh_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) kaffeh_LDADD = \ Index: kaffe/kaffe/kaffevm/Makefile.am diff -u kaffe/kaffe/kaffevm/Makefile.am:1.83 kaffe/kaffe/kaffevm/Makefile.am:1.84 --- kaffe/kaffe/kaffevm/Makefile.am:1.83 Tue Jul 11 10:17:20 2006 +++ kaffe/kaffe/kaffevm/Makefile.am Sat Jul 15 18:35:28 2006 @@ -56,6 +56,7 @@ endif libkaffevm_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) \ $(PTHREAD_CFLAGS) Index: kaffe/kaffe/kaffevm/Makefile.in diff -u kaffe/kaffe/kaffevm/Makefile.in:1.237 kaffe/kaffe/kaffevm/Makefile.in:1.238 --- kaffe/kaffe/kaffevm/Makefile.in:1.237 Thu Jul 13 20:23:08 2006 +++ kaffe/kaffe/kaffevm/Makefile.in Sat Jul 15 18:35:28 2006 @@ -439,6 +439,7 @@ @[EMAIL PROTECTED] = # @[EMAIL PROTECTED] = gcj/libgcj.la libkaffevm_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) \ $(PTHREAD_CFLAGS) Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.16 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.17 --- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.16 Sun Jul 9 16:58:53 2006 +++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am Sat Jul 15 18:35:28 2006 @@ -23,6 +23,7 @@ $(SEMAPHORE_LIB) libkthread_la_CFLAGS = \ + $(AM_CFLAGS) \ $(PTHREAD_CFLAGS) libkthread_la_SOURCES = \ Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.144 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.145 --- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.144 Thu Jul 13 20:23:18 2006 +++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in Sat Jul 15 18:35:28 2006 @@ -377,6 +377,7 @@ $(SEMAPHORE_LIB) libkthread_la_CFLAGS = \ + $(AM_CFLAGS) \ $(PTHREAD_CFLAGS) libkthread_la_SOURCES = \ Index: kaffe/libraries/clib/Makefile.am diff -u kaffe/libraries/clib/Makefile.am:1.23 kaffe/libraries/clib/Makefile.am:1.24 --- kaffe/libraries/clib/Makefile.am:1.23 Tue Jan 3 15:27:35 2006 +++ kaffe/libraries/clib/Makefile.am Sat Jul 15 18:35:29 2006 @@ -17,6 +17,11 @@ MAYBE_NATIVE_SOUND_DIR = sound endif +if COND_PURE_JAVA_MATH +else + MAYBE_NATIVE_MATH_DIR = math +endif + SUBDIRS = \ target \ native \ @@ -24,8 +29,8 @@ nio \ net \ zip \ - math \ security \ management \ $(MAYBE_NATIVE_AWT_DIR) \ + $(MAYBE_NATIVE_MATH_DIR) \ $(MAYBE_NATIVE_SOUND_DIR) Index: kaffe/libraries/clib/Makefile.in diff -u kaffe/libraries/clib/Makefile.in:1.179 kaffe/libraries/clib/Makefile.in:1.180 --- kaffe/libraries/clib/Makefile.in:1.179 Thu Jul 13 20:23:25 2006 +++ kaffe/libraries/clib/Makefile.in Sat Jul 15 18:35:29 2006 @@ -84,8 +84,8 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = target native io nio net zip math security management \ - awt sound +DIST_SUBDIRS = target native io nio net zip security management awt \ + math sound DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALSA_CFLAGS = @ALSA_CFLAGS@ @@ -357,6 +357,7 @@ with_engine = @with_engine@ @[EMAIL PROTECTED] = awt @[EMAIL PROTECTED] = sound [EMAIL PROTECTED]@MAYBE_NATIVE_MATH_DIR = math SUBDIRS = \ target \ native \ @@ -364,10 +365,10 @@ nio \ net \ zip \ - math \ security \ management \ $(MAYBE_NATIVE_AWT_DIR) \ + $(MAYBE_NATIVE_MATH_DIR) \ $(MAYBE_NATIVE_SOUND_DIR) all: all-recursive Index: kaffe/libraries/clib/io/Makefile.am diff -u kaffe/libraries/clib/io/Makefile.am:1.21 kaffe/libraries/clib/io/Makefile.am:1.22 --- kaffe/libraries/clib/io/Makefile.am:1.21 Sat Jul 8 14:44:26 2006 +++ kaffe/libraries/clib/io/Makefile.am Sat Jul 15 18:35:29 2006 @@ -16,6 +16,7 @@ native_LTLIBRARIES = libjavaio.la libjavaio_la_CFLAGS = \ + $(KAFFE_CFLAGS) \ $(CFLAGS_PG) libjavaio_la_LDFLAGS = \ Index: kaffe/libraries/clib/io/Makefile.in diff -u kaffe/libraries/clib/io/Makefile.in:1.175 kaffe/libraries/clib/io/Makefile.in:1.176 --- kaffe/libraries/clib/io/Makefile.in:1.175 Thu Jul 13 20:23:29 2006 +++ kaffe/libraries/clib/io/Makefile.in Sat Jul 15 18:35:29 2006 @@ -379,6 +379,7 @@ native_LTLIBRARIES = libjavaio.la libjavaio_la_CFLAGS = \ + $(KAFFE_CFLAGS) \ $(CFLAGS_PG) libjavaio_la_LDFLAGS = \ Index: kaffe/libraries/clib/management/Makefile.am diff -u kaffe/libraries/clib/management/Makefile.am:1.17 kaffe/libraries/clib/management/Makefile.am:1.18 --- kaffe/libraries/clib/management/Makefile.am:1.17 Sun Jul 9 16:59:06 2006 +++ kaffe/libraries/clib/management/Makefile.am Sat Jul 15 18:35:31 2006 @@ -17,6 +17,7 @@ native_LTLIBRARIES = libmanagement.la libmanagement_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libmanagement_la_LDFLAGS = \ Index: kaffe/libraries/clib/management/Makefile.in diff -u kaffe/libraries/clib/management/Makefile.in:1.179 kaffe/libraries/clib/management/Makefile.in:1.180 --- kaffe/libraries/clib/management/Makefile.in:1.179 Thu Jul 13 20:23:30 2006 +++ kaffe/libraries/clib/management/Makefile.in Sat Jul 15 18:35:31 2006 @@ -379,6 +379,7 @@ native_LTLIBRARIES = libmanagement.la libmanagement_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libmanagement_la_LDFLAGS = \ Index: kaffe/libraries/clib/native/Makefile.am diff -u kaffe/libraries/clib/native/Makefile.am:1.57 kaffe/libraries/clib/native/Makefile.am:1.58 --- kaffe/libraries/clib/native/Makefile.am:1.57 Sun Jul 9 16:59:07 2006 +++ kaffe/libraries/clib/native/Makefile.am Sat Jul 15 18:35:32 2006 @@ -62,6 +62,7 @@ TimeZone.c libjavalang_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libjavalang_la_LDFLAGS = \ Index: kaffe/libraries/clib/native/Makefile.in diff -u kaffe/libraries/clib/native/Makefile.in:1.224 kaffe/libraries/clib/native/Makefile.in:1.225 --- kaffe/libraries/clib/native/Makefile.in:1.224 Thu Jul 13 20:23:31 2006 +++ kaffe/libraries/clib/native/Makefile.in Sat Jul 15 18:35:32 2006 @@ -443,6 +443,7 @@ TimeZone.c libjavalang_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libjavalang_la_LDFLAGS = \ Index: kaffe/libraries/clib/net/Makefile.am diff -u kaffe/libraries/clib/net/Makefile.am:1.23 kaffe/libraries/clib/net/Makefile.am:1.24 --- kaffe/libraries/clib/net/Makefile.am:1.23 Sun Jul 9 16:59:08 2006 +++ kaffe/libraries/clib/net/Makefile.am Sat Jul 15 18:35:33 2006 @@ -18,6 +18,7 @@ -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) libjavanet_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libjavanet_la_LDFLAGS = \ Index: kaffe/libraries/clib/net/Makefile.in diff -u kaffe/libraries/clib/net/Makefile.in:1.185 kaffe/libraries/clib/net/Makefile.in:1.186 --- kaffe/libraries/clib/net/Makefile.in:1.185 Thu Jul 13 20:23:32 2006 +++ kaffe/libraries/clib/net/Makefile.in Sat Jul 15 18:35:33 2006 @@ -385,6 +385,7 @@ -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) libjavanet_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libjavanet_la_LDFLAGS = \ Index: kaffe/libraries/clib/nio/Makefile.am diff -u kaffe/libraries/clib/nio/Makefile.am:1.22 kaffe/libraries/clib/nio/Makefile.am:1.23 --- kaffe/libraries/clib/nio/Makefile.am:1.22 Sat Jul 8 14:44:31 2006 +++ kaffe/libraries/clib/nio/Makefile.am Sat Jul 15 18:35:33 2006 @@ -16,6 +16,7 @@ native_LTLIBRARIES = libjavanio.la libjavanio_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libjavanio_la_LDFLAGS = \ Index: kaffe/libraries/clib/nio/Makefile.in diff -u kaffe/libraries/clib/nio/Makefile.in:1.110 kaffe/libraries/clib/nio/Makefile.in:1.111 --- kaffe/libraries/clib/nio/Makefile.in:1.110 Thu Jul 13 20:23:40 2006 +++ kaffe/libraries/clib/nio/Makefile.in Sat Jul 15 18:35:33 2006 @@ -386,6 +386,7 @@ native_LTLIBRARIES = libjavanio.la libjavanio_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libjavanio_la_LDFLAGS = \ Index: kaffe/libraries/clib/security/Makefile.am diff -u kaffe/libraries/clib/security/Makefile.am:1.19 kaffe/libraries/clib/security/Makefile.am:1.20 --- kaffe/libraries/clib/security/Makefile.am:1.19 Sun Jul 9 16:59:09 2006 +++ kaffe/libraries/clib/security/Makefile.am Sat Jul 15 18:35:34 2006 @@ -29,6 +29,7 @@ $(security_DATA) libsecurity_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libsecurity_la_LDFLAGS = \ Index: kaffe/libraries/clib/security/Makefile.in diff -u kaffe/libraries/clib/security/Makefile.in:1.145 kaffe/libraries/clib/security/Makefile.in:1.146 --- kaffe/libraries/clib/security/Makefile.in:1.145 Thu Jul 13 20:23:41 2006 +++ kaffe/libraries/clib/security/Makefile.in Sat Jul 15 18:35:34 2006 @@ -395,6 +395,7 @@ $(security_DATA) libsecurity_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libsecurity_la_LDFLAGS = \ Index: kaffe/libraries/clib/zip/Makefile.am diff -u kaffe/libraries/clib/zip/Makefile.am:1.16 kaffe/libraries/clib/zip/Makefile.am:1.17 --- kaffe/libraries/clib/zip/Makefile.am:1.16 Sat Jul 8 14:44:37 2006 +++ kaffe/libraries/clib/zip/Makefile.am Sat Jul 15 18:35:34 2006 @@ -22,6 +22,7 @@ native_LTLIBRARIES = libzip.la libzip_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libzip_la_LDFLAGS = \ Index: kaffe/libraries/clib/zip/Makefile.in diff -u kaffe/libraries/clib/zip/Makefile.in:1.177 kaffe/libraries/clib/zip/Makefile.in:1.178 --- kaffe/libraries/clib/zip/Makefile.in:1.177 Thu Jul 13 20:23:47 2006 +++ kaffe/libraries/clib/zip/Makefile.in Sat Jul 15 18:35:34 2006 @@ -383,6 +383,7 @@ native_LTLIBRARIES = libzip.la libzip_la_CFLAGS = \ + $(AM_CFLAGS) \ $(CFLAGS_PG) libzip_la_LDFLAGS = \ _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe