2019-12-18 Anthony Green <green@moxielogic.com>

	* emulparams/elf32moxie.sh (TEMPLATE_NAME): Switch to elf template
	to enable --build-id.
	* configure.tgt: Don't define targ_extra_ofiles for moxie-*-*.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7c36a5dae1c4089e8b210bd335944dd4a2695465..3ddc9cc9c010f9c358313f608bd0d3f2b70c3a19 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-18  Anthony Green  <green@moxielogic.com>
+
+       * emulparams/elf32moxie.sh (TEMPLATE_NAME): Switch to elf template
+       to enable --build-id.
+       * configure.tgt: Don't define targ_extra_ofiles for moxie-*-*.
+
 2019-12-18  Alan Modra  <amodra@gmail.com>
 
        * pe-dll.c (pe_get32, pe_as32): Avoid signed overflow.

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 1e90d883ef87b06a1f3ac65e6d9f30780369e209..926733e6e27d31fd3219a78d380a55a3623d4f3f 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -591,7 +591,6 @@ moxie-*-moxiebox*)  targ_emul=moxiebox
                        targ_extra_ofiles=ldelfgen.o
                        ;;
 moxie-*-*)             targ_emul=elf32moxie
-                       targ_extra_ofiles=ldelfgen.o
                        ;;
 msp430-*-*)            targ_emul=msp430elf
                        targ_extra_emuls="msp430X"

diff --git a/ld/emulparams/elf32moxie.sh b/ld/emulparams/elf32moxie.sh
index cfa261dab210e544a98de9fb27ebae99983ae7d2..5ce3819f0c2de0fb2451c7fa9905dbf86fc333ef 100644 (file)
--- a/ld/emulparams/elf32moxie.sh
+++ b/ld/emulparams/elf32moxie.sh
@@ -1,6 +1,5 @@
 SCRIPT_NAME=elf
-TEMPLATE_NAME=generic
-EXTRA_EM_FILE=genelf
+TEMPLATE_NAME=elf
 OUTPUT_FORMAT="elf32-bigmoxie"
 BIG_OUTPUT_FORMAT="elf32-bigmoxie"
 LITTLE_OUTPUT_FORMAT="elf32-littlemoxie"