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
calebstewart · May 15, 2012 · 07dd017 · 07dd017
1 parent f2a4755
commit 07dd017
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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"