[PATCH] x86-64 and multilib

[Jens Petersen]

We've been using this multilib patch for a while in Red Hat
Linux and Fedora Core.  Can it be applied to HEAD please?

Cheers, Jens


2004-02-06  Jens Petersen  <address@hidden>

        * m4/libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Add Linux
        multilib support.
        (AC_DEPLIBS_CHECK_METHOD): Add x86_64 to Linux host_cpu cases.


Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.37
diff -u -r1.37 libtool.m4
--- libtool.m4  5 Feb 2004 14:53:16 -0000       1.37
+++ libtool.m4  6 Feb 2004 03:33:01 -0000
@@ -1853,6 +1853,26 @@
   # people can always --disable-shared, the test was removed, and we
   # assume the GNU/Linux dynamic linker is in use.
   dynamic_linker='GNU/Linux ld.so'
+
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+    x86_64*|s390x*|powerpc64*)
+      echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+      if AC_TRY_EVAL(ac_compile); then
+        case `/usr/bin/file conftest.$ac_objext` in
+          *64-bit*)
+            libsuff=64
+            ;;
+        esac
+      fi
+      rm -rf conftest*
+      ;;
+    *)
+      ;;
+  esac
+  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} 
/usr/local/lib${libsuff}"
   ;;
 
 knetbsd*-gnu)
@@ -2613,7 +2633,7 @@
 # This must be Linux ELF.
 linux*)
   case $host_cpu in
-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*)
+  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM