dc1803
2004-05-14  Jakub Jelinek  <jakub@redhat.com>
dc1803
dc1803
	* emulparams/elf64_ia64.sh (LIBPATH_SUFFIX): Use */lib64 paths on
dc1803
	ia64-linux if /lib64 tree is present.
dc1803
dc1803
--- ld/emulparams/elf64_ia64.sh.jj	2004-02-18 20:06:03.000000000 +0100
dc1803
+++ ld/emulparams/elf64_ia64.sh	2004-05-14 10:11:22.992278608 +0200
dc1803
@@ -37,3 +37,13 @@ OTHER_READONLY_SECTIONS="${OTHER_READONL
dc1803
 # .dtors.  They have to be next to .sbss/.sbss2/.sdata/.sdata2.
dc1803
 SMALL_DATA_CTOR=" "
dc1803
 SMALL_DATA_DTOR=" "
dc1803
+
dc1803
+# Linux modify the default library search path to first include
dc1803
+# a 64-bit specific directory.
dc1803
+case "$target" in
dc1803
+  ia64*-linux*)
dc1803
+    case "$EMULATION_NAME" in
dc1803
+      *64*) test -d /lib64 && LIBPATH_SUFFIX=64 ;;
dc1803
+    esac
dc1803
+    ;;
dc1803
+esac
dc1803
--- ltconfig	2003-02-03 16:56:49.000000000 +0900
dc1803
+++ ltconfig	2003-02-03 16:56:49.000000000 +0900
dc1803
@@ -1240,10 +1240,10 @@
dc1803
 
dc1803
   # Find out which ABI we are using (multilib hack).
dc1803
   case "$host_cpu" in
dc1803
-  x86_64*|s390*|sparc*|ppc*|powerpc*)
dc1803
+  x86_64*|s390*|sparc*|ppc*|powerpc*|ia64)
dc1803
     echo "$progname:@lineno@: checking multilib ABI type" 1>&5
dc1803
     touch conftest.$ac_ext
dc1803
-    if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
dc1803
+    if test -d /lib64 && { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
dc1803
       case `/usr/bin/file conftest.o` in
dc1803
       *64-bit*)
dc1803
 	sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"