summaryrefslogtreecommitdiff
path: root/libtool.m4
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-15 16:07:28 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-15 16:07:28 +0000
commit07dd0175de047b9ca1d78f7908a2d1c9752b24d9 (patch)
treee466d0d7b2b0c47ccf5f68db298e5f51eb166612 /libtool.m4
parentf2a4755d740e62b8144abfbabc7deae616bf0865 (diff)
downloadgcc-07dd0175de047b9ca1d78f7908a2d1c9752b24d9.tar.gz
Add x32 support to libtool.m4
Merge upstream change * libtool.m4 (_LT_ENABLE_LOCK): Support x32. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187546 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libtool.m4')
-rw-r--r--libtool.m49
1 files changed, 8 insertions, 1 deletions
diff --git a/libtool.m4 b/libtool.m4
index 67321a7d070..a7f99ac7dbc 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1232,7 +1232,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"