diff options
| author | Alan Modra <amodra@gmail.com> | 2022-12-14 21:32:03 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-12-14 21:45:04 +1030 |
| commit | d1da8dd5bdfec6172afc5e3202e6c18541a1b2d3 (patch) | |
| tree | d8baada47245ba8a36d1104a04e775fdc76366e5 /ld/emulparams | |
| parent | 2698da268bdd0b4a6815a15b41a42bac5f928ca7 (diff) | |
| download | binutils-d1da8dd5bdfec6172afc5e3202e6c18541a1b2d3.zip binutils-d1da8dd5bdfec6172afc5e3202e6c18541a1b2d3.tar.gz binutils-d1da8dd5bdfec6172afc5e3202e6c18541a1b2d3.tar.bz2 | |
Fix haiku ld dependencies
I noticed after commit 8ad93045ed, "ld, gold: remove support for -z
bndplt (MPX prefix)", that some of my builds were failing with
eelf_x86_64_haiku.c:650:9: error: no member named 'bndplt' in 'struct elf_linker_x86_params'
params.bndplt = true;
~~~~~~ ^
* emulparams/aarch64haiku.sh: Use "source_sh" rather than ".".
* emulparams/armelf_haiku.sh: Likewise.
* emulparams/elf32ppchaiku.sh: Likewise.
* emulparams/elf_mipsel_haiku.sh: Likewise.
* emulparams/elf_x86_64_haiku.sh: Likewise.
Diffstat (limited to 'ld/emulparams')
| -rw-r--r-- | ld/emulparams/aarch64haiku.sh | 2 | ||||
| -rw-r--r-- | ld/emulparams/armelf_haiku.sh | 2 | ||||
| -rw-r--r-- | ld/emulparams/elf32ppchaiku.sh | 4 | ||||
| -rw-r--r-- | ld/emulparams/elf_mipsel_haiku.sh | 4 | ||||
| -rw-r--r-- | ld/emulparams/elf_x86_64_haiku.sh | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/ld/emulparams/aarch64haiku.sh b/ld/emulparams/aarch64haiku.sh index b0298ec..73f6a9b 100644 --- a/ld/emulparams/aarch64haiku.sh +++ b/ld/emulparams/aarch64haiku.sh @@ -36,4 +36,4 @@ ATTRS_SECTIONS='.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.att # Ensure each PLT entry is aligned to a cache line. PLT=".plt ${RELOCATING-0} : ALIGN(16) { *(.plt)${RELOCATING+${IREL_IN_PLT+ *(.iplt)}} }" -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh diff --git a/ld/emulparams/armelf_haiku.sh b/ld/emulparams/armelf_haiku.sh index 413c06c..0d0e3a3 100644 --- a/ld/emulparams/armelf_haiku.sh +++ b/ld/emulparams/armelf_haiku.sh @@ -30,4 +30,4 @@ TARGET2_TYPE=got-rel # ARM does not support .s* sections. NO_SMALL_DATA=yes -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh diff --git a/ld/emulparams/elf32ppchaiku.sh b/ld/emulparams/elf32ppchaiku.sh index 547e5c8..f4eae4f 100644 --- a/ld/emulparams/elf32ppchaiku.sh +++ b/ld/emulparams/elf32ppchaiku.sh @@ -1,5 +1,5 @@ -. ${srcdir}/emulparams/elf32ppc.sh -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf32ppc.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh TEXT_START_ADDR=0x200000 MAXPAGESIZE=0x1000 GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/elf_mipsel_haiku.sh b/ld/emulparams/elf_mipsel_haiku.sh index ab38e23..c7e09f3 100644 --- a/ld/emulparams/elf_mipsel_haiku.sh +++ b/ld/emulparams/elf_mipsel_haiku.sh @@ -1,3 +1,3 @@ -. ${srcdir}/emulparams/elf32lmip.sh -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf32lmip.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh diff --git a/ld/emulparams/elf_x86_64_haiku.sh b/ld/emulparams/elf_x86_64_haiku.sh index f049559..e6231cd 100644 --- a/ld/emulparams/elf_x86_64_haiku.sh +++ b/ld/emulparams/elf_x86_64_haiku.sh @@ -1,2 +1,2 @@ -. ${srcdir}/emulparams/elf_x86_64.sh -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf_x86_64.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh |