diff options
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/emulparams/elf32_x86_64.sh | 9 | ||||
| -rw-r--r-- | ld/emulparams/elf_i386.sh | 5 | ||||
| -rwxr-xr-x | ld/genscripts.sh | 30 |
4 files changed, 41 insertions, 13 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 4303a72..08c9b38 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +2014-01-16 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/16456 + * genscripts.sh: Don't search directory with LIBPATH_SUFFIX_SKIP + suffix. + * emulparams/elf32_x86_64.sh (LIBPATH_SUFFIX_SKIP): Set to 64 + for elf32_x86_64 emulation. + * emulparams/elf_i386.sh (LIBPATH_SUFFIX_SKIP): Set to 64 + for elf_i386 emulation. + 2014-01-16 Alan Modra <amodra@gmail.com> * ld.h (fat_section_userdata_type, get_userdata): Move to.. diff --git a/ld/emulparams/elf32_x86_64.sh b/ld/emulparams/elf32_x86_64.sh index d34297b..11d17ad 100644 --- a/ld/emulparams/elf32_x86_64.sh +++ b/ld/emulparams/elf32_x86_64.sh @@ -29,8 +29,13 @@ fi case "$target" in x86_64*-linux*|i[3-7]86-*-linux-*) case "$EMULATION_NAME" in - *32*) LIBPATH_SUFFIX=x32 ;; - *64*) LIBPATH_SUFFIX=64 ;; + *32*) + LIBPATH_SUFFIX=x32 + LIBPATH_SUFFIX_SKIP=64 + ;; + *64*) + LIBPATH_SUFFIX=64 + ;; esac ;; esac diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh index add700f..93f1992 100644 --- a/ld/emulparams/elf_i386.sh +++ b/ld/emulparams/elf_i386.sh @@ -19,7 +19,10 @@ IREL_IN_PLT= case "$target" in x86_64*-linux* | i[3-7]86*-linux*) case "$EMULATION_NAME" in - *i386*) LIBPATH_SUFFIX=32 ;; + *i386*) + LIBPATH_SUFFIX=32 + LIBPATH_SUFFIX_SKIP=64 + ;; esac ;; esac diff --git a/ld/genscripts.sh b/ld/genscripts.sh index a4da92d..eeb6d73 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -160,6 +160,7 @@ append_to_lib_path() if [ "x${use_sysroot}" = "xyes" ] ; then lib="=${lib}" fi + skip_lib=no if test -n "${LIBPATH_SUFFIX}"; then case "${lib}" in *${LIBPATH_SUFFIX}) @@ -169,18 +170,27 @@ append_to_lib_path() *) lib_path1=${lib_path1}:${lib} ;; esac ;; *) - case :${lib_path1}: in - *:${lib}${LIBPATH_SUFFIX}:*) ;; - ::) lib_path1=${lib}${LIBPATH_SUFFIX} ;; - *) lib_path1=${lib_path1}:${lib}${LIBPATH_SUFFIX} ;; - esac ;; + if test -n "${LIBPATH_SUFFIX_SKIP}"; then + case "${lib}" in + *${LIBPATH_SUFFIX_SKIP}) skip_lib=yes ;; + esac + fi + if test "${skip_lib}" = "no"; then + case :${lib_path1}: in + *:${lib}${LIBPATH_SUFFIX}:*) ;; + ::) lib_path1=${lib}${LIBPATH_SUFFIX} ;; + *) lib_path1=${lib_path1}:${lib}${LIBPATH_SUFFIX} ;; + esac + fi ;; + esac + fi + if test "${skip_lib}" = "no"; then + case :${lib_path1}:${lib_path2}: in + *:${lib}:*) ;; + *::) lib_path2=${lib} ;; + *) lib_path2=${lib_path2}:${lib} ;; esac fi - case :${lib_path1}:${lib_path2}: in - *:${lib}:*) ;; - *::) lib_path2=${lib} ;; - *) lib_path2=${lib_path2}:${lib} ;; - esac done fi } |