[kaffe] config.frag files for linux
Kiyo Inaba
inaba at src.ricoh.co.jp
Wed Jul 30 02:49:02 PDT 2003
Hi,
Attached is a patch against 1.1.0 of config files for linux.
Unfortunately I can not compile all of them because I have not yet finished
to prepare closs compiling for all cpu's.
Things I changed are
1. Delete 'Khost_cpu' and 'Khost_os' defined in some files.
2. 'ac_cv_sizeof_int' etc. are now properly handled by 'configure'
even for cross compiling. (-> See note)
3. 'ac_cv_c_char_unsigned' is now set to 'no', when cross compiling.
4. 'CFLAGS' is now used only to append mandatory settings for the port.
5. Old notation of 'linux-threads' are changed to 'unix-pthreads'.
(-> See note)
Note2: Unfortunately 'ac_cv_alignmentof_voidp' can not be properly set for m68k,
and without explicitly specifying this, the generated kaffe-bin can not be
executed properly. I hope m68k should be the only machine which has different
values for 'ac_cv_alignmentof_voidp' and 'ac_cv_sizeof_voidp'.
Note5: Since '-lpthread' is automatically appended to link file list, I delete
second line for these if clause. By the way, which machine can support
unix-pthreads properly? I tried m68k-linux or sh3-linux but neither version
works fine.
Kiyo
-----------------------------------------------------------------------------
diff -Naur kaffe-1.1.0.orig/config/alpha/linux/config.frag kaffe-1.1.0/config/alpha/linux/config.frag
--- kaffe-1.1.0.orig/config/alpha/linux/config.frag 1999-12-18 14:09:21.000000000 +0900
+++ kaffe-1.1.0/config/alpha/linux/config.frag 2003-07-29 22:07:51.000000000 +0900
@@ -1,6 +1,9 @@
#
# Alpha/Linux configuration
#
-Khost_cpu=alpha
-Khost_os=linux
CFLAGS="$CFLAGS -mieee"
+
+# 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'}
+fi
diff -Naur kaffe-1.1.0.orig/config/arm/linux/config.frag kaffe-1.1.0/config/arm/linux/config.frag
--- kaffe-1.1.0.orig/config/arm/linux/config.frag 2000-07-21 12:57:02.000000000 +0900
+++ kaffe-1.1.0/config/arm/linux/config.frag 2003-07-29 22:07:58.000000000 +0900
@@ -1,22 +1,15 @@
#
# Arm/Linux configuration
#
-Khost_cpu=arm
-Khost_os=linux
#
# in ARM gcc characters are by default unsigned
#
CFLAGS="$CFLAGS -fsigned-char"
-if [ "$cross_compiling" = yes ]; then
# if we use cross environment, following values may not be detected.
- ac_cv_alignmentof_voidp=${ac_cv_alignmentof_voidp='4'}
- ac_cv_c_bigendian=${ac_cv_c_bigendian='no'}
- ac_cv_sizeof___int64=${ac_cv_sizeof___int64='0'}
- ac_cv_sizeof_int=${ac_cv_sizeof_int='4'}
- ac_cv_sizeof_long=${ac_cv_sizeof_long='4'}
- ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long='8'}
- ac_cv_sizeof_short=${ac_cv_sizeof_short='2'}
- ac_cv_sizeof_voidp=${ac_cv_sizeof_voidp='4'}
+if [ "$cross_compiling" = yes ]; then
+# ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working='yes'}
ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped='yes'}
+# ac_cv_func_utime_null=${ac_cv_func_utime_null='yes'}
+ ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
fi
diff -Naur kaffe-1.1.0.orig/config/i386/linux/config.frag kaffe-1.1.0/config/i386/linux/config.frag
--- kaffe-1.1.0.orig/config/i386/linux/config.frag 1999-12-18 14:09:32.000000000 +0900
+++ kaffe-1.1.0/config/i386/linux/config.frag 2003-07-29 23:23:34.000000000 +0900
@@ -1,11 +1,11 @@
#
# i386/Linux configuration
#
-Khost_cpu=i386
-Khost_os=linux
-
-if test x"$with_threads" = x"linux-threads" ; then
+if test x"$with_threads" = x"unix-pthreads" ; then
CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- VM_LIBS="$VM_LIBS -lpthread"
fi
+# 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'}
+fi
diff -Naur kaffe-1.1.0.orig/config/ia64/linux/config.frag kaffe-1.1.0/config/ia64/linux/config.frag
--- kaffe-1.1.0.orig/config/ia64/linux/config.frag 2002-05-30 04:49:58.000000000 +0900
+++ kaffe-1.1.0/config/ia64/linux/config.frag 2003-07-29 23:23:36.000000000 +0900
@@ -1,10 +1,11 @@
#
# ia64/Linux configuration
#
-Khost_cpu=ia64
-Khost_os=linux
-
-if test x"$with_threads" = x"linux-threads" ; then
+if test x"$with_threads" = x"unix-pthreads" ; then
CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- VM_LIBS="$VM_LIBS -lpthread"
+fi
+
+# 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'}
fi
diff -Naur kaffe-1.1.0.orig/config/m68k/linux/config.frag kaffe-1.1.0/config/m68k/linux/config.frag
--- kaffe-1.1.0.orig/config/m68k/linux/config.frag 1999-12-18 14:09:34.000000000 +0900
+++ kaffe-1.1.0/config/m68k/linux/config.frag 2003-07-30 12:04:04.000000000 +0900
@@ -1,18 +1,10 @@
#
# m68k/Linux configuration.
#
-Khost_cpu=m68k
-Khost_os=linux
-CFLAGS="-g -fno-omit-frame-pointer"
-#CFLAGS="-g -O -fno-omit-frame-pointer"
-if [ "$cross_compiling" = yes ]; then
+CFLAGS="$CFLAGS -fno-omit-frame-pointer"
+
# if we use cross environment, following values may not be detected.
+if [ "$cross_compiling" = yes ]; then
ac_cv_alignmentof_voidp=${ac_cv_alignmentof_voidp='2'}
- ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
- ac_cv_sizeof___int64=${ac_cv_sizeof___int64='0'}
- ac_cv_sizeof_int=${ac_cv_sizeof_int='4'}
- ac_cv_sizeof_long=${ac_cv_sizeof_long='4'}
- ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long='8'}
- ac_cv_sizeof_short=${ac_cv_sizeof_short='2'}
- ac_cv_sizeof_voidp=${ac_cv_sizeof_voidp='4'}
+ ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
fi
diff -Naur kaffe-1.1.0.orig/config/mips/linux/config.frag kaffe-1.1.0/config/mips/linux/config.frag
--- kaffe-1.1.0.orig/config/mips/linux/config.frag 1999-09-07 06:44:38.000000000 +0900
+++ kaffe-1.1.0/config/mips/linux/config.frag 2003-07-29 22:08:20.000000000 +0900
@@ -1,4 +1,9 @@
#
# Mips/Linux configuration.
#
-CFLAGS="-g -O2 -fno-omit-frame-pointer"
+CFLAGS="$CFLAGS -fno-omit-frame-pointer"
+
+# 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'}
+fi
diff -Naur kaffe-1.1.0.orig/config/parisc/linux/config.frag kaffe-1.1.0/config/parisc/linux/config.frag
--- kaffe-1.1.0.orig/config/parisc/linux/config.frag 2002-04-26 16:49:13.000000000 +0900
+++ kaffe-1.1.0/config/parisc/linux/config.frag 2003-07-29 22:08:26.000000000 +0900
@@ -1,5 +1,7 @@
#
# Parisc/linux configuration.
#
-Khost_cpu=parisc
-Khost_os=linux
+# 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'}
+fi
diff -Naur kaffe-1.1.0.orig/config/powerpc/linux/config.frag kaffe-1.1.0/config/powerpc/linux/config.frag
--- kaffe-1.1.0.orig/config/powerpc/linux/config.frag 2000-07-26 21:54:35.000000000 +0900
+++ kaffe-1.1.0/config/powerpc/linux/config.frag 2003-07-29 22:08:30.000000000 +0900
@@ -1,6 +1,9 @@
#
# PowerPC/Linux configuration
#
-Khost_cpu=powerpc
-Khost_os=linux
-CFLAGS="-g -O2 -fsigned-char"
+CFLAGS="$CFLAGS -fsigned-char"
+
+# 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'}
+fi
diff -Naur kaffe-1.1.0.orig/config/s390/linux/config.frag kaffe-1.1.0/config/s390/linux/config.frag
--- kaffe-1.1.0.orig/config/s390/linux/config.frag 2002-05-30 05:00:18.000000000 +0900
+++ kaffe-1.1.0/config/s390/linux/config.frag 2003-07-29 23:23:48.000000000 +0900
@@ -1,12 +1,11 @@
#
# s390/Linux configuration (clone from i386/linux/config.frag by ROSSP)
#
-host_cpu=s390
-host_os=linux
-
-#if test x"$with_threads" = x"linux-threads" ; then
if test x"$with_threads" = x"unix-pthreads" ; then
CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- VM_LIBS="$VM_LIBS -lpthread"
fi
+# 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'}
+fi
diff -Naur kaffe-1.1.0.orig/config/sparc/linux/config.frag kaffe-1.1.0/config/sparc/linux/config.frag
--- kaffe-1.1.0.orig/config/sparc/linux/config.frag 1999-12-18 14:09:37.000000000 +0900
+++ kaffe-1.1.0/config/sparc/linux/config.frag 2003-07-29 22:08:39.000000000 +0900
@@ -1,5 +1,7 @@
#
# Sparc/Linux configuration
#
-Khost_cpu=sparc
-Khost_os=linux
+# 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'}
+fi
diff -Naur kaffe-1.1.0.orig/config/x86_64/linux/config.frag kaffe-1.1.0/config/x86_64/linux/config.frag
--- kaffe-1.1.0.orig/config/x86_64/linux/config.frag 2003-05-19 17:03:25.000000000 +0900
+++ kaffe-1.1.0/config/x86_64/linux/config.frag 2003-07-29 23:23:57.000000000 +0900
@@ -1,10 +1,11 @@
#
# x86-64/Linux configuration
#
-Khost_cpu=x86_64
-Khost_os=linux
-
-if test x"$with_threads" = x"linux-threads" ; then
+if test x"$with_threads" = x"unix-pthreads" ; then
CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- VM_LIBS="$VM_LIBS -lpthread"
+fi
+
+# 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'}
fi
More information about the kaffe
mailing list