Author: jeroen
Date: 2006-08-16 01:23:38 +0000 (Wed, 16 Aug 2006)
New Revision: 2338
Added:
trunk/kaffe/debian/patches/04_gcc4.1_amd64.patch
trunk/kaffe/debian/patches/05_gcc4.1_x86.patch
trunk/kaffe/debian/patches/06_atomic_ia64.patch
Modified:
trunk/kaffe/debian/changelog
Log:
Add 3 patches, thanks to Dalibor Topic for collecting them:
* Added 04_gcc4.1_amd64.patch: patch by Kurt Roeckx <[EMAIL PROTECTED]> to fix
kaffe with gcc-4.1 on amd64 (Closes: #374689, might also fix: #375835):
+ kaffe/kaffevm/systems/unix-{p,j}threads/signal.c: Add more volatile
modifiers to remove optimizations.
* Added 05_gcc4.1_x86.patch: patch by Dalibor Topic <[EMAIL PROTECTED]> to
fix kaffe for gcc 4.1 (Closes: #376336):
+ 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.
* Added 06_atomic_ia64.patch: Fix compilation on ia64 by updating atomic.h to
glibc 2.4.0 version, thanks to Bill Allombert <[EMAIL PROTECTED]> for the
patch
Modified: trunk/kaffe/debian/changelog
===================================================================
--- trunk/kaffe/debian/changelog 2006-08-16 00:29:11 UTC (rev 2337)
+++ trunk/kaffe/debian/changelog 2006-08-16 01:23:38 UTC (rev 2338)
@@ -1,3 +1,23 @@
+kaffe (2:1.1.7-4) unstable; urgency=low
+
+ * Added 04_gcc4.1_amd64.patch: patch by Kurt Roeckx <[EMAIL PROTECTED]> to
fix
+ kaffe with gcc-4.1 on amd64 (Closes: #374689, might also fix: #375835):
+ + kaffe/kaffevm/systems/unix-{p,j}threads/signal.c: Add more volatile
+ modifiers to remove optimizations.
+ * Added 05_gcc4.1_x86.patch: patch by Dalibor Topic <[EMAIL PROTECTED]> to
+ fix kaffe for gcc 4.1 (Closes: #376336):
+ + 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.
+ * Added 06_atomic_ia64.patch: Fix compilation on ia64 by updating atomic.h to
+ glibc 2.4.0 version, thanks to Bill Allombert <[EMAIL PROTECTED]> for the
+ patch
+
+ -- Jeroen van Wolffelaar <[EMAIL PROTECTED]> Wed, 16 Aug 2006 03:07:43 +0200
+
kaffe (2:1.1.7-3) unstable; urgency=low
* Build-Depend on gcc-4.0 on ia64 and build with it (Closes: #369877)
Added: trunk/kaffe/debian/patches/04_gcc4.1_amd64.patch
===================================================================
--- trunk/kaffe/debian/patches/04_gcc4.1_amd64.patch 2006-08-16 00:29:11 UTC
(rev 2337)
+++ trunk/kaffe/debian/patches/04_gcc4.1_amd64.patch 2006-08-16 01:23:38 UTC
(rev 2338)
@@ -0,0 +1,24 @@
+diff -ur
kaffe-1.1.7-gcc-4.1-patched/kaffe/kaffevm/systems/unix-jthreads/signal.c
kaffe-1.1.7-autotooled/kaffe/kaffevm/systems/unix-jthreads/signal.c
+--- kaffe-1.1.7-gcc-4.1-patched/kaffe/kaffevm/systems/unix-jthreads/signal.c
2006-08-01 10:28:59.297864000 -0500
++++ kaffe-1.1.7-autotooled/kaffe/kaffevm/systems/unix-jthreads/signal.c
2006-08-01 10:38:27.705512000 -0500
+@@ -450,7 +450,7 @@
+ void
+ detectStackBoundaries(jthread_t jtid, int mainThreadStackSize)
+ {
+- static volatile char *guessPointer;
++ static volatile char * volatile guessPointer;
+ void *old_sigsegv, *old_sigbus;
+
+ setupSigAltStack();
+diff -ur
kaffe-1.1.7-gcc-4.1-patched/kaffe/kaffevm/systems/unix-pthreads/signal.c
kaffe-1.1.7-autotooled/kaffe/kaffevm/systems/unix-pthreads/signal.c
+--- kaffe-1.1.7-gcc-4.1-patched/kaffe/kaffevm/systems/unix-pthreads/signal.c
2006-08-01 10:28:59.460826000 -0500
++++ kaffe-1.1.7-autotooled/kaffe/kaffevm/systems/unix-pthreads/signal.c
2006-08-01 10:38:46.455147000 -0500
+@@ -444,7 +444,7 @@
+ void
+ detectStackBoundaries(jthread_t jtid, size_t mainThreadStackSize)
+ {
+- static volatile char *guessPointer;
++ static volatile char * volatile guessPointer;
+ void *handler_segv, *handler_bus;
+
+ #if defined(SIGSEGV)
Added: trunk/kaffe/debian/patches/05_gcc4.1_x86.patch
===================================================================
--- trunk/kaffe/debian/patches/05_gcc4.1_x86.patch 2006-08-16 00:29:11 UTC
(rev 2337)
+++ trunk/kaffe/debian/patches/05_gcc4.1_x86.patch 2006-08-16 01:23:38 UTC
(rev 2338)
@@ -0,0 +1,418 @@
+diff -ur kaffe-1.1.7/config/i386/jit.h kaffe-1.1.7-autotooled/config/i386/jit.h
+--- kaffe-1.1.7/config/i386/jit.h 2006-03-23 15:03:35.000000000 -0600
++++ kaffe-1.1.7-autotooled/config/i386/jit.h 2006-08-01 09:20:36.950700000
-0500
+@@ -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. */
+diff -ur kaffe-1.1.7/configure kaffe-1.1.7-autotooled/configure
+--- kaffe-1.1.7/configure 2006-03-26 18:43:16.000000000 -0600
++++ kaffe-1.1.7-autotooled/configure 2006-08-01 09:42:50.513674000 -0500
+@@ -3871,6 +3871,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
++
++
+
+
+
+@@ -5991,7 +6186,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5994 "configure"' > conftest.$ac_ext
++ echo '#line 6189 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7368,7 +7563,7 @@
+
+
+ # Provide some information about the compiler.
+-echo "$as_me:7371:" \
++echo "$as_me:7566:" \
+ "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
+@@ -8435,11 +8630,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:8438: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8633: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8442: \$? = $ac_status" >&5
++ echo "$as_me:8637: \$? = $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.
+@@ -8703,11 +8898,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:8706: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8901: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8710: \$? = $ac_status" >&5
++ echo "$as_me:8905: \$? = $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.
+@@ -8807,11 +9002,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:8810: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9005: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8814: \$? = $ac_status" >&5
++ echo "$as_me:9009: \$? = $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
+@@ -11152,7 +11347,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11155 "configure"
++#line 11350 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11252,7 +11447,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11255 "configure"
++#line 11450 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -13596,11 +13791,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:13599: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13794: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:13603: \$? = $ac_status" >&5
++ echo "$as_me:13798: \$? = $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.
+@@ -13700,11 +13895,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:13703: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13898: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:13707: \$? = $ac_status" >&5
++ echo "$as_me:13902: \$? = $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
+@@ -15270,11 +15465,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:15273: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15468: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15277: \$? = $ac_status" >&5
++ echo "$as_me:15472: \$? = $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.
+@@ -15374,11 +15569,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:15377: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15572: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15381: \$? = $ac_status" >&5
++ echo "$as_me:15576: \$? = $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
+@@ -17581,11 +17776,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:17584: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17779: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17588: \$? = $ac_status" >&5
++ echo "$as_me:17783: \$? = $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.
+@@ -17849,11 +18044,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:17852: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18047: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17856: \$? = $ac_status" >&5
++ echo "$as_me:18051: \$? = $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.
+@@ -17953,11 +18148,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:17956: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18151: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:17960: \$? = $ac_status" >&5
++ echo "$as_me:18155: \$? = $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
+diff -ur kaffe-1.1.7/configure.ac kaffe-1.1.7-autotooled/configure.ac
+--- kaffe-1.1.7/configure.ac 2006-03-26 16:56:01.000000000 -0600
++++ kaffe-1.1.7-autotooled/configure.ac 2006-08-01 09:19:09.105354000
-0500
+@@ -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
Added: trunk/kaffe/debian/patches/06_atomic_ia64.patch
===================================================================
--- trunk/kaffe/debian/patches/06_atomic_ia64.patch 2006-08-16 00:29:11 UTC
(rev 2337)
+++ trunk/kaffe/debian/patches/06_atomic_ia64.patch 2006-08-16 01:23:38 UTC
(rev 2338)
@@ -0,0 +1,68 @@
+===================================================================
+RCS file: /cvs/kaffe/kaffe/config/ia64/atomic.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- kaffe/config/ia64/atomic.h 2005/12/28 01:49:47 1.3
++++ kaffe/config/ia64/atomic.h 2006/07/15 15:01:06 1.4
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+- 02110-1301 USA. */
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
+
+ #include "config-int.h"
+ #include <ia64intrin.h>
+@@ -52,12 +52,12 @@
+ (abort (), 0)
+
+ #define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \
+- (!__sync_bool_compare_and_swap_si ((void *) (mem), (int) (long) (oldval), \
+- (int) (long) (newval)))
++ (!__sync_bool_compare_and_swap ((mem), (int) (long) (oldval), \
++ (int) (long) (newval)))
+
+ #define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \
+- (!__sync_bool_compare_and_swap_di ((void *) (mem), (long) (oldval), \
+- (long) (newval)))
++ (!__sync_bool_compare_and_swap ((mem), (long) (oldval), \
++ (long) (newval)))
+
+ #define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
+ (abort (), (__typeof (*mem)) 0)
+@@ -66,12 +66,11 @@
+ (abort (), (__typeof (*mem)) 0)
+
+ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
+- __sync_val_compare_and_swap_si ((void *) (mem), (int) (long) (oldval), \
+- (int) (long) (newval))
++ __sync_val_compare_and_swap ((mem), (int) (long) (oldval), \
++ (int) (long) (newval))
+
+ #define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+- __sync_val_compare_and_swap_di ((void *) (mem), (long) (oldval), \
+- (long) (newval))
++ __sync_val_compare_and_swap ((mem), (long) (oldval), (long) (newval))
+
+ /* Atomically store newval and return the old value. */
+ #define atomic_exchange_acq(mem, value) \
+@@ -80,15 +79,9 @@
+ #define atomic_exchange_rel(mem, value) \
+ (__sync_synchronize (), __sync_lock_test_and_set (mem, value))
+
+-
+ #define atomic_exchange_and_add(mem, value) \
+ ({ __typeof (*mem) __result;
\
+- if (sizeof (*mem) == 4) \
+- __result = __sync_fetch_and_add_si ((void *) (mem), (int) (value));
\
+- else if (sizeof (*mem) == 8) \
+- __result = __sync_fetch_and_add_di ((void *) (mem), (long) (value));
\
+- else \
+- abort (); \
++ __result = __sync_fetch_and_add ((mem), (int) (value)); \
+ __result; })
+
+ #define atomic_decrement_if_positive(mem) \
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
