diff mbox series

Fix haiku ld dependencies

Message ID Y5m2zCJFXs1Ywa+M@squeak.grove.modra.org
State Repeat Merge
Headers
Series Fix haiku ld dependencies |

Checks

Context Check Description
snail/binutils-gdb-check warning Git am fail log

Commit Message

Alan Modra Dec. 14, 2022, 11:43 a.m. UTC 
  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 mbox series

Patch

diff --git a/ld/emulparams/aarch64haiku.sh b/ld/emulparams/aarch64haiku.sh
index b0298ec4d96..73f6a9b742b 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 413c06c9d15..0d0e3a3bf75 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 547e5c8e669..f4eae4fdbaa 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 ab38e2323cd..c7e09f37e95 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 f049559b40f..e6231cdfb15 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