* emulparams/elf64_sparc.sh: Add 64-bit directories to native LIB_PATH.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b6a962906f46ea36bf2ddcb69b86f69068931663..f6f367b31251390717369d26cb77c4694df0183d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+1999-07-16  Jakub Jelinek  <jj@ultra.linux.cz>
+
+       * emulparams/elf64_sparc.sh: Add 64-bit directories to native LIB_PATH.
+
 Thu Jul 15 15:55:15 1999  Mark P. Mitchell  <mark@codesourcery.com>
 
        * configure.host: Set up HOSTING_CRT0 and HOSTING_LIBS for IRIX6.

diff --git a/ld/emulparams/elf64_sparc.sh b/ld/emulparams/elf64_sparc.sh
index d0fbdfda3ce3d22eb5bf1d624f94a17bd92f9dcd..2ab2e4fabb9dfa306d9f9fd785671a81bddb5ae3 100644 (file)
--- a/ld/emulparams/elf64_sparc.sh
+++ b/ld/emulparams/elf64_sparc.sh
@@ -10,3 +10,37 @@ MACHINE=
 DATA_PLT=
 GENERATE_SHLIB_SCRIPT=yes
 NOP=0x01000000
+
+if [ "x${host}" = "x${target}" ]; then
+  case " $EMULATION_LIBPATH " in
+    *" ${EMULATION_NAME} "*)
+      # Native, and default or emulation requesting LIB_PATH.
+
+      # Linux and Solaris modify the default library search path
+      # to first include a 64-bit specific directory.  It's put
+      # in slightly different places on the two systems.
+      case "$target" in
+        sparc*-linux*)
+          suffix=64 ;;
+        sparc*-solaris*)
+          suffix=/sparcv9 ;;
+      esac
+
+      if [ -n "${suffix}" ]; then
+
+       LIB_PATH=/lib${suffix}:/lib
+       LIB_PATH=${LIB_PATH}:/usr/lib${suffix}:/usr/lib
+       if [ -n "${NATIVE_LIB_DIRS}" ]; then
+         LIB_PATH=${LIB_PATH}:`echo ${NATIVE_LIB_DIRS} | sed s/:/${suffix}:/g`${suffix}:${NATIVE_LIB_DIRS}
+       fi
+       if [ "${libdir}" != /usr/lib ]; then
+         LIB_PATH=${LIB_PATH}:${libdir}${suffix}:${libdir}
+       fi
+       if [ "${libdir}" != /usr/local/lib ]; then
+         LIB_PATH=${LIB_PATH}:/usr/local/lib${suffix}:/usr/local/lib
+       fi
+
+      fi
+    ;;
+  esac
+fi