diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2014-01-15 12:53:04 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2014-01-15 20:09:09 -0800 |
| commit | f6f6c6790a0f3704575b9e9c87cf55baf215eef3 (patch) | |
| tree | 003e7123e7d69b64273fef9ee173633f04f3e31f /ld/ChangeLog | |
| parent | 6fcc66ab70d67efb1a8b96532b5eb96883caa727 (diff) | |
| download | gdb-f6f6c6790a0f3704575b9e9c87cf55baf215eef3.zip gdb-f6f6c6790a0f3704575b9e9c87cf55baf215eef3.tar.gz gdb-f6f6c6790a0f3704575b9e9c87cf55baf215eef3.tar.bz2 | |
Skip directories with LIBPATH_SUFFIX_SKIP suffix
On Linux/x86-64, when binutils is configured with --libdir=/usr/lib64,
genscripts.sh treats /usr/lib64 as the default search directory. It
puts /usr/lib64 in linker scripts for all emulations, like
---
/* Script for -z combreloc: combine and sort reloc sections */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
OUTPUT_ARCH(i386)
ENTRY(_start)
SEARCH_DIR("/usr/x86_64-redhat-linux/lib32");
SEARCH_DIR("/usr/i386-redhat-linux/lib32"); SEARCH_DIR("/usr/lib6432");
SEARCH_DIR("/usr/local/lib32"); SEARCH_DIR("/lib32");
SEARCH_DIR("/usr/lib32"); SEARCH_DIR("/usr/i386-redhat-linux/lib");
SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/local/lib");
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
---
/usr/lib6432 is odd and /usr/lib64 is wrong. This patch changes
genscripts.sh to check LIBPATH_SUFFIX_SKIP if it is defined. It
skips directories with LIBPATH_SUFFIX_SKIP suffix.
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.
Diffstat (limited to 'ld/ChangeLog')
| -rw-r--r-- | ld/ChangeLog | 10 |
1 files changed, 10 insertions, 0 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.. |