aboutsummaryrefslogtreecommitdiff
path: root/libjava/configure
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2012-05-16 22:11:18 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2012-05-16 15:11:18 -0700
commite6d5f8c9c4ea05926bc31b0bbcef08134401d19a (patch)
tree0007d25b499ac6d83204c313765f73351718b2d9 /libjava/configure
parent763dc99dd311306c8c140e188f9be4bddb3dbc0c (diff)
downloadgcc-e6d5f8c9c4ea05926bc31b0bbcef08134401d19a.zip
gcc-e6d5f8c9c4ea05926bc31b0bbcef08134401d19a.tar.gz
gcc-e6d5f8c9c4ea05926bc31b0bbcef08134401d19a.tar.bz2
Regenerate configure files for libtool.m4 change
boehm-gc/ * configure: Regenerated. gcc/ * configure: Regenerated. libatomic/ * configure: Regenerated. libffi/ * configure: Regenerated. libgfortran/ * configure: Regenerated. libgomp/ * configure: Regenerated. libitm/ * configure: Regenerated. libjava/classpath/ * configure: Regenerated. libjava/ * configure: Regenerated. libmudflap/ * configure: Regenerated. libobjc/ * configure: Regenerated. libquadmath/ * configure: Regenerated. libssp/ * configure: Regenerated. libstdc++-v3/ * configure: Regenerated. lto-plugin/ * configure: Regenerated. zlib/ * configure: Regenerated. From-SVN: r187616
Diffstat (limited to 'libjava/configure')
-rwxr-xr-xlibjava/configure15
1 files changed, 11 insertions, 4 deletions
diff --git a/libjava/configure b/libjava/configure
index 43fd51f..655179a 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -8842,7 +8842,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"
@@ -13358,7 +13365,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13361 "configure"
+#line 13368 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13464,7 +13471,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13467 "configure"
+#line 13474 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19457,7 +19464,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then :
enableval=$enable_sjlj_exceptions; :
else
cat > conftest.$ac_ext << EOF
-#line 19460 "configure"
+#line 19467 "configure"
struct S { ~S(); };
void bar();
void foo()