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.

diff --git a/ld/emulparams/aarch64haiku.sh b/ld/emulparams/aarch64haiku.sh
index b0298ec4d96c51dfd5958c7816f9a607e6d5b64f..73f6a9b742b5dd5f1fe1e46f171746ceba09d7c9 100644 (file)
--- 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 413c06c9d15656e0e346984c02cc15997ba48fd2..0d0e3a3bf757f316832bf2685ddbcf1088e48a60 100644 (file)
--- 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 547e5c8e669ae20e3b9a954860d23b88ec017325..f4eae4fdbaaa7a36a97821416044ee842ab6db75 100644 (file)
--- 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 ab38e2323cdcebbb6a07faf999505bef9bf89eb5..c7e09f37e957ad8f0693f38149186bd619181d7e 100644 (file)
--- 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 f049559b40f95d51d2f3ae0d071d9d50276cf325..e6231cdfb15783da54b75677d4b02a6c8df079e2 100644 (file)
--- 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