diff options
Diffstat (limited to 'gcc-4.7/libjava')
-rw-r--r-- | gcc-4.7/libjava/ChangeLog.x32 | 12 | ||||
-rw-r--r-- | gcc-4.7/libjava/classpath/ChangeLog.x32 | 3 | ||||
-rwxr-xr-x | gcc-4.7/libjava/classpath/configure | 21 | ||||
-rwxr-xr-x | gcc-4.7/libjava/configure | 15 | ||||
-rw-r--r-- | gcc-4.7/libjava/include/x86_64-signal.h | 8 |
5 files changed, 46 insertions, 13 deletions
diff --git a/gcc-4.7/libjava/ChangeLog.x32 b/gcc-4.7/libjava/ChangeLog.x32 new file mode 100644 index 000000000..43e8f70fe --- /dev/null +++ b/gcc-4.7/libjava/ChangeLog.x32 @@ -0,0 +1,12 @@ +2012-07-18 H.J. Lu <hongjiu.lu@intel.com> + + Backported from mainline + 2012-07-18 H.J. Lu <hongjiu.lu@intel.com> + + PR libjava/53973 + * include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): Skip 67h + address size prefix. Use ULL suffix for 64-bit integer. + +2012-05-16 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. diff --git a/gcc-4.7/libjava/classpath/ChangeLog.x32 b/gcc-4.7/libjava/classpath/ChangeLog.x32 new file mode 100644 index 000000000..9a0c1eb87 --- /dev/null +++ b/gcc-4.7/libjava/classpath/ChangeLog.x32 @@ -0,0 +1,3 @@ +2012-05-16 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. diff --git a/gcc-4.7/libjava/classpath/configure b/gcc-4.7/libjava/classpath/configure index a25f5f75a..b6692b61e 100755 --- a/gcc-4.7/libjava/classpath/configure +++ b/gcc-4.7/libjava/classpath/configure @@ -7592,7 +7592,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -11811,7 +11818,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11814 "configure" +#line 11821 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11917,7 +11924,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11920 "configure" +#line 11927 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23814,7 +23821,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 23817 "configure" */ +/* #line 23824 "configure" */ package java.lang; public class Object @@ -23907,7 +23914,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 23910: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 23917: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -23935,7 +23942,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 23938 "configure" */ +/* [#]line 23945 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -24143,7 +24150,7 @@ if test "x${use_glibj_zip}" = xfalse || \ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST - /* #line 24146 "configure" */ + /* #line 24153 "configure" */ public class Test { public static void main(String args) diff --git a/gcc-4.7/libjava/configure b/gcc-4.7/libjava/configure index b0b45bb26..cbc3ed720 100755 --- a/gcc-4.7/libjava/configure +++ b/gcc-4.7/libjava/configure @@ -8843,7 +8843,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -13359,7 +13366,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13362 "configure" +#line 13369 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13465,7 +13472,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13468 "configure" +#line 13475 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19458,7 +19465,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19461 "configure" +#line 19468 "configure" struct S { ~S(); }; void bar(); void foo() diff --git a/gcc-4.7/libjava/include/x86_64-signal.h b/gcc-4.7/libjava/include/x86_64-signal.h index 4bd8a3601..d03b91439 100644 --- a/gcc-4.7/libjava/include/x86_64-signal.h +++ b/gcc-4.7/libjava/include/x86_64-signal.h @@ -47,6 +47,10 @@ do \ \ bool _is_64_bit = false; \ \ + /* Skip 67h address size prefix. */ \ + if (_rip[0] == 0x67) \ + _rip++; \ + \ if ((_rip[0] & 0xf0) == 0x40) /* REX byte present. */ \ { \ unsigned char _rex = _rip[0] & 0x0f; \ @@ -64,10 +68,10 @@ do \ { \ if (_is_64_bit) \ _min_value_dividend = \ - _gregs[REG_RAX] == (greg_t)0x8000000000000000UL; \ + _gregs[REG_RAX] == (greg_t)0x8000000000000000ULL; \ else \ _min_value_dividend = \ - (_gregs[REG_RAX] & 0xffffffff) == (greg_t)0x80000000UL; \ + (_gregs[REG_RAX] & 0xffffffff) == (greg_t)0x80000000ULL; \ } \ \ if (_min_value_dividend) \ |