diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-22 03:38:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-22 03:38:00 +0000 |
| commit | 4d986177b7a40bd4d1b3b49a33adc90da13cc017 (patch) | |
| tree | 29e02288e6dec8da846c4ad4c1d2d32406ca9abd /gcc-4.7/libjava/classpath/configure | |
| parent | ed7057a1ece24733fe30423cd94131deb8ccb2ca (diff) | |
| parent | 9e1f9b3eacb51a67e675cd1195c472215fb16373 (diff) | |
| download | toolchain_gcc-4d986177b7a40bd4d1b3b49a33adc90da13cc017.tar.gz toolchain_gcc-4d986177b7a40bd4d1b3b49a33adc90da13cc017.tar.bz2 toolchain_gcc-4d986177b7a40bd4d1b3b49a33adc90da13cc017.zip | |
Merge "[4.7] x32: Backport x32 support into 4.7"
Diffstat (limited to 'gcc-4.7/libjava/classpath/configure')
| -rwxr-xr-x | gcc-4.7/libjava/classpath/configure | 21 |
1 files changed, 14 insertions, 7 deletions
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) |