diff options
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/emulparams/elf64_sparc.sh | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 7642244..65b7468 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2000-10-20 Jakub Jelinek <jakub@redhat.com> + + * emulparams/elf64_sparc.sh (TEXT_START_ADDR, + NONPAGED_TEXT_START_ADDR): Set to 4GB for Solaris targets. + Fix sed invocation, so that it coped with '/' in Solaris 64bit + library path suffix. + Based on patch by Andrew Macleod <amacleod@cygnus.com>. + 2000-10-18 Hans-Peter Nilsson <hp@axis.com> * scripttempl/crisaout.sc (.text, .data): Pad, with ALIGN (32), diff --git a/ld/emulparams/elf64_sparc.sh b/ld/emulparams/elf64_sparc.sh index 2ab2e4f..b0a58ea 100644 --- a/ld/emulparams/elf64_sparc.sh +++ b/ld/emulparams/elf64_sparc.sh @@ -2,15 +2,24 @@ SCRIPT_NAME=elf ELFSIZE=64 TEMPLATE_NAME=elf32 OUTPUT_FORMAT="elf64-sparc" -TEXT_START_ADDR=0x100000 MAXPAGESIZE=0x100000 -NONPAGED_TEXT_START_ADDR=0x100000 ARCH="sparc:v9" MACHINE= DATA_PLT= GENERATE_SHLIB_SCRIPT=yes NOP=0x01000000 +case "$target" in + sparc*-solaris*) + TEXT_START_ADDR=0x100000000 + NONPAGED_TEXT_START_ADDR=0x100000000 + ;; + *) + TEXT_START_ADDR=0x100000 + NONPAGED_TEXT_START_ADDR=0x100000 + ;; +esac + if [ "x${host}" = "x${target}" ]; then case " $EMULATION_LIBPATH " in *" ${EMULATION_NAME} "*) @@ -31,7 +40,7 @@ if [ "x${host}" = "x${target}" ]; 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} + 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} |