5 files changed, 11 insertions, 5 deletions
diff --git a/ld/emulparams/armelf.sh b/ld/emulparams/armelf.sh
index 8c79b64..338b9ce 100644
--- a/ld/emulparams/armelf.sh
+++ b/ld/emulparams/armelf.sh
@@ -4,7 +4,8 @@ OUTPUT_FORMAT="elf32-littlearm"
 BIG_OUTPUT_FORMAT="elf32-bigarm"
 LITTLE_OUTPUT_FORMAT="elf32-littlearm"
 TEXT_START_ADDR=0x8000
-TEMPLATE_NAME=armelf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=armelf
 OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7)'
 OTHER_BSS_SYMBOLS='__bss_start__ = .;'
 OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
diff --git a/ld/emulparams/armelf_linux.sh b/ld/emulparams/armelf_linux.sh
index a85e8bd..c5b963f 100644
--- a/ld/emulparams/armelf_linux.sh
+++ b/ld/emulparams/armelf_linux.sh
@@ -4,7 +4,8 @@ OUTPUT_FORMAT="elf32-littlearm"
 BIG_OUTPUT_FORMAT="elf32-bigarm"
 LITTLE_OUTPUT_FORMAT="elf32-littlearm"
 MAXPAGESIZE=0x8000
-TEMPLATE_NAME=armelf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=armelf
 GENERATE_SHLIB_SCRIPT=yes
 
 DATA_START_SYMBOLS='__data_start = . ;';
diff --git a/ld/emulparams/armelf_linux26.sh b/ld/emulparams/armelf_linux26.sh
index 36d1b0e..89cd9fb 100644
--- a/ld/emulparams/armelf_linux26.sh
+++ b/ld/emulparams/armelf_linux26.sh
@@ -4,7 +4,8 @@ OUTPUT_FORMAT="elf32-littlearm"
 BIG_OUTPUT_FORMAT="elf32-bigarm"
 LITTLE_OUTPUT_FORMAT="elf32-littlearm"
 MAXPAGESIZE=0x8000
-TEMPLATE_NAME=armelf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=armelf
 GENERATE_SHLIB_SCRIPT=yes
 
 DATA_START_SYMBOLS='__data_start = . ;';
diff --git a/ld/emulparams/hppaelf.sh b/ld/emulparams/hppaelf.sh
index 2cd06ac..77dcb39 100644
--- a/ld/emulparams/hppaelf.sh
+++ b/ld/emulparams/hppaelf.sh
@@ -3,5 +3,7 @@ OUTPUT_FORMAT="elf32-hppa"
 TEXT_START_ADDR=0x1000
 TARGET_PAGE_SIZE=0x1000
 ARCH=hppa
+NOP=0x08000240
 START="$START$"
-TEMPLATE_NAME=hppaelf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=hppaelf
diff --git a/ld/emulparams/hppalinux.sh b/ld/emulparams/hppalinux.sh
index e82315f..f270ba6 100644
--- a/ld/emulparams/hppalinux.sh
+++ b/ld/emulparams/hppalinux.sh
@@ -6,5 +6,6 @@ MAXPAGESIZE=0x1000
 ARCH=hppa
 NOP=0x08000240
 START="_start"
-TEMPLATE_NAME=hppaelf
 DATA_START_SYMBOLS='$global$ = .;'
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=hppaelf