diff options
Diffstat (limited to 'gcc-4.7/libjava/configure')
| -rwxr-xr-x | gcc-4.7/libjava/configure | 15 |
1 files changed, 11 insertions, 4 deletions
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() |