mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
f6f6c6790a
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.
42 lines
878 B
Bash
42 lines
878 B
Bash
. ${srcdir}/emulparams/plt_unwind.sh
|
|
SCRIPT_NAME=elf
|
|
ELFSIZE=32
|
|
OUTPUT_FORMAT="elf32-x86-64"
|
|
NO_REL_RELOCS=yes
|
|
TEXT_START_ADDR=0x400000
|
|
MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
|
|
COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
|
|
ARCH="i386:x64-32"
|
|
MACHINE=
|
|
TEMPLATE_NAME=elf32
|
|
GENERATE_SHLIB_SCRIPT=yes
|
|
GENERATE_PIE_SCRIPT=yes
|
|
NO_SMALL_DATA=yes
|
|
LARGE_SECTIONS=yes
|
|
LARGE_BSS_AFTER_BSS=
|
|
SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 24 ? 24 : 0"
|
|
IREL_IN_PLT=
|
|
|
|
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 32-bit specific directory.
|
|
case "$target" in
|
|
x86_64*-linux*|i[3-7]86-*-linux-*)
|
|
case "$EMULATION_NAME" in
|
|
*32*)
|
|
LIBPATH_SUFFIX=x32
|
|
LIBPATH_SUFFIX_SKIP=64
|
|
;;
|
|
*64*)
|
|
LIBPATH_SUFFIX=64
|
|
;;
|
|
esac
|
|
;;
|
|
esac
|