From: H.J. Lu <hongjiu.lu@intel.com>
Date: Tue, 15 May 2012 16:07:28 +0000 (+0000)
Subject: Add x32 support to libtool.m4
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb606595780c992930863e8f2db1f31b53bed7ba;p=gcc.git

Add x32 support to libtool.m4

	Merge upstream change
	* libtool.m4 (_LT_ENABLE_LOCK): Support x32.

From-SVN: r187546
---

diff --git a/ChangeLog b/ChangeLog
index 9a46dca69f4..a50fa6793bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Merge upstream change
+	* libtool.m4 (_LT_ENABLE_LOCK): Support x32.
+
 2012-05-14  Marc Glisse  <marc.glisse@inria.fr>
 
 	* MAINTAINERS (Write After Approval): Add myself.
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"