From e76d716a43077dda76f2c3cdf5855d9beeb259e3 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 16 Jul 1999 21:43:43 +0000 Subject: [PATCH] * emulparams/elf64_sparc.sh: Add 64-bit directories to native LIB_PATH. --- ld/ChangeLog | 4 ++++ ld/emulparams/elf64_sparc.sh | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index b6a9629..f6f367b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +1999-07-16 Jakub Jelinek + + * emulparams/elf64_sparc.sh: Add 64-bit directories to native LIB_PATH. + Thu Jul 15 15:55:15 1999 Mark P. Mitchell * 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 d0fbdfd..2ab2e4f 100644 --- 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 -- 2.7.4