PatchSet 7312
Date: 2006/07/05 23:55:48
Author: robilad
Branch: HEAD
Tag: (none)
Log:
gcc 4.1.x fixes
2006-07-06 Dalibor Topic <[EMAIL PROTECTED]>
* config/i386/jit.h (FIRSTFRAME): Don't use
__builtin_frame_address, as that behaves differently
under -O0 and -O1 under gcc 4.1.x. Use a small bit
of assembler instead.
* configure.ac: Ensure that -fno-strict-aliasing and
-fno-omit-frame-pointer are set for gcc.
Members:
ChangeLog:1.4816->1.4817
configure:1.543->1.544
configure.ac:1.221->1.222
config/i386/jit.h:1.28->1.29
libraries/javalib/Makefile.am:1.432->1.433
libraries/javalib/Makefile.in:1.539->1.540
libraries/javalib/external/classpath/config.guess:1.22->1.23
libraries/javalib/external/classpath/ltmain.sh:1.22->1.23
scripts/ltmain.sh:1.26->1.27
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4816 kaffe/ChangeLog:1.4817
--- kaffe/ChangeLog:1.4816 Fri Jun 23 18:58:34 2006
+++ kaffe/ChangeLog Wed Jul 5 23:55:48 2006
@@ -1,3 +1,13 @@
+2006-07-06 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * config/i386/jit.h (FIRSTFRAME): Don't use
+ __builtin_frame_address, as that behaves differently
+ under -O0 and -O1 under gcc 4.1.x. Use a small bit
+ of assembler instead.
+
+ * configure.ac: Ensure that -fno-strict-aliasing and
+ -fno-omit-frame-pointer are set for gcc.
+
2006-06-17 Guilhem Lavaux <[EMAIL PROTECTED]>
* libraries/javalib/Makefile.am,
Index: kaffe/configure
diff -u kaffe/configure:1.543 kaffe/configure:1.544
--- kaffe/configure:1.543 Mon Jun 5 15:21:22 2006
+++ kaffe/configure Wed Jul 5 23:55:51 2006
@@ -3873,6 +3873,201 @@
esac
+## Required for gcc 4.1.x as long as kaffe's
+## not cleaned up to use unions in classMethod.h
+## where necessary.
+echo "$as_me:$LINENO: checking CFLAGS for gcc -fno-strict-aliasing" >&5
+echo $ECHO_N "checking CFLAGS for gcc -fno-strict-aliasing... $ECHO_C" >&6
+if test "${ac_cv_cflags_gcc_option__fno_strict_aliasing+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_cflags_gcc_option__fno_strict_aliasing="no, unknown"
+
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ ac_save_CFLAGS="$CFLAGS"
+for ac_arg in "-pedantic % -fno-strict-aliasing" #
+do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_cflags_gcc_option__fno_strict_aliasing=`echo $ac_arg | sed -e 's,.*%
*,,'` ; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+ CFLAGS="$ac_save_CFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__fno_strict_aliasing"
>&5
+echo "${ECHO_T}$ac_cv_cflags_gcc_option__fno_strict_aliasing" >&6
+case ".$ac_cv_cflags_gcc_option__fno_strict_aliasing" in
+ .ok|.ok,*) ;;
+ .|.no|.no,*) ;;
+ *)
+ if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__fno_strict_aliasing
" 2>&1 >/dev/null
+ then { (echo "$as_me:$LINENO: : CFLAGS does contain
\$ac_cv_cflags_gcc_option__fno_strict_aliasing") >&5
+ (: CFLAGS does contain $ac_cv_cflags_gcc_option__fno_strict_aliasing) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS
\$ac_cv_cflags_gcc_option__fno_strict_aliasing\"") >&5
+ (: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__fno_strict_aliasing") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ CFLAGS="$CFLAGS
$ac_cv_cflags_gcc_option__fno_strict_aliasing"
+ fi
+ ;;
+esac
+
+
+## Required for gcc 4.1.x and above, as it
+## omits the frame pointer on -O1 and above on
+## some architectures, notably i386, making
+## it impossible to unwind exceptions.
+echo "$as_me:$LINENO: checking CFLAGS for gcc -fno-omit-frame-pointer" >&5
+echo $ECHO_N "checking CFLAGS for gcc -fno-omit-frame-pointer... $ECHO_C" >&6
+if test "${ac_cv_cflags_gcc_option__fno_omit_frame_pointer+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_cflags_gcc_option__fno_omit_frame_pointer="no, unknown"
+
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ ac_save_CFLAGS="$CFLAGS"
+for ac_arg in "-pedantic % -fno-omit-frame-pointer" #
+do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_cflags_gcc_option__fno_omit_frame_pointer=`echo $ac_arg | sed -e
's,.*% *,,'` ; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+ CFLAGS="$ac_save_CFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+echo "$as_me:$LINENO: result:
$ac_cv_cflags_gcc_option__fno_omit_frame_pointer" >&5
+echo "${ECHO_T}$ac_cv_cflags_gcc_option__fno_omit_frame_pointer" >&6
+case ".$ac_cv_cflags_gcc_option__fno_omit_frame_pointer" in
+ .ok|.ok,*) ;;
+ .|.no|.no,*) ;;
+ *)
+ if echo " $CFLAGS " | grep "
$ac_cv_cflags_gcc_option__fno_omit_frame_pointer " 2>&1 >/dev/null
+ then { (echo "$as_me:$LINENO: : CFLAGS does contain
\$ac_cv_cflags_gcc_option__fno_omit_frame_pointer") >&5
+ (: CFLAGS does contain $ac_cv_cflags_gcc_option__fno_omit_frame_pointer) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ else { (echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS
\$ac_cv_cflags_gcc_option__fno_omit_frame_pointer\"") >&5
+ (: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__fno_omit_frame_pointer") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ CFLAGS="$CFLAGS
$ac_cv_cflags_gcc_option__fno_omit_frame_pointer"
+ fi
+ ;;
+esac
+
+
@@ -5993,7 +6188,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5996 "configure"' > conftest.$ac_ext
+ echo '#line 6191 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7370,7 +7565,7 @@
# Provide some information about the compiler.
-echo "$as_me:7373:" \
+echo "$as_me:7568:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8437,11 +8632,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8440: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8635: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8444: \$? = $ac_status" >&5
+ echo "$as_me:8639: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8705,11 +8900,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8708: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8903: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8712: \$? = $ac_status" >&5
+ echo "$as_me:8907: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8809,11 +9004,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8812: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9007: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8816: \$? = $ac_status" >&5
+ echo "$as_me:9011: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11154,7 +11349,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11157 "configure"
+#line 11352 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11254,7 +11449,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11257 "configure"
+#line 11452 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13598,11 +13793,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13601: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13796: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13605: \$? = $ac_status" >&5
+ echo "$as_me:13800: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13702,11 +13897,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13705: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13900: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13709: \$? = $ac_status" >&5
+ echo "$as_me:13904: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15272,11 +15467,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15275: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15470: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15279: \$? = $ac_status" >&5
+ echo "$as_me:15474: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15376,11 +15571,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15379: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15574: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15383: \$? = $ac_status" >&5
+ echo "$as_me:15578: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17583,11 +17778,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17586: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17781: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17590: \$? = $ac_status" >&5
+ echo "$as_me:17785: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17851,11 +18046,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17854: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18049: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17858: \$? = $ac_status" >&5
+ echo "$as_me:18053: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17955,11 +18150,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17958: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18153: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17962: \$? = $ac_status" >&5
+ echo "$as_me:18157: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.221 kaffe/configure.ac:1.222
--- kaffe/configure.ac:1.221 Mon Jun 5 15:21:25 2006
+++ kaffe/configure.ac Wed Jul 5 23:56:01 2006
@@ -187,6 +187,17 @@
## and GNU/Linux.
AX_CFLAGS_GCC_OPTION([-mregnames])
+## Required for gcc 4.1.x as long as kaffe's
+## not cleaned up to use unions in classMethod.h
+## where necessary.
+AX_CFLAGS_GCC_OPTION([-fno-strict-aliasing])
+
+## Required for gcc 4.1.x and above, as it
+## omits the frame pointer on -O1 and above on
+## some architectures, notably i386, making
+## it impossible to unwind exceptions.
+AX_CFLAGS_GCC_OPTION([-fno-omit-frame-pointer])
+
GCC_ATTRIBUTE_ALWAYS_INLINE
GCC_ATTRIBUTE_CONST
GCC_ATTRIBUTE_FORMAT
Index: kaffe/config/i386/jit.h
diff -u kaffe/config/i386/jit.h:1.28 kaffe/config/i386/jit.h:1.29
--- kaffe/config/i386/jit.h:1.28 Thu Mar 23 20:00:19 2006
+++ kaffe/config/i386/jit.h Wed Jul 5 23:56:02 2006
@@ -41,7 +41,11 @@
/* Get the first exception frame from a subroutine call */
#define FIRSTFRAME(f, o)
\
- ((f) = *(exceptionFrame*)__builtin_frame_address(0))
+do { \
+ void * bp; \
+ __asm__( "movl %%ebp, %0" : "=g"(bp)); \
+ f = *((exceptionFrame*) bp); \
+} while (0);
/**/
/* Method dispatch. */
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.432
kaffe/libraries/javalib/Makefile.am:1.433
--- kaffe/libraries/javalib/Makefile.am:1.432 Fri Jun 23 18:58:41 2006
+++ kaffe/libraries/javalib/Makefile.am Wed Jul 5 23:56:02 2006
@@ -233,12 +233,16 @@
vmspecific/java/lang/VMProcess.java \
vmspecific/java/lang/VMRuntime.java \
vmspecific/java/lang/VMSystem.java \
+ vmspecific/java/lang/VMSystem.java.orig \
vmspecific/java/lang/VMThread.java \
vmspecific/java/lang/VMThrowable.java \
vmspecific/java/lang/ref/Reference.java \
vmspecific/java/lang/reflect/Constructor.java \
+ vmspecific/java/lang/reflect/Constructor.java.orig \
vmspecific/java/lang/reflect/Field.java \
+ vmspecific/java/lang/reflect/Field.java.orig \
vmspecific/java/lang/reflect/Method.java \
+ vmspecific/java/lang/reflect/Method.java.orig \
vmspecific/java/lang/reflect/VMArray.java \
vmspecific/java/lang/reflect/VMProxy.java \
vmspecific/java/net/InetAddress.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.539
kaffe/libraries/javalib/Makefile.in:1.540
--- kaffe/libraries/javalib/Makefile.in:1.539 Fri Jun 23 18:58:42 2006
+++ kaffe/libraries/javalib/Makefile.in Wed Jul 5 23:56:03 2006
@@ -554,12 +554,16 @@
vmspecific/java/lang/VMProcess.java \
vmspecific/java/lang/VMRuntime.java \
vmspecific/java/lang/VMSystem.java \
+ vmspecific/java/lang/VMSystem.java.orig \
vmspecific/java/lang/VMThread.java \
vmspecific/java/lang/VMThrowable.java \
vmspecific/java/lang/ref/Reference.java \
vmspecific/java/lang/reflect/Constructor.java \
+ vmspecific/java/lang/reflect/Constructor.java.orig \
vmspecific/java/lang/reflect/Field.java \
+ vmspecific/java/lang/reflect/Field.java.orig \
vmspecific/java/lang/reflect/Method.java \
+ vmspecific/java/lang/reflect/Method.java.orig \
vmspecific/java/lang/reflect/VMArray.java \
vmspecific/java/lang/reflect/VMProxy.java \
vmspecific/java/net/InetAddress.java \
Index: kaffe/libraries/javalib/external/classpath/config.guess
diff -u kaffe/libraries/javalib/external/classpath/config.guess:1.22
kaffe/libraries/javalib/external/classpath/config.guess:1.23
--- kaffe/libraries/javalib/external/classpath/config.guess:1.22 Sat Jun
17 16:24:29 2006
+++ kaffe/libraries/javalib/external/classpath/config.guess Wed Jul 5
23:56:07 2006
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-12-13'
+timestamp='2005-08-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -779,7 +779,7 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[345]*)
+ x86:Interix*:[34]*)
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -851,7 +851,7 @@
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s:
::g;p;}'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
@@ -870,7 +870,7 @@
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s:
::g;p;}'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
@@ -919,9 +919,6 @@
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
@@ -967,7 +964,7 @@
LIBC=gnulibc1
# endif
#else
- #if defined(__INTEL_COMPILER) || defined(__PGI)
+ #ifdef __INTEL_COMPILER
LIBC=gnu
#else
LIBC=gnuaout
@@ -977,7 +974,7 @@
LIBC=dietlibc
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s:
::g;p;}'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
@@ -1188,6 +1185,7 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1265,9 +1263,6 @@
exit ;;
i*86:skyos:*:*)
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/
.*$//'
- exit ;;
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
exit ;;
esac
Index: kaffe/libraries/javalib/external/classpath/ltmain.sh
diff -u kaffe/libraries/javalib/external/classpath/ltmain.sh:1.22
kaffe/libraries/javalib/external/classpath/ltmain.sh:1.23
--- kaffe/libraries/javalib/external/classpath/ltmain.sh:1.22 Sat Jun 17
16:24:29 2006
+++ kaffe/libraries/javalib/external/classpath/ltmain.sh Wed Jul 5
23:56:07 2006
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-2"
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
# See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$pass" = dlopen; then
@@ -3200,6 +3203,11 @@
current=`expr $number_major + $number_minor - 1`
age="$number_minor"
revision="$number_minor"
+ ;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'"
1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more
information." 1>&2
+ exit $EXIT_FAILURE
;;
esac
;;
Index: kaffe/scripts/ltmain.sh
diff -u kaffe/scripts/ltmain.sh:1.26 kaffe/scripts/ltmain.sh:1.27
--- kaffe/scripts/ltmain.sh:1.26 Sat Jun 17 16:24:32 2006
+++ kaffe/scripts/ltmain.sh Wed Jul 5 23:56:07 2006
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-2"
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
# See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$pass" = dlopen; then
@@ -3200,6 +3203,11 @@
current=`expr $number_major + $number_minor - 1`
age="$number_minor"
revision="$number_minor"
+ ;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'"
1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more
information." 1>&2
+ exit $EXIT_FAILURE
;;
esac
;;
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
