Add x32 support to libtool.m4

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

From-SVN: r187546

ChangeLog

+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.

libtool.m4

@@ -1232,8 +1232,15 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
+	    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"
 	    ;;