summaryrefslogtreecommitdiff
path: root/libssp
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 /libssp
parent763dc99dd311306c8c140e188f9be4bddb3dbc0c (diff)
downloadgcc-e6d5f8c9c4ea05926bc31b0bbcef08134401d19a.tar.gz
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 'libssp')
-rw-r--r--libssp/ChangeLog4
-rwxr-xr-xlibssp/configure13
2 files changed, 14 insertions, 3 deletions
diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index 308f6fa7c0a..16d4bf6a8b8 100644
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+
+ * configure: Regenerated.
+
2011-11-21 Andreas Tobler <andreast@fgznet.ch>
* configure: Regenerate.
diff --git a/libssp/configure b/libssp/configure
index bd3f5662c4b..eba09f01103 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -6401,7 +6401,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"
@@ -10650,7 +10657,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10653 "configure"
+#line 10660 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10756,7 +10763,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10759 "configure"
+#line 10766 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H