3 files changed, 45 insertions, 0 deletions

diff --git a/gnu/usr.bin/binutils/ld/armelf_fbsd.sh b/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
new file mode 100644
index 000000000000..197180c8bd09
--- /dev/null
+++ b/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
@@ -0,0 +1,15 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/armelf.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+MAXPAGESIZE=0x8000
+GENERATE_PIE_SCRIPT=yes
+
+unset STACK_ADDR
+unset EMBEDDED
+. ${srcdir}/emulparams/armelf.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+MAXPAGESIZE=0x8000
+GENERATE_PIE_SCRIPT=yes
+
+unset STACK_ADDR
+unset EMBEDDED
diff --git a/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh b/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh
new file mode 100644
index 000000000000..a67fb3820d7c
--- /dev/null
+++ b/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh
@@ -0,0 +1,25 @@
+# $FreeBSD$
+#XXX: This should be used once those bits are merged back in the FSF repo.
+#. ${srcdir}/emulparams/armelf_fbsd.sh
+#
+#OUTPUT_FORMAT="elf32-bigarm"
+. ${srcdir}/emulparams/armelf.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+MAXPAGESIZE=0x8000
+GENERATE_PIE_SCRIPT=yes
+
+unset STACK_ADDR
+unset EMBEDDED
+OUTPUT_FORMAT="elf32-bigarm"
+#XXX: This should be used once those bits are merged back in the FSF repo.
+#. ${srcdir}/emulparams/armelf_fbsd.sh
+#
+#OUTPUT_FORMAT="elf32-bigarm"
+. ${srcdir}/emulparams/armelf.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+MAXPAGESIZE=0x8000
+GENERATE_PIE_SCRIPT=yes
+
+unset STACK_ADDR
+unset EMBEDDED
+OUTPUT_FORMAT="elf32-bigarm"
diff --git a/gnu/usr.bin/binutils/ld/genscripts.sh b/gnu/usr.bin/binutils/ld/genscripts.sh
index 181a96c37515..e606424e3147 100755
--- a/gnu/usr.bin/binutils/ld/genscripts.sh
+++ b/gnu/usr.bin/binutils/ld/genscripts.sh
@@ -37,7 +37,12 @@ CUSTOMIZER_SCRIPT=$3
 # FSF BU ver 2.15 which allows for a more generic emulparams processing.
 # To reduce the diff, I also include the ${EMULATION_NAME} parameter in uses
 # of 'CUSTOMIZER_SCRIPT'.
+
+# XXX: arm hack : until those file are merged back into the FSF repo, just
+# use the version in this directory.
+if !(test -f ${CUSTOMIZER_SCRIPT}"";) then
 CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${EMULATION_NAME}.sh"
+fi
 
 # Include the emulation-specific parameters:
 . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME}