aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.7/libssp/configure
diff options
context:
space:
mode:
Diffstat (limited to 'gcc-4.7/libssp/configure')
-rwxr-xr-xgcc-4.7/libssp/configure13
1 files changed, 10 insertions, 3 deletions
diff --git a/gcc-4.7/libssp/configure b/gcc-4.7/libssp/configure
index 78abc70cd..84b37124e 100755
--- a/gcc-4.7/libssp/configure
+++ b/gcc-4.7/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