From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 18 Nov 2002 18:06:20 +0000 (+0000)
Subject: * libtool.m4: Support linking of 64-bit libraries on
X-Git-Tag: release-1-5~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16b9d2d4c55a0a78937356ed771da737964f5cf2;p=thirdparty%2Flibtool.git

* libtool.m4: Support linking of 64-bit libraries on
sparc{,v[789]}-*linux*, s390*-*linux*, ppc*-*linux*
GNU/Linux systems when the platform default is to build
32-bit libraries.
---

diff --git a/ChangeLog b/ChangeLog
index 8cc566ce6..4876385b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* libtool.m4: Support linking of 64-bit libraries on
+	sparc{,v[789]}-*linux*, s390*-*linux*, ppc*-*linux*
+	GNU/Linux systems when the platform default is to build
+	32-bit libraries.
+
 2002-11-18  Andreas Jaeger  <aj@suse.de>, Bo Thorsen  <bo@suse.de>
 
 	* libtool.m4: Support linking of 32-bit libraries with ld
diff --git a/libtool.m4 b/libtool.m4
index 06b178f2a..bbd46d678 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -477,25 +477,41 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc64-*linux*|s390x-*linux*|sparc64-*linux*)
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       case $host in
-       x86_64-*linux*)
-         LD="${LD-ld} -m elf_i386"
-         ;;
-       ppc64-*linux*)
-         LD="${LD-ld} -m elf32ppclinux"
-         ;;
-       s390x-*linux*)
-         LD="${LD-ld} -m elf_s390"
-         ;;
-       sparc64-*linux*)
-         LD="${LD-ld} -m elf32_sparc"
-         ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
       esac
       ;;
     esac