diff options
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/configure.tgt | 2 | ||||
| -rw-r--r-- | ld/emulparams/elf_l1om.sh | 36 |
3 files changed, 9 insertions, 36 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 4fb826d..a63c961 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2011-03-31 H.J. Lu <hongjiu.lu@intel.com> + + * configure.tgt: Add elf_l1om to targ_extra_libpath for + x86_64-*-linux-*. + + * emulparams/elf_l1om.sh: Remove duplicates. + 2011-03-31 Bernd Schmidt <bernds@codesourcery.com> * emulparams/elf32_tic6x_le.sh (BIG_OUTPUT_FORMAT, EXTRA_EM_FILE, diff --git a/ld/configure.tgt b/ld/configure.tgt index f574e24..e1430c7 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -205,7 +205,7 @@ i[3-7]86-*-linux-*) targ_emul=elf_i386 tdir_i386linux=${targ_alias}aout ;; x86_64-*-linux-*) targ_emul=elf_x86_64 targ_extra_emuls="elf32_x86_64 elf_i386 i386linux elf_l1om" - targ_extra_libpath="elf_i386 elf32_x86_64" + targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om" tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;; diff --git a/ld/emulparams/elf_l1om.sh b/ld/emulparams/elf_l1om.sh index 19eea97..1af2360 100644 --- a/ld/emulparams/elf_l1om.sh +++ b/ld/emulparams/elf_l1om.sh @@ -26,41 +26,7 @@ fi # Linux modifies the default library search path to first include # a 64-bit specific directory. case "$target" in - l1om*-linux*) - case "$EMULATION_NAME" in - *l1om*) LIBPATH_SUFFIX=64 ;; - esac - ;; -esac -SCRIPT_NAME=elf -ELFSIZE=64 -OUTPUT_FORMAT="elf64-l1om" -NO_REL_RELOCS=yes -TEXT_START_ADDR=0x400000 -MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -ARCH="l1om" -MACHINE= -COMPILE_IN=yes -NOP=0x90909090 -TEMPLATE_NAME=elf32 -GENERATE_SHLIB_SCRIPT=yes -GENERATE_PIE_SCRIPT=yes -NO_SMALL_DATA=yes -LARGE_SECTIONS=yes -SEPARATE_GOTPLT=24 - -if [ "x${host}" = "x${target}" ]; then - case " $EMULATION_LIBPATH " in - *" ${EMULATION_NAME} "*) - NATIVE=yes - esac -fi - -# Linux modifies the default library search path to first include -# a 64-bit specific directory. -case "$target" in - l1om*-linux*) + *l1om*-linux*) case "$EMULATION_NAME" in *l1om*) LIBPATH_SUFFIX=64 ;; esac |