[RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds

public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed

* [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
@ 2014-05-19 22:48 Hans-Peter Nilsson
  2014-05-20  9:21 ` Alan Modra
  0 siblings, 1 reply; 19+ messages in thread
From: Hans-Peter Nilsson @ 2014-05-19 22:48 UTC (permalink / raw)
  To: binutils

As can be seen from the behavior with the test-case in the PR,
or by inspection of an affected target in a linker-script in
ld/ldscripts, after commit 0f70b6b the SEARCH_DIR corresponding
to the tdir-variable is missing for non-sysroot cross-builds.
Many ${GENSCRIPTS} invocations simply had a typo in the
tdir-parameter.

There seems to be no reason to have a separate rule for each
invocation, when using a central rule would suffice.  There is
already enough ways a target can set the *right* tdir-variable
(in ld/configure.tgt) as it wants, or adjust the effects from it
(in its script in ld/emulparams), that we don't need a *third*
way in the ld/Makefile genscripts.sh rule.  It's way too easy to
typo: I know first-hand I didn't intend this for the cris
emulations and I don't see any sign that this was intended with
the commit attributed to Mark Mitchell for the arm-linux-gnueabi
emulation.

In the patch below, all rules are changed to be only
dependencies, instead using a central pattern-rule with the
command and a recursive variable indirection for the tdir
variable.  The recursive variable use is is a first in binutils,
but as indicated in <http://austingroupbugs.net/view.php?id=336>
the construct is portable ...well, except for IRIX make.  Can we
ignore builds using IRIX make?  If not, but assuming it only
makes sense for native builds, an alternative still getting the
most benefits of this patch, is that we *could* keep the rule
for its *native* emulations explicit as-is (they don't even have
the typo).  Still, as that'd be a *native* build, IRIXers still
get the intended effect *if* IRIX make interprets the construct
as passing an empty string.  What say you?

With a cross-build to a target for each affected emulation, I
verified that all affected targets with an apparent tdir-typo
now get the same SEARCH_DIR variable as before commit 0f70b6b:
xgate-elf, tic4x-coff, sh-pe, sh-symbianelf, m68hc11-elf,
m32r-elf, x86_64-mingw64, x86_64-cygwin, xstormy16-elf,
xc16x-elf, tilepro-elf, tilegx-elf, moxie-elf, mt-elf,
microblaze-elf, metag-elf, mep-elf, mcore-elf, microblaze-linux,
m32c-elf, powerpc-ibm-aix5, arm-wince-pe, arm-epoc-pe,
rs6000-ibm-aix6, arm-unknown-vxworks, arm-unknown-symbianelf,
d10v-elf, d30v-elf, epiphany-elf, fr30-elf, frv-elf, ip2k-elf,
iq2000-elf, cris-axis-elf, arm-linux-gnueabi.

Instead of deleting the line with the command, I only emptied it
as IMHO a separation is preferable to cramming all dependencies
together.

Ok to commit?

ld:
	* Makefile.am: Change all rules with ${GENSCRIPTS}
	invocations to be just dependencies.
	(e%.c): New rule.
	* Makefile.in: Regenerate.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 2ad6a45..3c4ac52 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -638,94 +638,97 @@ ELF_GEN_DEPS = $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em
 
 @TDIRS@
 
+e%.c:
+	${GENSCRIPTS} $* "$(tdir_$*)"
+
 eaix5ppc.c: $(srcdir)/emulparams/aix5ppc.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aix5ppc "$(tdir_aixppc)"
+
 eaix5rs6.c: $(srcdir)/emulparams/aix5rs6.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aix5rs6 "$(tdir_aixrs6)"
+
 eaixppc.c: $(srcdir)/emulparams/aixppc.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aixppc "$(tdir_aixppc)"
+
 eaixrs6.c: $(srcdir)/emulparams/aixrs6.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aixrs6 "$(tdir_aixrs6)"
+
 ealpha.c: $(srcdir)/emulparams/alpha.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/alpha.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} alpha "$(tdir_alpha)"
+
 ealphavms.c: $(srcdir)/emulparams/alphavms.sh \
   $(srcdir)/emultempl/vms.em $(srcdir)/scripttempl/alphavms.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} alphavms "$(tdir_alphavms)"
+
 earcelf.c: $(srcdir)/emulparams/arcelf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} arcelf "$(tdir_arcelf)"
+
 earm_epoc_pe.c: $(srcdir)/emulparams/arm_epoc_pe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/epocpe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} arm_epoc_pe "$(tdir_armpe)"
+
 earm_wince_pe.c: $(srcdir)/emulparams/arm_wince_pe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} arm_wince_pe "$(tdir_armpe)"
+
 earmaoutb.c:	$(srcdir)/emulparams/armaoutb.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armaoutb "$(tdir_armaoutb)"
+
 earmaoutl.c:	$(srcdir)/emulparams/armaoutl.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armaoutl "$(tdir_armaoutl)"
+
 earmcoff.c:	$(srcdir)/emulparams/armcoff.sh \
   $(srcdir)/emultempl/armcoff.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armcoff "$(tdir_armcoff)"
+
 earmelf.c: $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf "$(tdir_armelf)"
+
 earmelf_fbsd.c: $(srcdir)/emulparams/armelf_fbsd.sh \
   $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_fbsd "$(tdir_armelf_fbsd)"
+
 earmelf_linux.c: $(srcdir)/emulparams/armelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_linux "$(tdir_armelf_linux)"
+
 earmelf_linux_eabi.c: $(srcdir)/emulparams/armelf_linux_eabi.sh \
   $(srcdir)/emulparams/armelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_linux_eabi "$(tdir_armelf_linux_abi)"
+
 earmelf_nacl.c: $(srcdir)/emulparams/armelf_nacl.sh \
   $(srcdir)/emulparams/armelf_linux_eabi.sh \
   $(srcdir)/emulparams/armelf_linux.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_nacl "$(tdir_armelf_nacl)"
+
 earmelf_nbsd.c: $(srcdir)/emulparams/armelf_nbsd.sh \
   $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_nbsd "$(tdir_armelf_nbsd)"
+
 earmelf_vxworks.c: $(srcdir)/emulparams/armelf_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/vxworks.em \
   $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_vxworks "$(tdir_armelf)"
+
 earmelfb.c: $(srcdir)/emulparams/armelfb.sh $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb "$(tdir_armelfb)"
+
 earmelfb_linux.c: $(srcdir)/emulparams/armelfb_linux.sh \
   $(srcdir)/emulparams/armelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb_linux "$(tdir_armelfb_linux)"
+
 earmelfb_linux_eabi.c: $(srcdir)/emulparams/armelfb_linux_eabi.sh \
   $(srcdir)/emulparams/armelf_linux_eabi.sh \
   $(srcdir)/emulparams/armelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb_linux_eabi "$(tdir_armelfb_linux_abi)"
+
 earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
   $(srcdir)/emulparams/armelf_nacl.sh \
   $(srcdir)/emulparams/armelf_linux_eabi.sh \
@@ -733,154 +736,154 @@ earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb_nacl "$(tdir_armelfb_nacl)"
+
 earmelfb_nbsd.c: $(srcdir)/emulparams/armelfb_nbsd.sh \
   $(srcdir)/emulparams/armelf_nbsd.sh \
   $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb_nbsd "$(tdir_armelfb_nbsd)"
+
 earmnbsd.c:	$(srcdir)/emulparams/armnbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armnbsd "$(tdir_armnbsd)"
+
 earmnto.c: $(srcdir)/emulparams/armnto.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armnto "$(tdir_armnto)"
+
 earmpe.c: $(srcdir)/emulparams/armpe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armpe "$(tdir_armpe)"
+
 earmsymbian.c: $(srcdir)/emulparams/armsymbian.sh \
   $(srcdir)/emulparams/armelf.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/armbpabi.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} armsymbian "$(tdir_armelf)"
+
 eavr1.c: $(srcdir)/emulparams/avr1.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr1 "$(tdir_avr2)"
+
 eavr2.c: $(srcdir)/emulparams/avr2.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr2 "$(tdir_avr2)"
+
 eavr25.c: $(srcdir)/emulparams/avr25.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr25 "$(tdir_avr2)"
+
 eavr3.c: $(srcdir)/emulparams/avr3.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr3 "$(tdir_avr2)"
+
 eavr31.c: $(srcdir)/emulparams/avr31.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr31 "$(tdir_avr2)"
+
 eavr35.c: $(srcdir)/emulparams/avr35.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr35 "$(tdir_avr2)"
+
 eavr4.c: $(srcdir)/emulparams/avr4.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr4 "$(tdir_avr2)"
+
 eavr5.c: $(srcdir)/emulparams/avr5.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr5 "$(tdir_avr2)"
+
 eavr51.c: $(srcdir)/emulparams/avr51.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr51 "$(tdir_avr2)"
+
 eavr6.c: $(srcdir)/emulparams/avr6.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr6 "$(tdir_avr2)"
+
 eavrxmega1.c: $(srcdir)/emulparams/avrxmega1.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega1 "$(tdir_avr2)"
+
 eavrxmega2.c: $(srcdir)/emulparams/avrxmega2.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega2 "$(tdir_avr2)"
+
 eavrxmega3.c: $(srcdir)/emulparams/avrxmega3.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega3 "$(tdir_avr2)"
+
 eavrxmega4.c: $(srcdir)/emulparams/avrxmega4.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega4 "$(tdir_avr2)"
+
 eavrxmega5.c: $(srcdir)/emulparams/avrxmega5.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega5 "$(tdir_avr2)"
+
 eavrxmega6.c: $(srcdir)/emulparams/avrxmega6.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega6 "$(tdir_avr2)"
+
 eavrxmega7.c: $(srcdir)/emulparams/avrxmega7.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega7 "$(tdir_avr2)"
+
 ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
+
 ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparccoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} coff_sparc "$(tdir_coff_sparc)"
+
 ecrisaout.c: $(srcdir)/emulparams/crisaout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/crisaout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} crisaout "$(tdir_cris)"
+
 ecriself.c: $(srcdir)/emulparams/criself.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} criself "$(tdir_cris)"
+
 ecrislinux.c: $(srcdir)/emulparams/crislinux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} crislinux "$(tdir_cris)"
+
 ed10velf.c: $(srcdir)/emulparams/d10velf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} d10velf "$(tdir_d10v)"
+
 ed30v_e.c: $(srcdir)/emulparams/d30v_e.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} d30v_e "$(tdir_d30v)"
+
 ed30v_o.c: $(srcdir)/emulparams/d30v_o.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} d30v_o "$(tdir_d30v)"
+
 ed30velf.c: $(srcdir)/emulparams/d30velf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} d30velf "$(tdir_d30v)"
+
 edelta68.c: $(srcdir)/emulparams/delta68.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} delta68 "$(tdir_delta68)"
+
 eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/dlx.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_dlx "$(tdir_elf32_dlx)"
+
 eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_i860 "$(tdir_elf32_i860)"
+
 eelf32_i960.c: $(srcdir)/emulparams/elf32_i960.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_i960 "$(tdir_elf32_i960)"
+
 eelf32_sparc.c: $(srcdir)/emulparams/elf32_sparc.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_sparc "$(tdir_elf32_sparc)"
+
 eelf32_sparc_sol2.c: $(srcdir)/emulparams/elf32_sparc_sol2.sh \
   $(srcdir)/emulparams/elf32_sparc.sh \
   $(srcdir)/emulparams/solaris2.sh \
   $(srcdir)/emultempl/solaris2.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_sparc_sol2 "$(tdir_elf32_sparc_sol2)"
+
 eelf32_sparc_vxworks.c: $(srcdir)/emulparams/elf32_sparc_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emulparams/elf32_sparc.sh \
   $(srcdir)/emultempl/vxworks.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_sparc_vxworks "$(tdir_elf32_sparc_vxworks)"
+
 eelf32_spu.c: $(srcdir)/emulparams/elf32_spu.sh $(srcdir)/emultempl/spuelf.em \
   $(srcdir)/emultempl/spu_ovl.@OBJEXT@_c $(srcdir)/emultempl/spu_icache.@OBJEXT@_c \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_spu "$(tdir_elf32_spu)"
+
 $(srcdir)/emultempl/spu_ovl.@OBJEXT@_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
 	if ../gas/as-new --version \
 		| grep 'target.*spu' >/dev/null 2>/dev/null; then \
@@ -898,1026 +901,1025 @@ $(srcdir)/emultempl/spu_icache.@OBJEXT@_c: @MAINT@ $(srcdir)/emultempl/spu_icach
 eelf32_tic6x_be.c: $(srcdir)/emulparams/elf32_tic6x_be.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_be "$(tdir_elf32_tic6x_be)"
+
 eelf32_tic6x_elf_be.c: $(srcdir)/emulparams/elf32_tic6x_elf_be.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_elf_be "$(tdir_elf32_tic6x_elf_be)"
+
 eelf32_tic6x_elf_le.c: $(srcdir)/emulparams/elf32_tic6x_elf_le.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_elf_le "$(tdir_elf32_tic6x_elf_le)"
+
 eelf32_tic6x_le.c: $(srcdir)/emulparams/elf32_tic6x_le.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_le "$(tdir_elf32_tic6x_le)"
+
 eelf32_tic6x_linux_be.c: $(srcdir)/emulparams/elf32_tic6x_linux_be.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_linux_be "$(tdir_elf32_tic6x_linux_be)"
+
 eelf32_tic6x_linux_le.c: $(srcdir)/emulparams/elf32_tic6x_linux_le.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_linux_le "$(tdir_elf32_tic6x_linux_le)"
+
 eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \
   $(srcdir)/emulparams/elf32am33lin.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32am33lin "$(tdir_elf32am33lin)"
+
 eelf32b4300.c: $(srcdir)/emulparams/elf32b4300.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32b4300 "$(tdir_elf32b4300)"
+
 eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bfin "$(tdir_elf32bfin)" bfin
+
 eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh \
   $(srcdir)/emulparams/bfin.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bfinfd "$(tdir_elf32bfinfd)" elf32bfinfd
+
 eelf32bmip.c: $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bmip "$(tdir_elf32bmip)"
+
 eelf32bmipn32.c: $(srcdir)/emulparams/elf32bmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/irix.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bmipn32 "$(tdir_elf32bmipn32)"
+
 eelf32bsmip.c: $(srcdir)/emulparams/elf32bsmip.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) $(srcdir)/emultempl/irix.em \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bsmip "$(tdir_elf32bsmip)"
+
 eelf32btsmip.c: $(srcdir)/emulparams/elf32btsmip.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32btsmip "$(tdir_elf32btsmip)"
+
 eelf32btsmip_fbsd.c: $(srcdir)/emulparams/elf32btsmip_fbsd.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32btsmip_fbsd "$(tdir_elf32btsmip_fbsd)"
+
 eelf32btsmipn32.c: $(srcdir)/emulparams/elf32btsmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32btsmipn32 "$(tdir_elf32btsmipn32)"
+
 eelf32btsmipn32_fbsd.c: $(srcdir)/emulparams/elf32btsmipn32_fbsd.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32btsmipn32_fbsd "$(tdir_elf32btsmipn32_fbsd)"
+
 eelf32cr16.c: $(srcdir)/emulparams/elf32cr16.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/cr16elf.em \
   $(srcdir)/scripttempl/elf32cr16.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32cr16 "$(tdir_elf32crx)"
+
 eelf32cr16c.c: $(srcdir)/emulparams/elf32cr16c.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf32cr16c.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32cr16c "$(tdir_elf32cr16c)"
+
 eelf32crx.c: $(srcdir)/emulparams/elf32crx.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/crxelf.em \
   $(srcdir)/scripttempl/elf32crx.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32crx "$(tdir_elf32crx)"
+
 eelf32ebmip.c: $(srcdir)/emulparams/elf32ebmip.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ebmip "$(tdir_elf32ebmip)"
+
 eelf32ebmipvxworks.c: $(srcdir)/emulparams/elf32ebmipvxworks.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emulparams/vxworks.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ebmipvxworks "$(tdir_elf32ebmipvxworks)"
+
 eelf32elmip.c: $(srcdir)/emulparams/elf32elmip.sh \
   $(srcdir)/emulparams/elf32lmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32elmip "$(tdir_elf32elmip)"
+
 eelf32elmipvxworks.c: $(srcdir)/emulparams/elf32elmipvxworks.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emulparams/vxworks.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32elmipvxworks "$(tdir_elf32elmipvxworks)"
+
 eelf32lr5900.c: $(srcdir)/emulparams/elf32lr5900.sh \
   $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lr5900 "$(tdir_elf32lr5900)"
+
 eelf32lr5900n32.c: $(srcdir)/emulparams/elf32lr5900n32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lr5900n32 "$(tdir_elf32lr5900n32)"
+
 eelf32epiphany.c: $(srcdir)/emulparams/elf32epiphany.sh \
   $(ELF_DEPS) ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32epiphany "$(tdir_epiphany)"
+
 eelf32epiphany_4x4.c: $(srcdir)/emulparams/elf32epiphany_4x4.sh \
   $(srcdir)/emultempl/elf32.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/epiphany_4x4.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32epiphany_4x4 "$(tdir_epiphany_4x4)"
+
 eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
+
 eelf32frv.c: $(srcdir)/emulparams/elf32frv.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32frv "$(tdir_frv)"
+
 eelf32frvfd.c: $(srcdir)/emulparams/elf32frvfd.sh \
   $(srcdir)/emulparams/elf32frv.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32frvfd "$(tdir_frv)"
+
 eelf32i370.c: $(srcdir)/emulparams/elf32i370.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfi370.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32i370 "$(tdir_elf32i370)"
+
 eelf32ip2k.c: $(srcdir)/emulparams/elf32ip2k.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ip2k "$(tdir_ip2k)"
+
 eelf32iq10.c: $(srcdir)/emulparams/elf32iq10.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32iq10 "$(tdir_iq10)"
+
 eelf32iq2000.c: $(srcdir)/emulparams/elf32iq2000.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32iq2000 "$(tdir_iq2000)"
+
 eelf32l4300.c: $(srcdir)/emulparams/elf32l4300.sh \
   $(srcdir)/emulparams/elf32b4300.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32l4300 "$(tdir_elf32l4300)"
+
 eelf32lm32.c: $(srcdir)/emulparams/elf32lm32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lm32 "$(tdir_elf32lm32)"
+
 eelf32lm32fd.c: $(srcdir)/emulparams/elf32lm32fd.sh \
   $(srcdir)/emulparams/elf32lm32.sh $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lm32fd "$(tdir_elf32lm32fd)"
+
 eelf32lmip.c: $(srcdir)/emulparams/elf32lmip.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lmip "$(tdir_elf32lmip)"
+
 eelf32lppc.c: $(srcdir)/emulparams/elf32lppc.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emultempl/ppc32elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lppc "$(tdir_elf32lppc)"
+
 eelf32lppclinux.c: $(srcdir)/emulparams/elf32lppclinux.sh \
   $(srcdir)/emulparams/elf32lppc.sh $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lppclinux "$(tdir_elf32lppclinux)"
+
 eelf32lppcnto.c: $(srcdir)/emulparams/elf32lppcnto.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lppcnto "$(tdir_elf32lppcnto)"
+
 eelf32lppcsim.c: $(srcdir)/emulparams/elf32lppcsim.sh \
   $(srcdir)/emulparams/elf32lppc.sh $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lppcsim "$(tdir_elf32lppcsim)"
+
 eelf32lsmip.c: $(srcdir)/emulparams/elf32lsmip.sh \
   $(srcdir)/emulparams/elf32lmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lsmip "$(tdir_elf32lsmip)"
+
 eelf32ltsmip.c: $(srcdir)/emulparams/elf32ltsmip.sh \
   $(srcdir)/emulparams/elf32btsmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ltsmip "$(tdir_elf32ltsmip)"
+
 eelf32ltsmip_fbsd.c: $(srcdir)/emulparams/elf32ltsmip_fbsd.sh \
   $(srcdir)/emulparams/elf32btsmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ltsmip_fbsd "$(tdir_elf32ltsmip_fbsd)"
+
 eelf32ltsmipn32.c: $(srcdir)/emulparams/elf32ltsmipn32.sh \
   $(srcdir)/emulparams/elf32btsmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ltsmipn32 "$(tdir_elf32ltsmipn32)"
+
 eelf32ltsmipn32_fbsd.c: $(srcdir)/emulparams/elf32ltsmipn32_fbsd.sh \
   $(srcdir)/emulparams/elf32btsmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ltsmipn32_fbsd "$(tdir_elf32ltsmipn32_fbsd)"
+
 eelf32m32c.c: $(srcdir)/emulparams/elf32m32c.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
+
 eelf32mbel_linux.c: $(srcdir)/emulparams/elf32mbel_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mbel_linux "$(tdir_microblazeel)"
+
 eelf32mb_linux.c: $(srcdir)/emulparams/elf32mb_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mb_linux "$(tdir_microblaze)"
+
 eelf32mcore.c: $(srcdir)/emulparams/elf32mcore.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mcore "$(tdir_mcore)"
+
 eelf32mep.c: $(srcdir)/emulparams/elf32mep.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/mep.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mep "$(tdir_mep)"
+
 eelf32metag.c: $(srcdir)/emulparams/elf32metag.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/metagelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32metag "$(tdir_metag)"
+
 eelf32microblazeel.c: $(srcdir)/emulparams/elf32microblazeel.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfmicroblaze.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32microblazeel "$(tdir_microblazeel)"
+
 eelf32microblaze.c: $(srcdir)/emulparams/elf32microblaze.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfmicroblaze.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32microblaze "$(tdir_microblaze)"
+
 eelf32mipswindiss.c: $(srcdir)/emulparams/elf32mipswindiss.sh $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mipswindiss "$(tdir_elf32mipswindiss)"
+
 eelf32moxie.c: $(srcdir)/emulparams/elf32moxie.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32moxie "$(tdir_moxie)"
+
 eelf32mt.c: $(srcdir)/emulparams/elf32mt.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mt "$(tdir_mt)"
+
 eelf32or1k.c: $(srcdir)/emulparams/elf32or1k.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32or1k "$(tdir_elf32or1k)"
+
 eelf32or1k_linux.c: $(srcdir)/emulparams/elf32or1k_linux.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32or1k_linux "$(tdir_elf32or1k_linux)"
+
 eelf32ppc.c: $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppc "$(tdir_elf32ppc)"
+
 eelf32ppc_fbsd.c: $(srcdir)/emulparams/elf32ppc_fbsd.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppc_fbsd "$(tdir_elf32ppc_fbsd)"
+
 eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppclinux "$(tdir_elf32ppclinux)"
+
 eelf32ppcnto.c: $(srcdir)/emulparams/elf32ppcnto.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppcnto "$(tdir_elf32ppcnto)"
+
 eelf32ppcsim.c: $(srcdir)/emulparams/elf32ppcsim.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppcsim "$(tdir_elf32ppcsim)"
+
 eelf32ppcvxworks.c: $(srcdir)/emulparams/elf32ppcvxworks.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emulparams/vxworks.sh \
   $(srcdir)/emultempl/vxworks.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppcvxworks "$(tdir_elf32ppcvxworks)"
+
 eelf32ppcwindiss.c: $(srcdir)/emulparams/elf32ppcwindiss.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppcwindiss "$(tdir_elf32ppcwindiss)"
+
 eelf32rl78.c: $(srcdir)/emulparams/elf32rl78.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32rl78 "$(tdir_elf32rl78)"
+
 eelf32rx.c: $(srcdir)/emulparams/elf32rx.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32rx "$(tdir_elf32rx)"
+
 eelf32tilegx.c: $(srcdir)/emulparams/elf32tilegx.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32tilegx "$(tdir_tilegx)"
+
 eelf32tilegx_be.c: $(srcdir)/emulparams/elf32tilegx_be.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32tilegx_be "$(tdir_tilegx_be)"
+
 eelf32tilepro.c: $(srcdir)/emulparams/elf32tilepro.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32tilepro "$(tdir_tilepro)"
+
 eelf32vax.c: $(srcdir)/emulparams/elf32vax.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32vax "$(tdir_elf32vax)"
+
 eelf32xc16x.c: $(srcdir)/emulparams/elf32xc16x.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xc16x "$(tdir_xc16x)"
+
 eelf32xc16xl.c: $(srcdir)/emulparams/elf32xc16xl.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xc16xl "$(tdir_xc16xl)"
+
 eelf32xc16xs.c: $(srcdir)/emulparams/elf32xc16xs.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xc16xs "$(tdir_xc16xs)"
+
 eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/xstormy16.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xstormy16 "$(tdir_xstormy16)"
+
 eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/xtensaelf.em $(INCDIR)/xtensa-config.h \
   $(BFDDIR)/elf-bfd.h $(BFDDIR)/libbfd.h $(INCDIR)/elf/xtensa.h \
   $(srcdir)/scripttempl/elfxtensa.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xtensa "$(tdir_elf32xtensa)"
+
 eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386 "$(tdir_elf_i386)"
+
 eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_be "$(tdir_elf_i386_be)"
+
 eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_chaos "$(tdir_elf_i386_chaos)"
+
 eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \
   $(srcdir)/emulparams/elf_i386.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_fbsd "$(tdir_elf_i386_fbsd)"
+
 eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)"
+
 eelf_i386_nacl.c: $(srcdir)/emulparams/elf_i386_nacl.sh \
   $(srcdir)/emulparams/elf_i386.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_nacl "$(tdir_elf_i386_nacl)"
+
 eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \
   $(srcdir)/emulparams/solaris2.sh \
   $(srcdir)/emultempl/solaris2.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_sol2 "$(tdir_elf_i386_sol2)"
+
 eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_vxworks "$(tdir_elf_i386_vxworks)"
+
 eelf_s390.c: $(srcdir)/emulparams/elf_s390.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_s390 "$(tdir_elf_s390)"
+
 egld960.c: $(srcdir)/emulparams/gld960.sh \
   $(srcdir)/emultempl/gld960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} gld960 "$(tdir_gld960)"
+
 egld960coff.c: $(srcdir)/emulparams/gld960coff.sh \
   $(srcdir)/emultempl/gld960c.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} gld960coff "$(tdir_gld960coff)"
+
 eh8300.c: $(srcdir)/emulparams/h8300.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300 "$(tdir_h8300)"
+
 eh8300elf.c: $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300elf "$(tdir_h8300elf)"
+
 eh8300h.c: $(srcdir)/emulparams/h8300h.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300h "$(tdir_h8300h)"
+
 eh8300helf.c: $(srcdir)/emulparams/h8300helf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300helf "$(tdir_h8300helf)"
+
 eh8300hn.c: $(srcdir)/emulparams/h8300hn.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300hn.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300hn "$(tdir_h8300hn)"
+
 eh8300hnelf.c: $(srcdir)/emulparams/h8300hnelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300hnelf "$(tdir_h8300hnelf)"
+
 eh8300s.c: $(srcdir)/emulparams/h8300s.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300s.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300s "$(tdir_h8300s)"
+
 eh8300self.c: $(srcdir)/emulparams/h8300self.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300self "$(tdir_h8300self)"
+
 eh8300sn.c: $(srcdir)/emulparams/h8300sn.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sn.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sn "$(tdir_h8300sn)"
+
 eh8300snelf.c: $(srcdir)/emulparams/h8300snelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300snelf "$(tdir_h8300snelf)"
+
 eh8300sx.c: $(srcdir)/emulparams/h8300sx.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sx.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sx "$(tdir_h8300sx)"
+
 eh8300sxelf.c: $(srcdir)/emulparams/h8300sxelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sxelf "$(tdir_h8300sxelf)"
+
 eh8300sxn.c: $(srcdir)/emulparams/h8300sxn.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sxn.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sxn "$(tdir_h8300sxn)"
+
 eh8300sxnelf.c: $(srcdir)/emulparams/h8300sxnelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sxnelf "$(tdir_h8300sxnelf)"
+
 eh8500.c: $(srcdir)/emulparams/h8500.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500 "$(tdir_h8500)"
+
 eh8500b.c: $(srcdir)/emulparams/h8500b.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500b.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500b "$(tdir_h8500b)"
+
 eh8500c.c: $(srcdir)/emulparams/h8500c.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500c.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500c "$(tdir_h8500c)"
+
 eh8500m.c: $(srcdir)/emulparams/h8500m.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500m.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500m "$(tdir_h8500m)"
+
 eh8500s.c: $(srcdir)/emulparams/h8500s.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500s.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500s "$(tdir_h8500s)"
+
 ehp300bsd.c: $(srcdir)/emulparams/hp300bsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hp300bsd "$(tdir_hp300bsd)"
+
 ehp3hpux.c: $(srcdir)/emulparams/hp3hpux.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hp3hpux "$(tdir_hp3hpux)"
+
 ehppaelf.c: $(srcdir)/emulparams/hppaelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
   $(srcdir)/scripttempl/hppaelf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppaelf "$(tdir_hppaelf)"
+
 ehppalinux.c: $(srcdir)/emulparams/hppalinux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppalinux "$(tdir_hppalinux)"
+
 ehppanbsd.c: $(srcdir)/emulparams/hppanbsd.sh \
   $(srcdir)/emulparams/hppaelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppanbsd "$(tdir_hppanbsd)"
+
 ehppaobsd.c: $(srcdir)/emulparams/hppaobsd.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppaobsd "$(tdir_hppaobsd)"
+
 ei386aout.c: $(srcdir)/emulparams/i386aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386aout "$(tdir_i386aout)"
+
 ei386beos.c: $(srcdir)/emulparams/i386beos.sh \
   $(srcdir)/emultempl/beos.em $(srcdir)/scripttempl/i386beos.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386beos "$(tdir_i386beos)"
+
 ei386bsd.c: $(srcdir)/emulparams/i386bsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386bsd "$(tdir_i386bsd)"
+
 ei386coff.c: $(srcdir)/emulparams/i386coff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386coff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386coff "$(tdir_i386coff)"
+
 ei386go32.c: $(srcdir)/emulparams/i386go32.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386go32.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386go32 "$(tdir_i386go32)"
+
 ei386linux.c: $(srcdir)/emulparams/i386linux.sh \
   $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386linux "$(tdir_i386linux)"
+
 ei386lynx.c: $(srcdir)/emulparams/i386lynx.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386lynx "$(tdir_i386lynx)"
+
 ei386mach.c: $(srcdir)/emulparams/i386mach.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386mach "$(tdir_i386mach)"
+
 ei386moss.c: $(srcdir)/emulparams/i386moss.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386moss "$(tdir_i386moss)"
+
 ei386msdos.c: $(srcdir)/emulparams/i386msdos.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386msdos.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386msdos "$(tdir_i386msdos)"
+
 ei386nbsd.c:	$(srcdir)/emulparams/i386nbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386nbsd "$(tdir_i386nbsd)"
+
 ei386nto.c:	$(srcdir)/emulparams/i386nto.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386nto "$(tdir_i386nto)"
+
 ei386nw.c:	$(srcdir)/emulparams/i386nw.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386nw "$(tdir_i386nw)"
+
 ei386pe.c: $(srcdir)/emulparams/i386pe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386pe "$(tdir_i386pe)"
+
 ei386pe_posix.c: $(srcdir)/emulparams/i386pe_posix.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386pe_posix "$(tdir_i386pe_posix)"
+
 ei386pep.c: $(srcdir)/emulparams/i386pep.sh \
   $(srcdir)/emultempl/pep.em $(srcdir)/scripttempl/pep.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386pep "$(tdir_i386pe)"
+
 elnk960.c: $(srcdir)/emulparams/lnk960.sh \
   $(srcdir)/emultempl/lnk960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} lnk960 "$(tdir_lnk960)"
+
 em32relf.c: $(srcdir)/emulparams/m32relf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m32relf "$(tdir_m32r)"
+
 em32relf_linux.c: $(srcdir)/emulparams/m32relf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m32relf_linux "$(tdir_m32relf_linux)"
+
 em32rlelf.c: $(srcdir)/emulparams/m32rlelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m32rlelf "$(tdir_m32rlelf)"
+
 em32rlelf_linux.c: $(srcdir)/emulparams/m32rlelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m32rlelf_linux "$(tdir_m32rlelf_linux)"
+
 em68hc11elf.c: $(srcdir)/emulparams/m68hc11elf.sh \
   $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfm68hc11.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68hc11elf "$(tdir_m68hc11)"
+
 em68hc11elfb.c: $(srcdir)/emulparams/m68hc11elfb.sh \
   $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfm68hc11.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68hc11elfb "$(tdir_m68hc11b)"
+
 em68hc12elf.c: $(srcdir)/emulparams/m68hc12elf.sh \
   $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfm68hc12.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68hc12elf "$(tdir_m68hc12)"
+
 em68hc12elfb.c: $(srcdir)/emulparams/m68hc12elfb.sh \
   $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfm68hc12.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68hc12elfb "$(tdir_m68hc12b)"
+
 em68k4knbsd.c:	$(srcdir)/emulparams/m68k4knbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68k4knbsd "$(tdir_m68k4knbsd)"
+
 em68kaout.c: $(srcdir)/emulparams/m68kaout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kaout "$(tdir_m68kaout)"
+
 em68kaux.c: $(srcdir)/emulparams/m68kaux.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m68kaux.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kaux "$(tdir_m68kaux)"
+
 em68kcoff.c: $(srcdir)/emulparams/m68kcoff.sh \
   $(srcdir)/emultempl/m68kcoff.em $(srcdir)/scripttempl/m68kcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kcoff "$(tdir_m68kcoff)"
+
 em68kelf.c: $(srcdir)/emulparams/m68kelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/m68kelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kelf "$(tdir_m68kelf)"
+
 em68kelfnbsd.c: $(srcdir)/emulparams/m68kelfnbsd.sh \
   $(srcdir)/emulparams/m68kelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/m68kelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kelfnbsd "$(tdir_m68kelfnbsd)"
+
 em68klinux.c: $(srcdir)/emulparams/m68klinux.sh \
   $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68klinux "$(tdir_m68klinux)"
+
 em68knbsd.c:	$(srcdir)/emulparams/m68knbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68knbsd "$(tdir_m68knbsd)"
+
 em68kpsos.c:	$(srcdir)/emulparams/m68kpsos.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/psos.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kpsos "$(tdir_m68kpsos)"
+
 em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m88kbcs "$(tdir_m88kbcs)"
+
 emcorepe.c: $(srcdir)/emulparams/mcorepe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} mcorepe "$(tdir_mcorepe)"
+
 emn10200.c: $(srcdir)/emulparams/mn10200.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} mn10200 "$(tdir_mn10200)"
+
 emn10300.c: $(srcdir)/emulparams/mn10300.sh \
   $(srcdir)/emulparams/mn10200.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} mn10300 "$(tdir_mn10300)"
+
 emsp430.c: $(srcdir)/emulparams/msp430all.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} msp430 "$(tdir_msp430)" msp430all
+
 emsp430X.c: $(srcdir)/emulparams/msp430all.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} msp430X "$(tdir_msp430X)" msp430all
+
 ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32elf "$(tdir_nds32)"
+
 ends32elf16m.c: $(srcdir)/emulparams/nds32elf16m.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32elf16m "$(tdir_nds32)"
+
 ends32belf.c: $(srcdir)/emulparams/nds32belf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32belf "$(tdir_nds32belf)"
+
 ends32belf16m.c: $(srcdir)/emulparams/nds32belf16m.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32belf16m "$(tdir_nds32belf)"
+
 ends32elf_linux.c: $(srcdir)/emulparams/nds32elf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32elf_linux "$(tdir_nds32elf_linux)"
+
 ends32belf_linux.c: $(srcdir)/emulparams/nds32belf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32belf_linux "$(tdir_nds32belf_linux)"
+
 enews.c: $(srcdir)/emulparams/news.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} news "$(tdir_news)"
+
 enios2elf.c: $(srcdir)/emulparams/nios2elf.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/nios2elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nios2elf "$(tdir_nios2elf)"
+
 enios2linux.c: $(srcdir)/emulparams/nios2linux.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/nios2elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nios2linux "$(tdir_nios2linux)"
+
 ens32knbsd.c:	$(srcdir)/emulparams/ns32knbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/netbsd.em \
   $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ns32knbsd "$(tdir_ns32knbsd)"
+
 eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64elf "$(tdir_aarch64elf)"
+
 eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64elf32 "$(tdir_aarch64elf32)"
+
 eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64elfb "$(tdir_aarch64elfb)"
+
 eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64elf32b "$(tdir_aarch64elf32b)"
+
 eaarch64linux.c: $(srcdir)/emulparams/aarch64linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64linux "$(tdir_aarch64linux)"
+
 eaarch64linuxb.c: $(srcdir)/emulparams/aarch64linuxb.sh $(srcdir)/emulparams/aarch64linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64linuxb "$(tdir_aarch64linuxb)"
+
 eaarch64linux32.c: $(srcdir)/emulparams/aarch64linux32.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64linux32 "$(tdir_aarch64linux32)"
+
 eaarch64linux32b.c: $(srcdir)/emulparams/aarch64linux32b.sh $(srcdir)/emulparams/aarch64linux32.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64linux32b "$(tdir_aarch64linux32b)"
+
 epc532macha.c: $(srcdir)/emulparams/pc532macha.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} pc532macha "$(tdir_pc532macha)"
+
 epdp11.c: $(srcdir)/emulparams/pdp11.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} pdp11 "$(tdir_pdp11)"
+
 epjelf.c: $(srcdir)/emulparams/pjelf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} pjelf "$(tdir_pjelf)"
+
 epjlelf.c: $(srcdir)/emulparams/pjlelf.sh $(srcdir)/emulparams/pjelf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} pjlelf "$(tdir_pjlelf)"
+
 eppclynx.c: $(srcdir)/emulparams/ppclynx.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ppclynx "$(tdir_ppclynx)"
+
 eppcmacos.c:	$(srcdir)/emulparams/ppcmacos.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ppcmacos "$(tdir_ppcmacos)"
+
 eppcnw.c:	$(srcdir)/emulparams/ppcnw.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ppcnw "$(tdir_ppcnw)"
+
 eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/ppcpe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ppcpe "$(tdir_ppcpe)"
+
 eriscix.c: $(srcdir)/emulparams/riscix.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} riscix "$(tdir_riscix)"
+
 escore3_elf.c: $(srcdir)/emulparams/scoreelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} score3_elf "$(tdir_score3_elf)" scoreelf
+
 escore7_elf.c: $(srcdir)/emulparams/scoreelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} score7_elf "$(tdir_score7_elf)" scoreelf
+
 esh.c: $(srcdir)/emulparams/sh.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sh "$(tdir_sh)"
+
 eshelf.c: $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf "$(tdir_shelf)"
+
 eshelf32.c: $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf32 "$(tdir_shelf32)"
+
 eshelf32_linux.c: $(srcdir)/emulparams/shelf32_linux.sh \
   $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf32_linux "$(tdir_shelf32_linux)"
+
 eshelf32_nbsd.c: $(srcdir)/emulparams/shelf32_nbsd.sh \
   $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf32_nbsd "$(tdir_shelf32_nbsd)"
+
 eshelf_fd.c: $(srcdir)/emulparams/shelf_fd.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_fd "$(tdir_shelf_fd)"
+
 eshelf_linux.c: $(srcdir)/emulparams/shelf_linux.sh \
   $(srcdir)/emulparams/shlelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_linux "$(tdir_shelf_linux)"
+
 eshelf_nbsd.c: $(srcdir)/emulparams/shelf_nbsd.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_nbsd "$(tdir_shelf_nbsd)"
+
 eshelf_nto.c: $(srcdir)/emulparams/shelf_nto.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_nto "$(tdir_shelf_nto)"
+
 eshelf_uclinux.c: $(srcdir)/emulparams/shelf_uclinux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_uclinux "$(tdir_shelf_uclinux)"
+
 eshelf_vxworks.c: $(srcdir)/emulparams/shelf_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc \
   $(srcdir)/emultempl/vxworks.em ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_vxworks "$(tdir_shelf_vxworks)"
+
 eshl.c: $(srcdir)/emulparams/shl.sh \
   $(srcdir)/emulparams/sh.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shl "$(tdir_shl)"
+
 eshlelf.c: $(srcdir)/emulparams/shlelf.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf "$(tdir_shlelf)"
+
 eshlelf32.c: $(srcdir)/emulparams/shlelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h $(srcdir)/emulparams/shelf32.sh \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf32 "$(tdir_shlelf32)"
+
 eshlelf32_linux.c: $(srcdir)/emulparams/shlelf32_linux.sh \
   $(srcdir)/emulparams/shelf32_linux.sh $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf32_linux "$(tdir_shlelf32_linux)"
+
 eshlelf32_nbsd.c: $(srcdir)/emulparams/shlelf32_nbsd.sh \
   $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf32_nbsd "$(tdir_shlelf32_nbsd)"
+
 eshlelf_fd.c: $(srcdir)/emulparams/shlelf_fd.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_fd "$(tdir_shlelf_fd)"
+
 eshlelf_linux.c: $(srcdir)/emulparams/shlelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_linux "$(tdir_shlelf_linux)"
+
 eshlelf_nbsd.c: $(srcdir)/emulparams/shlelf_nbsd.sh \
   $(srcdir)/emulparams/shelf_nbsd.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_nbsd "$(tdir_shlelf_nbsd)"
+
 eshlelf_nto.c: $(srcdir)/emulparams/shlelf_nto.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_nto "$(tdir_shlelf_nto)"
+
 eshlelf_vxworks.c: $(srcdir)/emulparams/shlelf_vxworks.sh \
   $(srcdir)/emulparams/shelf_vxworks.sh $(srcdir)/emulparams/vxworks.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/vxworks.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_vxworks "$(tdir_shlelf_vxworks)"
+
 eshlsymbian.c: $(srcdir)/emulparams/shlsymbian.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf32sh-symbian.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlsymbian "$(tdir_shlelf)"
+
 eshpe.c: $(srcdir)/emulparams/shpe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shpe "$(tdir_shl)"
+
 esparcaout.c: $(srcdir)/emulparams/sparcaout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sparcaout "$(tdir_sparcaout)"
+
 esparclinux.c: $(srcdir)/emulparams/sparclinux.sh \
   $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sparclinux "$(tdir_sparclinux)"
+
 esparcnbsd.c:	$(srcdir)/emulparams/sparcnbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sparcnbsd "$(tdir_sparcnbsd)"
+
 est2000.c: $(srcdir)/emulparams/st2000.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/st2000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} st2000 "$(tdir_st2000)"
+
 esun3.c: $(srcdir)/emulparams/sun3.sh \
   $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sun3 "$(tdir_sun3)"
+
 esun4.c: $(srcdir)/emulparams/sun4.sh \
   $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sun4 "$(tdir_sun4)"
+
 etic30aout.c: $(srcdir)/emulparams/tic30aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic30aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic30aout "$(tdir_tic30aout)"
+
 etic30coff.c: $(srcdir)/emulparams/tic30coff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic30coff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic30coff "$(tdir_tic30coff)"
+
 etic3xcoff.c: $(srcdir)/emulparams/tic3xcoff.sh \
   $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic3xcoff "$(tdir_tic4xcoff)"
+
 etic3xcoff_onchip.c: $(srcdir)/emulparams/tic3xcoff_onchip.sh \
   $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic3xcoff_onchip "$(tdir_tic4xcoff)"
+
 etic4xcoff.c: $(srcdir)/emulparams/tic4xcoff.sh \
   $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic4xcoff "$(tdir_tic4xcoff)"
+
 etic54xcoff.c: $(srcdir)/emulparams/tic54xcoff.sh \
   $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic54xcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic54xcoff "$(tdir_tic54xcoff)"
+
 etic80coff.c: $(srcdir)/emulparams/tic80coff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic80coff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic80coff "$(tdir_tic80coff)"
+
 ev850.c: $(srcdir)/emulparams/v850.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/v850.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} v850 "$(tdir_v850)"
+
 ev850_rh850.c: $(srcdir)/emulparams/v850_rh850.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/v850_rh850.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} v850_rh850 "$(tdir_v850_rh850)"
+
 evanilla.c: $(srcdir)/emulparams/vanilla.sh \
   $(srcdir)/emultempl/vanilla.em $(srcdir)/scripttempl/vanilla.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} vanilla "$(tdir_vanilla)"
+
 evax.c: $(srcdir)/emulparams/vax.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} vax "$(tdir_vax)"
+
 evaxnbsd.c: $(srcdir)/emulparams/vaxnbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} vaxnbsd "$(tdir_vaxnbsd)"
+
 evsta.c: $(srcdir)/emulparams/vsta.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} vsta "$(tdir_vsta)"
+
 ew65.c: $(srcdir)/emulparams/w65.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/w65.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} w65 "$(tdir_w65)"
+
 exgateelf.c: $(srcdir)/emulparams/xgateelf.sh \
   $(srcdir)/emultempl/generic.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfxgate.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} xgateelf "$(tdir_xgate)"
+
 ez80.c: $(srcdir)/emulparams/z80.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/z80.em \
   $(srcdir)/scripttempl/z80.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} z80 "$(tdir_z80)"
+
 ez8001.c: $(srcdir)/emulparams/z8001.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} z8001 "$(tdir_z8001)"
+
 ez8002.c: $(srcdir)/emulparams/z8002.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} z8002 "$(tdir_z8002)"
 
 eelf32_x86_64.c: $(srcdir)/emulparams/elf32_x86_64.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_x86_64 "$(tdir_elf32_x86_64)"
+
 eelf32_x86_64_nacl.c: $(srcdir)/emulparams/elf32_x86_64_nacl.sh \
   $(srcdir)/emulparams/elf32_x86_64.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_x86_64_nacl "$(tdir_elf32_x86_64_nacl)"
+
 eelf64_aix.c: $(srcdir)/emulparams/elf64_aix.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_aix "$(tdir_elf64_aix)"
+
 eelf64_ia64.c: $(srcdir)/emulparams/elf64_ia64.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/ia64elf.em \
   $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_ia64 "$(tdir_elf64_ia64)"
+
 eelf64_ia64_fbsd.c: $(srcdir)/emulparams/elf64_ia64_fbsd.sh \
   $(srcdir)/emulparams/elf64_ia64.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/ia64elf.em \
   $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_ia64_fbsd "$(tdir_elf64_ia64_fbsd)"
+
 eelf64_ia64_vms.c: $(srcdir)/emulparams/elf64_ia64_vms.sh \
   $(srcdir)/emultempl/vms.em $(srcdir)/emultempl/elf-generic.em \
   $(srcdir)/scripttempl/ia64vms.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_ia64_vms "$(tdir_elf64_ia64_vms)"
+
 eelf64_s390.c: $(srcdir)/emulparams/elf64_s390.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_s390 "$(tdir_elf64_s390)"
+
 eelf64_sparc.c: $(srcdir)/emulparams/elf64_sparc.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_sparc "$(tdir_elf64_sparc)"
+
 eelf64_sparc_fbsd.c: $(srcdir)/emulparams/elf64_sparc_fbsd.sh \
   $(srcdir)/emulparams/elf64_sparc.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_sparc_fbsd "$(tdir_elf64_sparc_fbsd)"
+
 eelf64_sparc_sol2.c: $(srcdir)/emulparams/elf64_sparc_sol2.sh \
   $(srcdir)/emulparams/elf64_sparc.sh \
   $(srcdir)/emulparams/solaris2.sh \
   $(srcdir)/emultempl/solaris2.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_sparc_sol2 "$(tdir_elf64_sparc_sol2)"
+
 eelf64alpha.c: $(srcdir)/emulparams/elf64alpha.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64alpha "$(tdir_elf64alpha)"
+
 eelf64alpha_fbsd.c: $(srcdir)/emulparams/elf64alpha_fbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64alpha_fbsd "$(tdir_elf64alpha_fbsd)"
+
 eelf64alpha_nbsd.c: $(srcdir)/emulparams/elf64alpha_nbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64alpha_nbsd "$(tdir_elf64alpha_nbsd)"
+
 eelf64bmip.c: $(srcdir)/emulparams/elf64bmip.sh \
   $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/irix.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64bmip "$(tdir_elf64bmip)"
+
 eelf64btsmip.c: $(srcdir)/emulparams/elf64btsmip.sh \
   $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64btsmip "$(tdir_elf64btsmip)"
+
 eelf64btsmip_fbsd.c: $(srcdir)/emulparams/elf64btsmip_fbsd.sh \
   $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64btsmip_fbsd "$(tdir_elf64btsmip_fbsd)"
+
 eelf64hppa.c: $(srcdir)/emulparams/elf64hppa.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf64hppa.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64hppa "$(tdir_elf64hppa)"
+
 eelf64lppc.c: $(srcdir)/emulparams/elf64lppc.sh \
   $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64lppc "$(tdir_elf64lppc)"
+
 eelf64ltsmip.c: $(srcdir)/emulparams/elf64ltsmip.sh \
   $(srcdir)/emulparams/elf64btsmip.sh $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ltsmip "$(tdir_elf64ltsmip)"
+
 eelf64ltsmip_fbsd.c: $(srcdir)/emulparams/elf64ltsmip_fbsd.sh \
   $(srcdir)/emulparams/elf64btsmip_fbsd.sh $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ltsmip_fbsd "$(tdir_elf64ltsmip_fbsd)"
+
 eelf64mmix.c: $(srcdir)/emulparams/elf64mmix.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mmix-elfnmmo.em \
   $(srcdir)/emultempl/mmixelf.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64mmix "$(tdir_elf64mmix)"
+
 eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ppc "$(tdir_elf64ppc)"
+
 eelf64ppc_fbsd.c: $(srcdir)/emulparams/elf64ppc_fbsd.sh \
   $(srcdir)/emultempl/ppc64elf.em ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ppc_fbsd "$(tdir_elf64ppc_fbsd)"
+
 eelf64rdos.c: $(srcdir)/emulparams/elf64rdos.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64rdos "$(tdir_elf64rdos)"
+
 eelf64tilegx.c: $(srcdir)/emulparams/elf64tilegx.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64tilegx "$(tdir_tilegx)"
+
 eelf64tilegx_be.c: $(srcdir)/emulparams/elf64tilegx_be.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64tilegx_be "$(tdir_tilegx_be)"
+
 eelf_l1om.c: $(srcdir)/emulparams/elf_l1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_l1om "$(tdir_elf_l1om)"
+
 eelf_l1om_fbsd.c: $(srcdir)/emulparams/elf_l1om_fbsd.sh \
   $(srcdir)/emulparams/elf_l1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_l1om_fbsd "$(tdir_elf_l1om_fbsd)"
+
 eelf_k1om.c: $(srcdir)/emulparams/elf_k1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_k1om "$(tdir_elf_k1om)"
+
 eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \
   $(srcdir)/emulparams/elf_k1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_k1om_fbsd "$(tdir_elf_k1om_fbsd)"
+
 eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_x86_64 "$(tdir_elf_x86_64)"
+
 eelf_x86_64_fbsd.c: $(srcdir)/emulparams/elf_x86_64_fbsd.sh \
   $(srcdir)/emulparams/elf_x86_64.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_x86_64_fbsd "$(tdir_elf_x86_64_fbsd)"
+
 eelf_x86_64_nacl.c: $(srcdir)/emulparams/elf_x86_64_nacl.sh \
   $(srcdir)/emulparams/elf_x86_64.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_x86_64_nacl "$(tdir_elf_x86_64_nacl)"
+
 eelf_x86_64_sol2.c: $(srcdir)/emulparams/elf_x86_64_sol2.sh \
   $(srcdir)/emulparams/elf_x86_64.sh \
   $(srcdir)/emulparams/solaris2.sh \
   $(srcdir)/emultempl/solaris2.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_x86_64_sol2 "$(tdir_elf_x86_64_sol2)"
+
 ehppa64linux.c: $(srcdir)/emulparams/hppa64linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppa64linux "$(tdir_hppa64linux)"
+
 emmo.c: $(srcdir)/emulparams/mmo.sh $(srcdir)/emultempl/mmix-elfnmmo.em \
   $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em \
   $(srcdir)/emultempl/mmo.em $(srcdir)/scripttempl/DWARF.sc \
   $(srcdir)/scripttempl/mmo.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} mmo "$(tdir_mmo)"
+
 eshelf64.c: $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf64 "$(tdir_shelf64)"
+
 eshelf64_nbsd.c: $(srcdir)/emulparams/shelf64_nbsd.sh \
   $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf64_nbsd "$(tdir_shelf64_nbsd)"
+
 eshlelf64.c: $(srcdir)/emulparams/shlelf64.sh \
   $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf64 "$(tdir_shlelf64)"
+
 eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \
   $(srcdir)/emulparams/shelf64_nbsd.sh \
   $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf64_nbsd "$(tdir_shlelf64_nbsd)"
+
 
 # We need this for automake to use YLWRAP.
 EXTRA_ld_new_SOURCES = deffilep.y ldlex.l

brgds, H-P

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-05-19 22:48 [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds Hans-Peter Nilsson
@ 2014-05-20  9:21 ` Alan Modra
  2014-05-20 11:23   ` Hans-Peter Nilsson
  0 siblings, 1 reply; 19+ messages in thread
From: Alan Modra @ 2014-05-20  9:21 UTC (permalink / raw)
  To: Hans-Peter Nilsson; +Cc: binutils

On Tue, May 20, 2014 at 12:48:09AM +0200, Hans-Peter Nilsson wrote:
> There seems to be no reason to have a separate rule for each
> invocation, when using a central rule would suffice.

Only that we've avoided depending on GNU make so far.  I'm not against
the idea, if Nick wants to make that change.

-- 
Alan Modra
Australia Development Lab, IBM

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-05-20  9:21 ` Alan Modra
@ 2014-05-20 11:23   ` Hans-Peter Nilsson
  2014-05-20 12:36     ` Alan Modra
  0 siblings, 1 reply; 19+ messages in thread
From: Hans-Peter Nilsson @ 2014-05-20 11:23 UTC (permalink / raw)
  To: amodra; +Cc: binutils

> From: Alan Modra <amodra@gmail.com>
> Date: Tue, 20 May 2014 11:21:23 +0200

> On Tue, May 20, 2014 at 12:48:09AM +0200, Hans-Peter Nilsson wrote:
> > There seems to be no reason to have a separate rule for each
> > invocation, when using a central rule would suffice.
> 
> Only that we've avoided depending on GNU make so far.  I'm not against
> the idea, if Nick wants to make that change.

To clarify, as indicated by the Austin group link (beware:
pointer chasing there), this is not "depending on GNU make", but
"depending on anything but IRIX make".

And reading again, I was wrong on the safe side re: IRIX; "all
known makes" were ok, including IRIX 6.5 (just that it supported
"only" one level of indirection, that's what's used here).  So,
"should work everywhere" with a definition of "everywhere" four
years ago being "IRIX 6.5, AIX 4.3.3, Tru64 4.0D, Solaris 2.6,
HP-UX 10.20, NetBSD, FreeBSD, OpenBSD, and of course GNU".

brgds, H-P

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-05-20 11:23   ` Hans-Peter Nilsson
@ 2014-05-20 12:36     ` Alan Modra
  2014-05-20 16:20       ` Hans-Peter Nilsson
  0 siblings, 1 reply; 19+ messages in thread
From: Alan Modra @ 2014-05-20 12:36 UTC (permalink / raw)
  To: Hans-Peter Nilsson; +Cc: binutils

On Tue, May 20, 2014 at 01:23:41PM +0200, Hans-Peter Nilsson wrote:
> > From: Alan Modra <amodra@gmail.com>
> > Date: Tue, 20 May 2014 11:21:23 +0200
> 
> > On Tue, May 20, 2014 at 12:48:09AM +0200, Hans-Peter Nilsson wrote:
> > > There seems to be no reason to have a separate rule for each
> > > invocation, when using a central rule would suffice.
> > 
> > Only that we've avoided depending on GNU make so far.  I'm not against
> > the idea, if Nick wants to make that change.
> 
> To clarify, as indicated by the Austin group link (beware:
> pointer chasing there), this is not "depending on GNU make", but
> "depending on anything but IRIX make".

I couldn't read that link, but you were talking about recursive
variable expansion.  I was more concerned with something more basic.

Which makes support pattern rules like "e%.c: "?  Does BSD make?

-- 
Alan Modra
Australia Development Lab, IBM

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-05-20 12:36     ` Alan Modra
@ 2014-05-20 16:20       ` Hans-Peter Nilsson
  2014-05-22  8:02         ` Alan Modra
  2014-05-28 13:16         ` Hans-Peter Nilsson
  0 siblings, 2 replies; 19+ messages in thread
From: Hans-Peter Nilsson @ 2014-05-20 16:20 UTC (permalink / raw)
  To: amodra; +Cc: binutils

> From: Alan Modra <amodra@gmail.com>
> Date: Tue, 20 May 2014 14:35:51 +0200

> I was more concerned with something more basic.
> 
> Which makes support pattern rules like "e%.c: "?  Does BSD make?

Uh, eh... ah.  Right: *that's* not portable.  Ugh.  But no
worries, here's a portable (*cough*) variant using a well-known
construct in addition to the recursive variable expansion.
Testing in progress; it worked for cris-elf.

Ok to commit given test-results as before?

        * Makefile.am: Change all rules with ${GENSCRIPTS}
        invocations to be just dependencies.
        ($(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES))
	(run-genscripts): New rules.
        * Makefile.in: Regenerate.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 2ad6a45..3ea8fbd 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -638,94 +638,108 @@ ELF_GEN_DEPS = $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em
 
 @TDIRS@
 
+# We can't use pattern rules as we don't want to depend on GNU
+# make, or else these rules could have been expressed in one
+# two-liner: 'e%.c:' and '	${GENSCRIPTS} $* "$(tdir_$*)"'.
+# (The recursive variable expansion is portable.)
+
+run-genscripts:
+	${GENSCRIPTS} $(script_target) "$($(script_tdirname))"
+
+.PHONY: run-genscripts
+
+$(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES):
+	base=`echo $@ | sed -e 's,e\(.*\).c,\1,'`; \
+	$(MAKE) run-genscripts "script_target=$$base" "script_tdirname=tdir_$$base"
+
 eaix5ppc.c: $(srcdir)/emulparams/aix5ppc.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aix5ppc "$(tdir_aixppc)"
+
 eaix5rs6.c: $(srcdir)/emulparams/aix5rs6.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aix5rs6 "$(tdir_aixrs6)"
+
 eaixppc.c: $(srcdir)/emulparams/aixppc.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aixppc "$(tdir_aixppc)"
+
 eaixrs6.c: $(srcdir)/emulparams/aixrs6.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aixrs6 "$(tdir_aixrs6)"
+
 ealpha.c: $(srcdir)/emulparams/alpha.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/alpha.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} alpha "$(tdir_alpha)"
+
 ealphavms.c: $(srcdir)/emulparams/alphavms.sh \
   $(srcdir)/emultempl/vms.em $(srcdir)/scripttempl/alphavms.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} alphavms "$(tdir_alphavms)"
+
 earcelf.c: $(srcdir)/emulparams/arcelf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} arcelf "$(tdir_arcelf)"
+
 earm_epoc_pe.c: $(srcdir)/emulparams/arm_epoc_pe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/epocpe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} arm_epoc_pe "$(tdir_armpe)"
+
 earm_wince_pe.c: $(srcdir)/emulparams/arm_wince_pe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} arm_wince_pe "$(tdir_armpe)"
+
 earmaoutb.c:	$(srcdir)/emulparams/armaoutb.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armaoutb "$(tdir_armaoutb)"
+
 earmaoutl.c:	$(srcdir)/emulparams/armaoutl.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armaoutl "$(tdir_armaoutl)"
+
 earmcoff.c:	$(srcdir)/emulparams/armcoff.sh \
   $(srcdir)/emultempl/armcoff.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armcoff "$(tdir_armcoff)"
+
 earmelf.c: $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf "$(tdir_armelf)"
+
 earmelf_fbsd.c: $(srcdir)/emulparams/armelf_fbsd.sh \
   $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_fbsd "$(tdir_armelf_fbsd)"
+
 earmelf_linux.c: $(srcdir)/emulparams/armelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_linux "$(tdir_armelf_linux)"
+
 earmelf_linux_eabi.c: $(srcdir)/emulparams/armelf_linux_eabi.sh \
   $(srcdir)/emulparams/armelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_linux_eabi "$(tdir_armelf_linux_abi)"
+
 earmelf_nacl.c: $(srcdir)/emulparams/armelf_nacl.sh \
   $(srcdir)/emulparams/armelf_linux_eabi.sh \
   $(srcdir)/emulparams/armelf_linux.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_nacl "$(tdir_armelf_nacl)"
+
 earmelf_nbsd.c: $(srcdir)/emulparams/armelf_nbsd.sh \
   $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_nbsd "$(tdir_armelf_nbsd)"
+
 earmelf_vxworks.c: $(srcdir)/emulparams/armelf_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/vxworks.em \
   $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} armelf_vxworks "$(tdir_armelf)"
+
 earmelfb.c: $(srcdir)/emulparams/armelfb.sh $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb "$(tdir_armelfb)"
+
 earmelfb_linux.c: $(srcdir)/emulparams/armelfb_linux.sh \
   $(srcdir)/emulparams/armelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb_linux "$(tdir_armelfb_linux)"
+
 earmelfb_linux_eabi.c: $(srcdir)/emulparams/armelfb_linux_eabi.sh \
   $(srcdir)/emulparams/armelf_linux_eabi.sh \
   $(srcdir)/emulparams/armelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb_linux_eabi "$(tdir_armelfb_linux_abi)"
+
 earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
   $(srcdir)/emulparams/armelf_nacl.sh \
   $(srcdir)/emulparams/armelf_linux_eabi.sh \
@@ -733,154 +747,154 @@ earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb_nacl "$(tdir_armelfb_nacl)"
+
 earmelfb_nbsd.c: $(srcdir)/emulparams/armelfb_nbsd.sh \
   $(srcdir)/emulparams/armelf_nbsd.sh \
   $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armelfb_nbsd "$(tdir_armelfb_nbsd)"
+
 earmnbsd.c:	$(srcdir)/emulparams/armnbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armnbsd "$(tdir_armnbsd)"
+
 earmnto.c: $(srcdir)/emulparams/armnto.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armnto "$(tdir_armnto)"
+
 earmpe.c: $(srcdir)/emulparams/armpe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} armpe "$(tdir_armpe)"
+
 earmsymbian.c: $(srcdir)/emulparams/armsymbian.sh \
   $(srcdir)/emulparams/armelf.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/armbpabi.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} armsymbian "$(tdir_armelf)"
+
 eavr1.c: $(srcdir)/emulparams/avr1.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr1 "$(tdir_avr2)"
+
 eavr2.c: $(srcdir)/emulparams/avr2.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr2 "$(tdir_avr2)"
+
 eavr25.c: $(srcdir)/emulparams/avr25.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr25 "$(tdir_avr2)"
+
 eavr3.c: $(srcdir)/emulparams/avr3.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr3 "$(tdir_avr2)"
+
 eavr31.c: $(srcdir)/emulparams/avr31.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr31 "$(tdir_avr2)"
+
 eavr35.c: $(srcdir)/emulparams/avr35.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr35 "$(tdir_avr2)"
+
 eavr4.c: $(srcdir)/emulparams/avr4.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr4 "$(tdir_avr2)"
+
 eavr5.c: $(srcdir)/emulparams/avr5.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr5 "$(tdir_avr2)"
+
 eavr51.c: $(srcdir)/emulparams/avr51.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr51 "$(tdir_avr2)"
+
 eavr6.c: $(srcdir)/emulparams/avr6.sh $(srcdir)/emultempl/avrelf.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avr6 "$(tdir_avr2)"
+
 eavrxmega1.c: $(srcdir)/emulparams/avrxmega1.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega1 "$(tdir_avr2)"
+
 eavrxmega2.c: $(srcdir)/emulparams/avrxmega2.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega2 "$(tdir_avr2)"
+
 eavrxmega3.c: $(srcdir)/emulparams/avrxmega3.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega3 "$(tdir_avr2)"
+
 eavrxmega4.c: $(srcdir)/emulparams/avrxmega4.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega4 "$(tdir_avr2)"
+
 eavrxmega5.c: $(srcdir)/emulparams/avrxmega5.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega5 "$(tdir_avr2)"
+
 eavrxmega6.c: $(srcdir)/emulparams/avrxmega6.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega6 "$(tdir_avr2)"
+
 eavrxmega7.c: $(srcdir)/emulparams/avrxmega7.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} avrxmega7 "$(tdir_avr2)"
+
 ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
+
 ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparccoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} coff_sparc "$(tdir_coff_sparc)"
+
 ecrisaout.c: $(srcdir)/emulparams/crisaout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/crisaout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} crisaout "$(tdir_cris)"
+
 ecriself.c: $(srcdir)/emulparams/criself.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} criself "$(tdir_cris)"
+
 ecrislinux.c: $(srcdir)/emulparams/crislinux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} crislinux "$(tdir_cris)"
+
 ed10velf.c: $(srcdir)/emulparams/d10velf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} d10velf "$(tdir_d10v)"
+
 ed30v_e.c: $(srcdir)/emulparams/d30v_e.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} d30v_e "$(tdir_d30v)"
+
 ed30v_o.c: $(srcdir)/emulparams/d30v_o.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} d30v_o "$(tdir_d30v)"
+
 ed30velf.c: $(srcdir)/emulparams/d30velf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} d30velf "$(tdir_d30v)"
+
 edelta68.c: $(srcdir)/emulparams/delta68.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} delta68 "$(tdir_delta68)"
+
 eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/dlx.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_dlx "$(tdir_elf32_dlx)"
+
 eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_i860 "$(tdir_elf32_i860)"
+
 eelf32_i960.c: $(srcdir)/emulparams/elf32_i960.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_i960 "$(tdir_elf32_i960)"
+
 eelf32_sparc.c: $(srcdir)/emulparams/elf32_sparc.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_sparc "$(tdir_elf32_sparc)"
+
 eelf32_sparc_sol2.c: $(srcdir)/emulparams/elf32_sparc_sol2.sh \
   $(srcdir)/emulparams/elf32_sparc.sh \
   $(srcdir)/emulparams/solaris2.sh \
   $(srcdir)/emultempl/solaris2.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_sparc_sol2 "$(tdir_elf32_sparc_sol2)"
+
 eelf32_sparc_vxworks.c: $(srcdir)/emulparams/elf32_sparc_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emulparams/elf32_sparc.sh \
   $(srcdir)/emultempl/vxworks.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_sparc_vxworks "$(tdir_elf32_sparc_vxworks)"
+
 eelf32_spu.c: $(srcdir)/emulparams/elf32_spu.sh $(srcdir)/emultempl/spuelf.em \
   $(srcdir)/emultempl/spu_ovl.@OBJEXT@_c $(srcdir)/emultempl/spu_icache.@OBJEXT@_c \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_spu "$(tdir_elf32_spu)"
+
 $(srcdir)/emultempl/spu_ovl.@OBJEXT@_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
 	if ../gas/as-new --version \
 		| grep 'target.*spu' >/dev/null 2>/dev/null; then \
@@ -898,1026 +912,1025 @@ $(srcdir)/emultempl/spu_icache.@OBJEXT@_c: @MAINT@ $(srcdir)/emultempl/spu_icach
 eelf32_tic6x_be.c: $(srcdir)/emulparams/elf32_tic6x_be.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_be "$(tdir_elf32_tic6x_be)"
+
 eelf32_tic6x_elf_be.c: $(srcdir)/emulparams/elf32_tic6x_elf_be.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_elf_be "$(tdir_elf32_tic6x_elf_be)"
+
 eelf32_tic6x_elf_le.c: $(srcdir)/emulparams/elf32_tic6x_elf_le.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_elf_le "$(tdir_elf32_tic6x_elf_le)"
+
 eelf32_tic6x_le.c: $(srcdir)/emulparams/elf32_tic6x_le.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_le "$(tdir_elf32_tic6x_le)"
+
 eelf32_tic6x_linux_be.c: $(srcdir)/emulparams/elf32_tic6x_linux_be.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_linux_be "$(tdir_elf32_tic6x_linux_be)"
+
 eelf32_tic6x_linux_le.c: $(srcdir)/emulparams/elf32_tic6x_linux_le.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_tic6x_linux_le "$(tdir_elf32_tic6x_linux_le)"
+
 eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \
   $(srcdir)/emulparams/elf32am33lin.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32am33lin "$(tdir_elf32am33lin)"
+
 eelf32b4300.c: $(srcdir)/emulparams/elf32b4300.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32b4300 "$(tdir_elf32b4300)"
+
 eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bfin "$(tdir_elf32bfin)" bfin
+
 eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh \
   $(srcdir)/emulparams/bfin.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bfinfd "$(tdir_elf32bfinfd)" elf32bfinfd
+
 eelf32bmip.c: $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bmip "$(tdir_elf32bmip)"
+
 eelf32bmipn32.c: $(srcdir)/emulparams/elf32bmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/irix.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bmipn32 "$(tdir_elf32bmipn32)"
+
 eelf32bsmip.c: $(srcdir)/emulparams/elf32bsmip.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) $(srcdir)/emultempl/irix.em \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32bsmip "$(tdir_elf32bsmip)"
+
 eelf32btsmip.c: $(srcdir)/emulparams/elf32btsmip.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32btsmip "$(tdir_elf32btsmip)"
+
 eelf32btsmip_fbsd.c: $(srcdir)/emulparams/elf32btsmip_fbsd.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32btsmip_fbsd "$(tdir_elf32btsmip_fbsd)"
+
 eelf32btsmipn32.c: $(srcdir)/emulparams/elf32btsmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32btsmipn32 "$(tdir_elf32btsmipn32)"
+
 eelf32btsmipn32_fbsd.c: $(srcdir)/emulparams/elf32btsmipn32_fbsd.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32btsmipn32_fbsd "$(tdir_elf32btsmipn32_fbsd)"
+
 eelf32cr16.c: $(srcdir)/emulparams/elf32cr16.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/cr16elf.em \
   $(srcdir)/scripttempl/elf32cr16.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32cr16 "$(tdir_elf32crx)"
+
 eelf32cr16c.c: $(srcdir)/emulparams/elf32cr16c.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf32cr16c.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32cr16c "$(tdir_elf32cr16c)"
+
 eelf32crx.c: $(srcdir)/emulparams/elf32crx.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/crxelf.em \
   $(srcdir)/scripttempl/elf32crx.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32crx "$(tdir_elf32crx)"
+
 eelf32ebmip.c: $(srcdir)/emulparams/elf32ebmip.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ebmip "$(tdir_elf32ebmip)"
+
 eelf32ebmipvxworks.c: $(srcdir)/emulparams/elf32ebmipvxworks.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emulparams/vxworks.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ebmipvxworks "$(tdir_elf32ebmipvxworks)"
+
 eelf32elmip.c: $(srcdir)/emulparams/elf32elmip.sh \
   $(srcdir)/emulparams/elf32lmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32elmip "$(tdir_elf32elmip)"
+
 eelf32elmipvxworks.c: $(srcdir)/emulparams/elf32elmipvxworks.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emulparams/vxworks.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32elmipvxworks "$(tdir_elf32elmipvxworks)"
+
 eelf32lr5900.c: $(srcdir)/emulparams/elf32lr5900.sh \
   $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lr5900 "$(tdir_elf32lr5900)"
+
 eelf32lr5900n32.c: $(srcdir)/emulparams/elf32lr5900n32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lr5900n32 "$(tdir_elf32lr5900n32)"
+
 eelf32epiphany.c: $(srcdir)/emulparams/elf32epiphany.sh \
   $(ELF_DEPS) ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32epiphany "$(tdir_epiphany)"
+
 eelf32epiphany_4x4.c: $(srcdir)/emulparams/elf32epiphany_4x4.sh \
   $(srcdir)/emultempl/elf32.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/epiphany_4x4.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32epiphany_4x4 "$(tdir_epiphany_4x4)"
+
 eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
+
 eelf32frv.c: $(srcdir)/emulparams/elf32frv.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32frv "$(tdir_frv)"
+
 eelf32frvfd.c: $(srcdir)/emulparams/elf32frvfd.sh \
   $(srcdir)/emulparams/elf32frv.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32frvfd "$(tdir_frv)"
+
 eelf32i370.c: $(srcdir)/emulparams/elf32i370.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfi370.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32i370 "$(tdir_elf32i370)"
+
 eelf32ip2k.c: $(srcdir)/emulparams/elf32ip2k.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ip2k "$(tdir_ip2k)"
+
 eelf32iq10.c: $(srcdir)/emulparams/elf32iq10.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32iq10 "$(tdir_iq10)"
+
 eelf32iq2000.c: $(srcdir)/emulparams/elf32iq2000.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32iq2000 "$(tdir_iq2000)"
+
 eelf32l4300.c: $(srcdir)/emulparams/elf32l4300.sh \
   $(srcdir)/emulparams/elf32b4300.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32l4300 "$(tdir_elf32l4300)"
+
 eelf32lm32.c: $(srcdir)/emulparams/elf32lm32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lm32 "$(tdir_elf32lm32)"
+
 eelf32lm32fd.c: $(srcdir)/emulparams/elf32lm32fd.sh \
   $(srcdir)/emulparams/elf32lm32.sh $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lm32fd "$(tdir_elf32lm32fd)"
+
 eelf32lmip.c: $(srcdir)/emulparams/elf32lmip.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lmip "$(tdir_elf32lmip)"
+
 eelf32lppc.c: $(srcdir)/emulparams/elf32lppc.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emultempl/ppc32elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lppc "$(tdir_elf32lppc)"
+
 eelf32lppclinux.c: $(srcdir)/emulparams/elf32lppclinux.sh \
   $(srcdir)/emulparams/elf32lppc.sh $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lppclinux "$(tdir_elf32lppclinux)"
+
 eelf32lppcnto.c: $(srcdir)/emulparams/elf32lppcnto.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lppcnto "$(tdir_elf32lppcnto)"
+
 eelf32lppcsim.c: $(srcdir)/emulparams/elf32lppcsim.sh \
   $(srcdir)/emulparams/elf32lppc.sh $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lppcsim "$(tdir_elf32lppcsim)"
+
 eelf32lsmip.c: $(srcdir)/emulparams/elf32lsmip.sh \
   $(srcdir)/emulparams/elf32lmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32lsmip "$(tdir_elf32lsmip)"
+
 eelf32ltsmip.c: $(srcdir)/emulparams/elf32ltsmip.sh \
   $(srcdir)/emulparams/elf32btsmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ltsmip "$(tdir_elf32ltsmip)"
+
 eelf32ltsmip_fbsd.c: $(srcdir)/emulparams/elf32ltsmip_fbsd.sh \
   $(srcdir)/emulparams/elf32btsmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ltsmip_fbsd "$(tdir_elf32ltsmip_fbsd)"
+
 eelf32ltsmipn32.c: $(srcdir)/emulparams/elf32ltsmipn32.sh \
   $(srcdir)/emulparams/elf32btsmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ltsmipn32 "$(tdir_elf32ltsmipn32)"
+
 eelf32ltsmipn32_fbsd.c: $(srcdir)/emulparams/elf32ltsmipn32_fbsd.sh \
   $(srcdir)/emulparams/elf32btsmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ltsmipn32_fbsd "$(tdir_elf32ltsmipn32_fbsd)"
+
 eelf32m32c.c: $(srcdir)/emulparams/elf32m32c.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
+
 eelf32mbel_linux.c: $(srcdir)/emulparams/elf32mbel_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mbel_linux "$(tdir_microblazeel)"
+
 eelf32mb_linux.c: $(srcdir)/emulparams/elf32mb_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mb_linux "$(tdir_microblaze)"
+
 eelf32mcore.c: $(srcdir)/emulparams/elf32mcore.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mcore "$(tdir_mcore)"
+
 eelf32mep.c: $(srcdir)/emulparams/elf32mep.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/mep.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mep "$(tdir_mep)"
+
 eelf32metag.c: $(srcdir)/emulparams/elf32metag.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/metagelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32metag "$(tdir_metag)"
+
 eelf32microblazeel.c: $(srcdir)/emulparams/elf32microblazeel.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfmicroblaze.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32microblazeel "$(tdir_microblazeel)"
+
 eelf32microblaze.c: $(srcdir)/emulparams/elf32microblaze.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfmicroblaze.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32microblaze "$(tdir_microblaze)"
+
 eelf32mipswindiss.c: $(srcdir)/emulparams/elf32mipswindiss.sh $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mipswindiss "$(tdir_elf32mipswindiss)"
+
 eelf32moxie.c: $(srcdir)/emulparams/elf32moxie.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32moxie "$(tdir_moxie)"
+
 eelf32mt.c: $(srcdir)/emulparams/elf32mt.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32mt "$(tdir_mt)"
+
 eelf32or1k.c: $(srcdir)/emulparams/elf32or1k.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32or1k "$(tdir_elf32or1k)"
+
 eelf32or1k_linux.c: $(srcdir)/emulparams/elf32or1k_linux.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32or1k_linux "$(tdir_elf32or1k_linux)"
+
 eelf32ppc.c: $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppc "$(tdir_elf32ppc)"
+
 eelf32ppc_fbsd.c: $(srcdir)/emulparams/elf32ppc_fbsd.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppc_fbsd "$(tdir_elf32ppc_fbsd)"
+
 eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppclinux "$(tdir_elf32ppclinux)"
+
 eelf32ppcnto.c: $(srcdir)/emulparams/elf32ppcnto.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppcnto "$(tdir_elf32ppcnto)"
+
 eelf32ppcsim.c: $(srcdir)/emulparams/elf32ppcsim.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppcsim "$(tdir_elf32ppcsim)"
+
 eelf32ppcvxworks.c: $(srcdir)/emulparams/elf32ppcvxworks.sh \
   $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emulparams/vxworks.sh \
   $(srcdir)/emultempl/vxworks.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppcvxworks "$(tdir_elf32ppcvxworks)"
+
 eelf32ppcwindiss.c: $(srcdir)/emulparams/elf32ppcwindiss.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32ppcwindiss "$(tdir_elf32ppcwindiss)"
+
 eelf32rl78.c: $(srcdir)/emulparams/elf32rl78.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32rl78 "$(tdir_elf32rl78)"
+
 eelf32rx.c: $(srcdir)/emulparams/elf32rx.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32rx "$(tdir_elf32rx)"
+
 eelf32tilegx.c: $(srcdir)/emulparams/elf32tilegx.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32tilegx "$(tdir_tilegx)"
+
 eelf32tilegx_be.c: $(srcdir)/emulparams/elf32tilegx_be.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32tilegx_be "$(tdir_tilegx_be)"
+
 eelf32tilepro.c: $(srcdir)/emulparams/elf32tilepro.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32tilepro "$(tdir_tilepro)"
+
 eelf32vax.c: $(srcdir)/emulparams/elf32vax.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32vax "$(tdir_elf32vax)"
+
 eelf32xc16x.c: $(srcdir)/emulparams/elf32xc16x.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xc16x "$(tdir_xc16x)"
+
 eelf32xc16xl.c: $(srcdir)/emulparams/elf32xc16xl.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xc16xl "$(tdir_xc16xl)"
+
 eelf32xc16xs.c: $(srcdir)/emulparams/elf32xc16xs.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xc16xs "$(tdir_xc16xs)"
+
 eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/xstormy16.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xstormy16 "$(tdir_xstormy16)"
+
 eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/xtensaelf.em $(INCDIR)/xtensa-config.h \
   $(BFDDIR)/elf-bfd.h $(BFDDIR)/libbfd.h $(INCDIR)/elf/xtensa.h \
   $(srcdir)/scripttempl/elfxtensa.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32xtensa "$(tdir_elf32xtensa)"
+
 eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386 "$(tdir_elf_i386)"
+
 eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_be "$(tdir_elf_i386_be)"
+
 eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_chaos "$(tdir_elf_i386_chaos)"
+
 eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \
   $(srcdir)/emulparams/elf_i386.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_fbsd "$(tdir_elf_i386_fbsd)"
+
 eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)"
+
 eelf_i386_nacl.c: $(srcdir)/emulparams/elf_i386_nacl.sh \
   $(srcdir)/emulparams/elf_i386.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_nacl "$(tdir_elf_i386_nacl)"
+
 eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \
   $(srcdir)/emulparams/solaris2.sh \
   $(srcdir)/emultempl/solaris2.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_sol2 "$(tdir_elf_i386_sol2)"
+
 eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_i386_vxworks "$(tdir_elf_i386_vxworks)"
+
 eelf_s390.c: $(srcdir)/emulparams/elf_s390.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_s390 "$(tdir_elf_s390)"
+
 egld960.c: $(srcdir)/emulparams/gld960.sh \
   $(srcdir)/emultempl/gld960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} gld960 "$(tdir_gld960)"
+
 egld960coff.c: $(srcdir)/emulparams/gld960coff.sh \
   $(srcdir)/emultempl/gld960c.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} gld960coff "$(tdir_gld960coff)"
+
 eh8300.c: $(srcdir)/emulparams/h8300.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300 "$(tdir_h8300)"
+
 eh8300elf.c: $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300elf "$(tdir_h8300elf)"
+
 eh8300h.c: $(srcdir)/emulparams/h8300h.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300h "$(tdir_h8300h)"
+
 eh8300helf.c: $(srcdir)/emulparams/h8300helf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300helf "$(tdir_h8300helf)"
+
 eh8300hn.c: $(srcdir)/emulparams/h8300hn.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300hn.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300hn "$(tdir_h8300hn)"
+
 eh8300hnelf.c: $(srcdir)/emulparams/h8300hnelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300hnelf "$(tdir_h8300hnelf)"
+
 eh8300s.c: $(srcdir)/emulparams/h8300s.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300s.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300s "$(tdir_h8300s)"
+
 eh8300self.c: $(srcdir)/emulparams/h8300self.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300self "$(tdir_h8300self)"
+
 eh8300sn.c: $(srcdir)/emulparams/h8300sn.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sn.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sn "$(tdir_h8300sn)"
+
 eh8300snelf.c: $(srcdir)/emulparams/h8300snelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300snelf "$(tdir_h8300snelf)"
+
 eh8300sx.c: $(srcdir)/emulparams/h8300sx.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sx.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sx "$(tdir_h8300sx)"
+
 eh8300sxelf.c: $(srcdir)/emulparams/h8300sxelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sxelf "$(tdir_h8300sxelf)"
+
 eh8300sxn.c: $(srcdir)/emulparams/h8300sxn.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sxn.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sxn "$(tdir_h8300sxn)"
+
 eh8300sxnelf.c: $(srcdir)/emulparams/h8300sxnelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300sxnelf "$(tdir_h8300sxnelf)"
+
 eh8500.c: $(srcdir)/emulparams/h8500.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500 "$(tdir_h8500)"
+
 eh8500b.c: $(srcdir)/emulparams/h8500b.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500b.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500b "$(tdir_h8500b)"
+
 eh8500c.c: $(srcdir)/emulparams/h8500c.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500c.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500c "$(tdir_h8500c)"
+
 eh8500m.c: $(srcdir)/emulparams/h8500m.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500m.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500m "$(tdir_h8500m)"
+
 eh8500s.c: $(srcdir)/emulparams/h8500s.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500s.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} h8500s "$(tdir_h8500s)"
+
 ehp300bsd.c: $(srcdir)/emulparams/hp300bsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hp300bsd "$(tdir_hp300bsd)"
+
 ehp3hpux.c: $(srcdir)/emulparams/hp3hpux.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hp3hpux "$(tdir_hp3hpux)"
+
 ehppaelf.c: $(srcdir)/emulparams/hppaelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
   $(srcdir)/scripttempl/hppaelf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppaelf "$(tdir_hppaelf)"
+
 ehppalinux.c: $(srcdir)/emulparams/hppalinux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppalinux "$(tdir_hppalinux)"
+
 ehppanbsd.c: $(srcdir)/emulparams/hppanbsd.sh \
   $(srcdir)/emulparams/hppaelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppanbsd "$(tdir_hppanbsd)"
+
 ehppaobsd.c: $(srcdir)/emulparams/hppaobsd.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppaobsd "$(tdir_hppaobsd)"
+
 ei386aout.c: $(srcdir)/emulparams/i386aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386aout "$(tdir_i386aout)"
+
 ei386beos.c: $(srcdir)/emulparams/i386beos.sh \
   $(srcdir)/emultempl/beos.em $(srcdir)/scripttempl/i386beos.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386beos "$(tdir_i386beos)"
+
 ei386bsd.c: $(srcdir)/emulparams/i386bsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386bsd "$(tdir_i386bsd)"
+
 ei386coff.c: $(srcdir)/emulparams/i386coff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386coff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386coff "$(tdir_i386coff)"
+
 ei386go32.c: $(srcdir)/emulparams/i386go32.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386go32.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386go32 "$(tdir_i386go32)"
+
 ei386linux.c: $(srcdir)/emulparams/i386linux.sh \
   $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386linux "$(tdir_i386linux)"
+
 ei386lynx.c: $(srcdir)/emulparams/i386lynx.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386lynx "$(tdir_i386lynx)"
+
 ei386mach.c: $(srcdir)/emulparams/i386mach.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386mach "$(tdir_i386mach)"
+
 ei386moss.c: $(srcdir)/emulparams/i386moss.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386moss "$(tdir_i386moss)"
+
 ei386msdos.c: $(srcdir)/emulparams/i386msdos.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386msdos.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386msdos "$(tdir_i386msdos)"
+
 ei386nbsd.c:	$(srcdir)/emulparams/i386nbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386nbsd "$(tdir_i386nbsd)"
+
 ei386nto.c:	$(srcdir)/emulparams/i386nto.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386nto "$(tdir_i386nto)"
+
 ei386nw.c:	$(srcdir)/emulparams/i386nw.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386nw "$(tdir_i386nw)"
+
 ei386pe.c: $(srcdir)/emulparams/i386pe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386pe "$(tdir_i386pe)"
+
 ei386pe_posix.c: $(srcdir)/emulparams/i386pe_posix.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386pe_posix "$(tdir_i386pe_posix)"
+
 ei386pep.c: $(srcdir)/emulparams/i386pep.sh \
   $(srcdir)/emultempl/pep.em $(srcdir)/scripttempl/pep.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386pep "$(tdir_i386pe)"
+
 elnk960.c: $(srcdir)/emulparams/lnk960.sh \
   $(srcdir)/emultempl/lnk960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} lnk960 "$(tdir_lnk960)"
+
 em32relf.c: $(srcdir)/emulparams/m32relf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m32relf "$(tdir_m32r)"
+
 em32relf_linux.c: $(srcdir)/emulparams/m32relf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m32relf_linux "$(tdir_m32relf_linux)"
+
 em32rlelf.c: $(srcdir)/emulparams/m32rlelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m32rlelf "$(tdir_m32rlelf)"
+
 em32rlelf_linux.c: $(srcdir)/emulparams/m32rlelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m32rlelf_linux "$(tdir_m32rlelf_linux)"
+
 em68hc11elf.c: $(srcdir)/emulparams/m68hc11elf.sh \
   $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfm68hc11.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68hc11elf "$(tdir_m68hc11)"
+
 em68hc11elfb.c: $(srcdir)/emulparams/m68hc11elfb.sh \
   $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfm68hc11.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68hc11elfb "$(tdir_m68hc11b)"
+
 em68hc12elf.c: $(srcdir)/emulparams/m68hc12elf.sh \
   $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfm68hc12.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68hc12elf "$(tdir_m68hc12)"
+
 em68hc12elfb.c: $(srcdir)/emulparams/m68hc12elfb.sh \
   $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfm68hc12.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68hc12elfb "$(tdir_m68hc12b)"
+
 em68k4knbsd.c:	$(srcdir)/emulparams/m68k4knbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68k4knbsd "$(tdir_m68k4knbsd)"
+
 em68kaout.c: $(srcdir)/emulparams/m68kaout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kaout "$(tdir_m68kaout)"
+
 em68kaux.c: $(srcdir)/emulparams/m68kaux.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m68kaux.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kaux "$(tdir_m68kaux)"
+
 em68kcoff.c: $(srcdir)/emulparams/m68kcoff.sh \
   $(srcdir)/emultempl/m68kcoff.em $(srcdir)/scripttempl/m68kcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kcoff "$(tdir_m68kcoff)"
+
 em68kelf.c: $(srcdir)/emulparams/m68kelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/m68kelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kelf "$(tdir_m68kelf)"
+
 em68kelfnbsd.c: $(srcdir)/emulparams/m68kelfnbsd.sh \
   $(srcdir)/emulparams/m68kelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/m68kelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kelfnbsd "$(tdir_m68kelfnbsd)"
+
 em68klinux.c: $(srcdir)/emulparams/m68klinux.sh \
   $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68klinux "$(tdir_m68klinux)"
+
 em68knbsd.c:	$(srcdir)/emulparams/m68knbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68knbsd "$(tdir_m68knbsd)"
+
 em68kpsos.c:	$(srcdir)/emulparams/m68kpsos.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/psos.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m68kpsos "$(tdir_m68kpsos)"
+
 em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} m88kbcs "$(tdir_m88kbcs)"
+
 emcorepe.c: $(srcdir)/emulparams/mcorepe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} mcorepe "$(tdir_mcorepe)"
+
 emn10200.c: $(srcdir)/emulparams/mn10200.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} mn10200 "$(tdir_mn10200)"
+
 emn10300.c: $(srcdir)/emulparams/mn10300.sh \
   $(srcdir)/emulparams/mn10200.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} mn10300 "$(tdir_mn10300)"
+
 emsp430.c: $(srcdir)/emulparams/msp430all.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} msp430 "$(tdir_msp430)" msp430all
+
 emsp430X.c: $(srcdir)/emulparams/msp430all.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} msp430X "$(tdir_msp430X)" msp430all
+
 ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32elf "$(tdir_nds32)"
+
 ends32elf16m.c: $(srcdir)/emulparams/nds32elf16m.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32elf16m "$(tdir_nds32)"
+
 ends32belf.c: $(srcdir)/emulparams/nds32belf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32belf "$(tdir_nds32belf)"
+
 ends32belf16m.c: $(srcdir)/emulparams/nds32belf16m.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32belf16m "$(tdir_nds32belf)"
+
 ends32elf_linux.c: $(srcdir)/emulparams/nds32elf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32elf_linux "$(tdir_nds32elf_linux)"
+
 ends32belf_linux.c: $(srcdir)/emulparams/nds32belf_linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nds32belf_linux "$(tdir_nds32belf_linux)"
+
 enews.c: $(srcdir)/emulparams/news.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} news "$(tdir_news)"
+
 enios2elf.c: $(srcdir)/emulparams/nios2elf.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/nios2elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nios2elf "$(tdir_nios2elf)"
+
 enios2linux.c: $(srcdir)/emulparams/nios2linux.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/nios2elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} nios2linux "$(tdir_nios2linux)"
+
 ens32knbsd.c:	$(srcdir)/emulparams/ns32knbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/netbsd.em \
   $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ns32knbsd "$(tdir_ns32knbsd)"
+
 eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64elf "$(tdir_aarch64elf)"
+
 eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64elf32 "$(tdir_aarch64elf32)"
+
 eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64elfb "$(tdir_aarch64elfb)"
+
 eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64elf32b "$(tdir_aarch64elf32b)"
+
 eaarch64linux.c: $(srcdir)/emulparams/aarch64linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64linux "$(tdir_aarch64linux)"
+
 eaarch64linuxb.c: $(srcdir)/emulparams/aarch64linuxb.sh $(srcdir)/emulparams/aarch64linux.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64linuxb "$(tdir_aarch64linuxb)"
+
 eaarch64linux32.c: $(srcdir)/emulparams/aarch64linux32.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64linux32 "$(tdir_aarch64linux32)"
+
 eaarch64linux32b.c: $(srcdir)/emulparams/aarch64linux32b.sh $(srcdir)/emulparams/aarch64linux32.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} aarch64linux32b "$(tdir_aarch64linux32b)"
+
 epc532macha.c: $(srcdir)/emulparams/pc532macha.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} pc532macha "$(tdir_pc532macha)"
+
 epdp11.c: $(srcdir)/emulparams/pdp11.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} pdp11 "$(tdir_pdp11)"
+
 epjelf.c: $(srcdir)/emulparams/pjelf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} pjelf "$(tdir_pjelf)"
+
 epjlelf.c: $(srcdir)/emulparams/pjlelf.sh $(srcdir)/emulparams/pjelf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} pjlelf "$(tdir_pjlelf)"
+
 eppclynx.c: $(srcdir)/emulparams/ppclynx.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ppclynx "$(tdir_ppclynx)"
+
 eppcmacos.c:	$(srcdir)/emulparams/ppcmacos.sh \
   $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ppcmacos "$(tdir_ppcmacos)"
+
 eppcnw.c:	$(srcdir)/emulparams/ppcnw.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ppcnw "$(tdir_ppcnw)"
+
 eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/ppcpe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} ppcpe "$(tdir_ppcpe)"
+
 eriscix.c: $(srcdir)/emulparams/riscix.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} riscix "$(tdir_riscix)"
+
 escore3_elf.c: $(srcdir)/emulparams/scoreelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} score3_elf "$(tdir_score3_elf)" scoreelf
+
 escore7_elf.c: $(srcdir)/emulparams/scoreelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} score7_elf "$(tdir_score7_elf)" scoreelf
+
 esh.c: $(srcdir)/emulparams/sh.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sh "$(tdir_sh)"
+
 eshelf.c: $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf "$(tdir_shelf)"
+
 eshelf32.c: $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf32 "$(tdir_shelf32)"
+
 eshelf32_linux.c: $(srcdir)/emulparams/shelf32_linux.sh \
   $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf32_linux "$(tdir_shelf32_linux)"
+
 eshelf32_nbsd.c: $(srcdir)/emulparams/shelf32_nbsd.sh \
   $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf32_nbsd "$(tdir_shelf32_nbsd)"
+
 eshelf_fd.c: $(srcdir)/emulparams/shelf_fd.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_fd "$(tdir_shelf_fd)"
+
 eshelf_linux.c: $(srcdir)/emulparams/shelf_linux.sh \
   $(srcdir)/emulparams/shlelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_linux "$(tdir_shelf_linux)"
+
 eshelf_nbsd.c: $(srcdir)/emulparams/shelf_nbsd.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_nbsd "$(tdir_shelf_nbsd)"
+
 eshelf_nto.c: $(srcdir)/emulparams/shelf_nto.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_nto "$(tdir_shelf_nto)"
+
 eshelf_uclinux.c: $(srcdir)/emulparams/shelf_uclinux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_uclinux "$(tdir_shelf_uclinux)"
+
 eshelf_vxworks.c: $(srcdir)/emulparams/shelf_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc \
   $(srcdir)/emultempl/vxworks.em ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf_vxworks "$(tdir_shelf_vxworks)"
+
 eshl.c: $(srcdir)/emulparams/shl.sh \
   $(srcdir)/emulparams/sh.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shl "$(tdir_shl)"
+
 eshlelf.c: $(srcdir)/emulparams/shlelf.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf "$(tdir_shlelf)"
+
 eshlelf32.c: $(srcdir)/emulparams/shlelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h $(srcdir)/emulparams/shelf32.sh \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf32 "$(tdir_shlelf32)"
+
 eshlelf32_linux.c: $(srcdir)/emulparams/shlelf32_linux.sh \
   $(srcdir)/emulparams/shelf32_linux.sh $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf32_linux "$(tdir_shlelf32_linux)"
+
 eshlelf32_nbsd.c: $(srcdir)/emulparams/shlelf32_nbsd.sh \
   $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
   $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
   $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf32_nbsd "$(tdir_shlelf32_nbsd)"
+
 eshlelf_fd.c: $(srcdir)/emulparams/shlelf_fd.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_fd "$(tdir_shlelf_fd)"
+
 eshlelf_linux.c: $(srcdir)/emulparams/shlelf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_linux "$(tdir_shlelf_linux)"
+
 eshlelf_nbsd.c: $(srcdir)/emulparams/shlelf_nbsd.sh \
   $(srcdir)/emulparams/shelf_nbsd.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_nbsd "$(tdir_shlelf_nbsd)"
+
 eshlelf_nto.c: $(srcdir)/emulparams/shlelf_nto.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_nto "$(tdir_shlelf_nto)"
+
 eshlelf_vxworks.c: $(srcdir)/emulparams/shlelf_vxworks.sh \
   $(srcdir)/emulparams/shelf_vxworks.sh $(srcdir)/emulparams/vxworks.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/vxworks.em \
   ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf_vxworks "$(tdir_shlelf_vxworks)"
+
 eshlsymbian.c: $(srcdir)/emulparams/shlsymbian.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf32sh-symbian.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlsymbian "$(tdir_shlelf)"
+
 eshpe.c: $(srcdir)/emulparams/shpe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shpe "$(tdir_shl)"
+
 esparcaout.c: $(srcdir)/emulparams/sparcaout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sparcaout "$(tdir_sparcaout)"
+
 esparclinux.c: $(srcdir)/emulparams/sparclinux.sh \
   $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sparclinux "$(tdir_sparclinux)"
+
 esparcnbsd.c:	$(srcdir)/emulparams/sparcnbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sparcnbsd "$(tdir_sparcnbsd)"
+
 est2000.c: $(srcdir)/emulparams/st2000.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/st2000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} st2000 "$(tdir_st2000)"
+
 esun3.c: $(srcdir)/emulparams/sun3.sh \
   $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sun3 "$(tdir_sun3)"
+
 esun4.c: $(srcdir)/emulparams/sun4.sh \
   $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} sun4 "$(tdir_sun4)"
+
 etic30aout.c: $(srcdir)/emulparams/tic30aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic30aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic30aout "$(tdir_tic30aout)"
+
 etic30coff.c: $(srcdir)/emulparams/tic30coff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic30coff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic30coff "$(tdir_tic30coff)"
+
 etic3xcoff.c: $(srcdir)/emulparams/tic3xcoff.sh \
   $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic3xcoff "$(tdir_tic4xcoff)"
+
 etic3xcoff_onchip.c: $(srcdir)/emulparams/tic3xcoff_onchip.sh \
   $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic3xcoff_onchip "$(tdir_tic4xcoff)"
+
 etic4xcoff.c: $(srcdir)/emulparams/tic4xcoff.sh \
   $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic4xcoff "$(tdir_tic4xcoff)"
+
 etic54xcoff.c: $(srcdir)/emulparams/tic54xcoff.sh \
   $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic54xcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic54xcoff "$(tdir_tic54xcoff)"
+
 etic80coff.c: $(srcdir)/emulparams/tic80coff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic80coff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} tic80coff "$(tdir_tic80coff)"
+
 ev850.c: $(srcdir)/emulparams/v850.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/v850.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} v850 "$(tdir_v850)"
+
 ev850_rh850.c: $(srcdir)/emulparams/v850_rh850.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/v850_rh850.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} v850_rh850 "$(tdir_v850_rh850)"
+
 evanilla.c: $(srcdir)/emulparams/vanilla.sh \
   $(srcdir)/emultempl/vanilla.em $(srcdir)/scripttempl/vanilla.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} vanilla "$(tdir_vanilla)"
+
 evax.c: $(srcdir)/emulparams/vax.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} vax "$(tdir_vax)"
+
 evaxnbsd.c: $(srcdir)/emulparams/vaxnbsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} vaxnbsd "$(tdir_vaxnbsd)"
+
 evsta.c: $(srcdir)/emulparams/vsta.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} vsta "$(tdir_vsta)"
+
 ew65.c: $(srcdir)/emulparams/w65.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/w65.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} w65 "$(tdir_w65)"
+
 exgateelf.c: $(srcdir)/emulparams/xgateelf.sh \
   $(srcdir)/emultempl/generic.em $(ELF_DEPS) \
   $(srcdir)/scripttempl/elfxgate.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} xgateelf "$(tdir_xgate)"
+
 ez80.c: $(srcdir)/emulparams/z80.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/z80.em \
   $(srcdir)/scripttempl/z80.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} z80 "$(tdir_z80)"
+
 ez8001.c: $(srcdir)/emulparams/z8001.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} z8001 "$(tdir_z8001)"
+
 ez8002.c: $(srcdir)/emulparams/z8002.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} z8002 "$(tdir_z8002)"
 
 eelf32_x86_64.c: $(srcdir)/emulparams/elf32_x86_64.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_x86_64 "$(tdir_elf32_x86_64)"
+
 eelf32_x86_64_nacl.c: $(srcdir)/emulparams/elf32_x86_64_nacl.sh \
   $(srcdir)/emulparams/elf32_x86_64.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32_x86_64_nacl "$(tdir_elf32_x86_64_nacl)"
+
 eelf64_aix.c: $(srcdir)/emulparams/elf64_aix.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_aix "$(tdir_elf64_aix)"
+
 eelf64_ia64.c: $(srcdir)/emulparams/elf64_ia64.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/ia64elf.em \
   $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_ia64 "$(tdir_elf64_ia64)"
+
 eelf64_ia64_fbsd.c: $(srcdir)/emulparams/elf64_ia64_fbsd.sh \
   $(srcdir)/emulparams/elf64_ia64.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/ia64elf.em \
   $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_ia64_fbsd "$(tdir_elf64_ia64_fbsd)"
+
 eelf64_ia64_vms.c: $(srcdir)/emulparams/elf64_ia64_vms.sh \
   $(srcdir)/emultempl/vms.em $(srcdir)/emultempl/elf-generic.em \
   $(srcdir)/scripttempl/ia64vms.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_ia64_vms "$(tdir_elf64_ia64_vms)"
+
 eelf64_s390.c: $(srcdir)/emulparams/elf64_s390.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_s390 "$(tdir_elf64_s390)"
+
 eelf64_sparc.c: $(srcdir)/emulparams/elf64_sparc.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_sparc "$(tdir_elf64_sparc)"
+
 eelf64_sparc_fbsd.c: $(srcdir)/emulparams/elf64_sparc_fbsd.sh \
   $(srcdir)/emulparams/elf64_sparc.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_sparc_fbsd "$(tdir_elf64_sparc_fbsd)"
+
 eelf64_sparc_sol2.c: $(srcdir)/emulparams/elf64_sparc_sol2.sh \
   $(srcdir)/emulparams/elf64_sparc.sh \
   $(srcdir)/emulparams/solaris2.sh \
   $(srcdir)/emultempl/solaris2.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64_sparc_sol2 "$(tdir_elf64_sparc_sol2)"
+
 eelf64alpha.c: $(srcdir)/emulparams/elf64alpha.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64alpha "$(tdir_elf64alpha)"
+
 eelf64alpha_fbsd.c: $(srcdir)/emulparams/elf64alpha_fbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64alpha_fbsd "$(tdir_elf64alpha_fbsd)"
+
 eelf64alpha_nbsd.c: $(srcdir)/emulparams/elf64alpha_nbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64alpha_nbsd "$(tdir_elf64alpha_nbsd)"
+
 eelf64bmip.c: $(srcdir)/emulparams/elf64bmip.sh \
   $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/irix.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64bmip "$(tdir_elf64bmip)"
+
 eelf64btsmip.c: $(srcdir)/emulparams/elf64btsmip.sh \
   $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64btsmip "$(tdir_elf64btsmip)"
+
 eelf64btsmip_fbsd.c: $(srcdir)/emulparams/elf64btsmip_fbsd.sh \
   $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64btsmip_fbsd "$(tdir_elf64btsmip_fbsd)"
+
 eelf64hppa.c: $(srcdir)/emulparams/elf64hppa.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf64hppa.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64hppa "$(tdir_elf64hppa)"
+
 eelf64lppc.c: $(srcdir)/emulparams/elf64lppc.sh \
   $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64lppc "$(tdir_elf64lppc)"
+
 eelf64ltsmip.c: $(srcdir)/emulparams/elf64ltsmip.sh \
   $(srcdir)/emulparams/elf64btsmip.sh $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ltsmip "$(tdir_elf64ltsmip)"
+
 eelf64ltsmip_fbsd.c: $(srcdir)/emulparams/elf64ltsmip_fbsd.sh \
   $(srcdir)/emulparams/elf64btsmip_fbsd.sh $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ltsmip_fbsd "$(tdir_elf64ltsmip_fbsd)"
+
 eelf64mmix.c: $(srcdir)/emulparams/elf64mmix.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mmix-elfnmmo.em \
   $(srcdir)/emultempl/mmixelf.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64mmix "$(tdir_elf64mmix)"
+
 eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ppc "$(tdir_elf64ppc)"
+
 eelf64ppc_fbsd.c: $(srcdir)/emulparams/elf64ppc_fbsd.sh \
   $(srcdir)/emultempl/ppc64elf.em ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ppc_fbsd "$(tdir_elf64ppc_fbsd)"
+
 eelf64rdos.c: $(srcdir)/emulparams/elf64rdos.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64rdos "$(tdir_elf64rdos)"
+
 eelf64tilegx.c: $(srcdir)/emulparams/elf64tilegx.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64tilegx "$(tdir_tilegx)"
+
 eelf64tilegx_be.c: $(srcdir)/emulparams/elf64tilegx_be.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64tilegx_be "$(tdir_tilegx_be)"
+
 eelf_l1om.c: $(srcdir)/emulparams/elf_l1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_l1om "$(tdir_elf_l1om)"
+
 eelf_l1om_fbsd.c: $(srcdir)/emulparams/elf_l1om_fbsd.sh \
   $(srcdir)/emulparams/elf_l1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_l1om_fbsd "$(tdir_elf_l1om_fbsd)"
+
 eelf_k1om.c: $(srcdir)/emulparams/elf_k1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_k1om "$(tdir_elf_k1om)"
+
 eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \
   $(srcdir)/emulparams/elf_k1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_k1om_fbsd "$(tdir_elf_k1om_fbsd)"
+
 eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_x86_64 "$(tdir_elf_x86_64)"
+
 eelf_x86_64_fbsd.c: $(srcdir)/emulparams/elf_x86_64_fbsd.sh \
   $(srcdir)/emulparams/elf_x86_64.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_x86_64_fbsd "$(tdir_elf_x86_64_fbsd)"
+
 eelf_x86_64_nacl.c: $(srcdir)/emulparams/elf_x86_64_nacl.sh \
   $(srcdir)/emulparams/elf_x86_64.sh \
   $(srcdir)/emulparams/elf_nacl.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_x86_64_nacl "$(tdir_elf_x86_64_nacl)"
+
 eelf_x86_64_sol2.c: $(srcdir)/emulparams/elf_x86_64_sol2.sh \
   $(srcdir)/emulparams/elf_x86_64.sh \
   $(srcdir)/emulparams/solaris2.sh \
   $(srcdir)/emultempl/solaris2.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf_x86_64_sol2 "$(tdir_elf_x86_64_sol2)"
+
 ehppa64linux.c: $(srcdir)/emulparams/hppa64linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} hppa64linux "$(tdir_hppa64linux)"
+
 emmo.c: $(srcdir)/emulparams/mmo.sh $(srcdir)/emultempl/mmix-elfnmmo.em \
   $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em \
   $(srcdir)/emultempl/mmo.em $(srcdir)/scripttempl/DWARF.sc \
   $(srcdir)/scripttempl/mmo.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} mmo "$(tdir_mmo)"
+
 eshelf64.c: $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf64 "$(tdir_shelf64)"
+
 eshelf64_nbsd.c: $(srcdir)/emulparams/shelf64_nbsd.sh \
   $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shelf64_nbsd "$(tdir_shelf64_nbsd)"
+
 eshlelf64.c: $(srcdir)/emulparams/shlelf64.sh \
   $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf64 "$(tdir_shlelf64)"
+
 eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \
   $(srcdir)/emulparams/shelf64_nbsd.sh \
   $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} shlelf64_nbsd "$(tdir_shlelf64_nbsd)"
+
 
 # We need this for automake to use YLWRAP.
 EXTRA_ld_new_SOURCES = deffilep.y ldlex.l

brgds, H-P

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-05-20 16:20       ` Hans-Peter Nilsson
@ 2014-05-22  8:02         ` Alan Modra
  2014-05-28 13:16         ` Hans-Peter Nilsson
  1 sibling, 0 replies; 19+ messages in thread
From: Alan Modra @ 2014-05-22  8:02 UTC (permalink / raw)
  To: Hans-Peter Nilsson; +Cc: binutils

On Tue, May 20, 2014 at 06:19:51PM +0200, Hans-Peter Nilsson wrote:
> > From: Alan Modra <amodra@gmail.com>
> > Date: Tue, 20 May 2014 14:35:51 +0200
> 
> > I was more concerned with something more basic.
> > 
> > Which makes support pattern rules like "e%.c: "?  Does BSD make?
> 
> Uh, eh... ah.  Right: *that's* not portable.  Ugh.  But no
> worries, here's a portable (*cough*) variant using a well-known
> construct in addition to the recursive variable expansion.

Let's first see if Nick and other interested parties are OK with
requiring GNU make.  For the record, I'm OK with the idea.  After all,
you need GNU make to build gcc these days.

If we do go with GNU make, then Makefile.tpl should be adjusted to
complain if some other make is used when building ld.

-- 
Alan Modra
Australia Development Lab, IBM

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-05-20 16:20       ` Hans-Peter Nilsson
  2014-05-22  8:02         ` Alan Modra
@ 2014-05-28 13:16         ` Hans-Peter Nilsson
  2014-05-28 14:15           ` Alan Modra
  1 sibling, 1 reply; 19+ messages in thread
From: Hans-Peter Nilsson @ 2014-05-28 13:16 UTC (permalink / raw)
  To: binutils

Ping.  I'd rather *not* tie this fix to moving to require GNU
make, please.

> From: Hans-Peter Nilsson <hp@axis.com>
> Date: Tue, 20 May 2014 18:19:51 +0200

> > From: Alan Modra <amodra@gmail.com>
> > Date: Tue, 20 May 2014 14:35:51 +0200
> 
> > I was more concerned with something more basic.
> >
> > Which makes support pattern rules like "e%.c: "?  Does BSD make?
> 
> Uh, eh... ah.  Right: *that's* not portable.  Ugh.  But no
> worries, here's a portable (*cough*) variant using a well-known
> construct in addition to the recursive variable expansion.
> Testing in progress; it worked for cris-elf.
> 
> Ok to commit given test-results as before?
> 
>         * Makefile.am: Change all rules with ${GENSCRIPTS}
>         invocations to be just dependencies.
>         ($(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES))
>         (run-genscripts): New rules.
>         * Makefile.in: Regenerate.
> 
> diff --git a/ld/Makefile.am b/ld/Makefile.am
> index 2ad6a45..3ea8fbd 100644
> --- a/ld/Makefile.am
> +++ b/ld/Makefile.am
> @@ -638,94 +638,108 @@ ELF_GEN_DEPS = $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em
> 
>  @TDIRS@
> 
> +# We can't use pattern rules as we don't want to depend on GNU
> +# make, or else these rules could have been expressed in one
> +# two-liner: 'e%.c:' and '     ${GENSCRIPTS} $* "$(tdir_$*)"'.
> +# (The recursive variable expansion is portable.)
> +
> +run-genscripts:
> +       ${GENSCRIPTS} $(script_target) "$($(script_tdirname))"
> +
> +.PHONY: run-genscripts
> +
> +$(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES):
> +       base=`echo $@ | sed -e 's,e\(.*\).c,\1,'`; \
> +       $(MAKE) run-genscripts "script_target=$$base" "script_tdirname=tdir_$$base"
> +
>  eaix5ppc.c: $(srcdir)/emulparams/aix5ppc.sh \
>    $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aix5ppc "$(tdir_aixppc)"
> +
>  eaix5rs6.c: $(srcdir)/emulparams/aix5rs6.sh \
>    $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aix5rs6 "$(tdir_aixrs6)"
> +
>  eaixppc.c: $(srcdir)/emulparams/aixppc.sh \
>    $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aixppc "$(tdir_aixppc)"
> +
>  eaixrs6.c: $(srcdir)/emulparams/aixrs6.sh \
>    $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aixrs6 "$(tdir_aixrs6)"
> +
>  ealpha.c: $(srcdir)/emulparams/alpha.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/alpha.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} alpha "$(tdir_alpha)"
> +
>  ealphavms.c: $(srcdir)/emulparams/alphavms.sh \
>    $(srcdir)/emultempl/vms.em $(srcdir)/scripttempl/alphavms.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} alphavms "$(tdir_alphavms)"
> +
>  earcelf.c: $(srcdir)/emulparams/arcelf.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} arcelf "$(tdir_arcelf)"
> +
>  earm_epoc_pe.c: $(srcdir)/emulparams/arm_epoc_pe.sh \
>    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/epocpe.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} arm_epoc_pe "$(tdir_armpe)"
> +
>  earm_wince_pe.c: $(srcdir)/emulparams/arm_wince_pe.sh \
>    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} arm_wince_pe "$(tdir_armpe)"
> +
>  earmaoutb.c:   $(srcdir)/emulparams/armaoutb.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armaoutb "$(tdir_armaoutb)"
> +
>  earmaoutl.c:   $(srcdir)/emulparams/armaoutl.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armaoutl "$(tdir_armaoutl)"
> +
>  earmcoff.c:    $(srcdir)/emulparams/armcoff.sh \
>    $(srcdir)/emultempl/armcoff.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armcoff "$(tdir_armcoff)"
> +
>  earmelf.c: $(srcdir)/emulparams/armelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelf "$(tdir_armelf)"
> +
>  earmelf_fbsd.c: $(srcdir)/emulparams/armelf_fbsd.sh \
>    $(srcdir)/emulparams/armelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelf_fbsd "$(tdir_armelf_fbsd)"
> +
>  earmelf_linux.c: $(srcdir)/emulparams/armelf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelf_linux "$(tdir_armelf_linux)"
> +
>  earmelf_linux_eabi.c: $(srcdir)/emulparams/armelf_linux_eabi.sh \
>    $(srcdir)/emulparams/armelf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelf_linux_eabi "$(tdir_armelf_linux_abi)"
> +
>  earmelf_nacl.c: $(srcdir)/emulparams/armelf_nacl.sh \
>    $(srcdir)/emulparams/armelf_linux_eabi.sh \
>    $(srcdir)/emulparams/armelf_linux.sh \
>    $(srcdir)/emulparams/elf_nacl.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelf_nacl "$(tdir_armelf_nacl)"
> +
>  earmelf_nbsd.c: $(srcdir)/emulparams/armelf_nbsd.sh \
>    $(srcdir)/emulparams/armelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelf_nbsd "$(tdir_armelf_nbsd)"
> +
>  earmelf_vxworks.c: $(srcdir)/emulparams/armelf_vxworks.sh \
>    $(srcdir)/emulparams/vxworks.sh $(srcdir)/emulparams/armelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/vxworks.em \
>    $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/elf.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelf_vxworks "$(tdir_armelf)"
> +
>  earmelfb.c: $(srcdir)/emulparams/armelfb.sh $(srcdir)/emulparams/armelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelfb "$(tdir_armelfb)"
> +
>  earmelfb_linux.c: $(srcdir)/emulparams/armelfb_linux.sh \
>    $(srcdir)/emulparams/armelf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelfb_linux "$(tdir_armelfb_linux)"
> +
>  earmelfb_linux_eabi.c: $(srcdir)/emulparams/armelfb_linux_eabi.sh \
>    $(srcdir)/emulparams/armelf_linux_eabi.sh \
>    $(srcdir)/emulparams/armelf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelfb_linux_eabi "$(tdir_armelfb_linux_abi)"
> +
>  earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
>    $(srcdir)/emulparams/armelf_nacl.sh \
>    $(srcdir)/emulparams/armelf_linux_eabi.sh \
> @@ -733,154 +747,154 @@ earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
>    $(srcdir)/emulparams/elf_nacl.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelfb_nacl "$(tdir_armelfb_nacl)"
> +
>  earmelfb_nbsd.c: $(srcdir)/emulparams/armelfb_nbsd.sh \
>    $(srcdir)/emulparams/armelf_nbsd.sh \
>    $(srcdir)/emulparams/armelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armelfb_nbsd "$(tdir_armelfb_nbsd)"
> +
>  earmnbsd.c:    $(srcdir)/emulparams/armnbsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armnbsd "$(tdir_armnbsd)"
> +
>  earmnto.c: $(srcdir)/emulparams/armnto.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armnto "$(tdir_armnto)"
> +
>  earmpe.c: $(srcdir)/emulparams/armpe.sh \
>    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armpe "$(tdir_armpe)"
> +
>  earmsymbian.c: $(srcdir)/emulparams/armsymbian.sh \
>    $(srcdir)/emulparams/armelf.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/armbpabi.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} armsymbian "$(tdir_armelf)"
> +
>  eavr1.c: $(srcdir)/emulparams/avr1.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr1 "$(tdir_avr2)"
> +
>  eavr2.c: $(srcdir)/emulparams/avr2.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr2 "$(tdir_avr2)"
> +
>  eavr25.c: $(srcdir)/emulparams/avr25.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr25 "$(tdir_avr2)"
> +
>  eavr3.c: $(srcdir)/emulparams/avr3.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr3 "$(tdir_avr2)"
> +
>  eavr31.c: $(srcdir)/emulparams/avr31.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr31 "$(tdir_avr2)"
> +
>  eavr35.c: $(srcdir)/emulparams/avr35.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr35 "$(tdir_avr2)"
> +
>  eavr4.c: $(srcdir)/emulparams/avr4.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr4 "$(tdir_avr2)"
> +
>  eavr5.c: $(srcdir)/emulparams/avr5.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr5 "$(tdir_avr2)"
> +
>  eavr51.c: $(srcdir)/emulparams/avr51.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr51 "$(tdir_avr2)"
> +
>  eavr6.c: $(srcdir)/emulparams/avr6.sh $(srcdir)/emultempl/avrelf.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avr6 "$(tdir_avr2)"
> +
>  eavrxmega1.c: $(srcdir)/emulparams/avrxmega1.sh \
>    $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avrxmega1 "$(tdir_avr2)"
> +
>  eavrxmega2.c: $(srcdir)/emulparams/avrxmega2.sh \
>    $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avrxmega2 "$(tdir_avr2)"
> +
>  eavrxmega3.c: $(srcdir)/emulparams/avrxmega3.sh \
>    $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avrxmega3 "$(tdir_avr2)"
> +
>  eavrxmega4.c: $(srcdir)/emulparams/avrxmega4.sh \
>    $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avrxmega4 "$(tdir_avr2)"
> +
>  eavrxmega5.c: $(srcdir)/emulparams/avrxmega5.sh \
>    $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avrxmega5 "$(tdir_avr2)"
> +
>  eavrxmega6.c: $(srcdir)/emulparams/avrxmega6.sh \
>    $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avrxmega6 "$(tdir_avr2)"
> +
>  eavrxmega7.c: $(srcdir)/emulparams/avrxmega7.sh \
>    $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} avrxmega7 "$(tdir_avr2)"
> +
>  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
> +
>  ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparccoff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} coff_sparc "$(tdir_coff_sparc)"
> +
>  ecrisaout.c: $(srcdir)/emulparams/crisaout.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/crisaout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} crisaout "$(tdir_cris)"
> +
>  ecriself.c: $(srcdir)/emulparams/criself.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} criself "$(tdir_cris)"
> +
>  ecrislinux.c: $(srcdir)/emulparams/crislinux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} crislinux "$(tdir_cris)"
> +
>  ed10velf.c: $(srcdir)/emulparams/d10velf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} d10velf "$(tdir_d10v)"
> +
>  ed30v_e.c: $(srcdir)/emulparams/d30v_e.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} d30v_e "$(tdir_d30v)"
> +
>  ed30v_o.c: $(srcdir)/emulparams/d30v_o.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} d30v_o "$(tdir_d30v)"
> +
>  ed30velf.c: $(srcdir)/emulparams/d30velf.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} d30velf "$(tdir_d30v)"
> +
>  edelta68.c: $(srcdir)/emulparams/delta68.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} delta68 "$(tdir_delta68)"
> +
>  eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/dlx.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_dlx "$(tdir_elf32_dlx)"
> +
>  eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_i860 "$(tdir_elf32_i860)"
> +
>  eelf32_i960.c: $(srcdir)/emulparams/elf32_i960.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_i960 "$(tdir_elf32_i960)"
> +
>  eelf32_sparc.c: $(srcdir)/emulparams/elf32_sparc.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_sparc "$(tdir_elf32_sparc)"
> +
>  eelf32_sparc_sol2.c: $(srcdir)/emulparams/elf32_sparc_sol2.sh \
>    $(srcdir)/emulparams/elf32_sparc.sh \
>    $(srcdir)/emulparams/solaris2.sh \
>    $(srcdir)/emultempl/solaris2.em $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_sparc_sol2 "$(tdir_elf32_sparc_sol2)"
> +
>  eelf32_sparc_vxworks.c: $(srcdir)/emulparams/elf32_sparc_vxworks.sh \
>    $(srcdir)/emulparams/vxworks.sh $(srcdir)/emulparams/elf32_sparc.sh \
>    $(srcdir)/emultempl/vxworks.em $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_sparc_vxworks "$(tdir_elf32_sparc_vxworks)"
> +
>  eelf32_spu.c: $(srcdir)/emulparams/elf32_spu.sh $(srcdir)/emultempl/spuelf.em \
>    $(srcdir)/emultempl/spu_ovl.@OBJEXT@_c $(srcdir)/emultempl/spu_icache.@OBJEXT@_c \
>    ldemul-list.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_spu "$(tdir_elf32_spu)"
> +
>  $(srcdir)/emultempl/spu_ovl.@OBJEXT@_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
>         if ../gas/as-new --version \
>                 | grep 'target.*spu' >/dev/null 2>/dev/null; then \
> @@ -898,1026 +912,1025 @@ $(srcdir)/emultempl/spu_icache.@OBJEXT@_c: @MAINT@ $(srcdir)/emultempl/spu_icach
>  eelf32_tic6x_be.c: $(srcdir)/emulparams/elf32_tic6x_be.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/tic6xdsbt.em \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_tic6x_be "$(tdir_elf32_tic6x_be)"
> +
>  eelf32_tic6x_elf_be.c: $(srcdir)/emulparams/elf32_tic6x_elf_be.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_tic6x_elf_be "$(tdir_elf32_tic6x_elf_be)"
> +
>  eelf32_tic6x_elf_le.c: $(srcdir)/emulparams/elf32_tic6x_elf_le.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_tic6x_elf_le "$(tdir_elf32_tic6x_elf_le)"
> +
>  eelf32_tic6x_le.c: $(srcdir)/emulparams/elf32_tic6x_le.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/tic6xdsbt.em \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_tic6x_le "$(tdir_elf32_tic6x_le)"
> +
>  eelf32_tic6x_linux_be.c: $(srcdir)/emulparams/elf32_tic6x_linux_be.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_tic6x_linux_be "$(tdir_elf32_tic6x_linux_be)"
> +
>  eelf32_tic6x_linux_le.c: $(srcdir)/emulparams/elf32_tic6x_linux_le.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc  $(srcdir)/emultempl/tic6xdsbt.em \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_tic6x_linux_le "$(tdir_elf32_tic6x_linux_le)"
> +
>  eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \
>    $(srcdir)/emulparams/elf32am33lin.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32am33lin "$(tdir_elf32am33lin)"
> +
>  eelf32b4300.c: $(srcdir)/emulparams/elf32b4300.sh \
>    $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32b4300 "$(tdir_elf32b4300)"
> +
>  eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32bfin "$(tdir_elf32bfin)" bfin
> +
>  eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh \
>    $(srcdir)/emulparams/bfin.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32bfinfd "$(tdir_elf32bfinfd)" elf32bfinfd
> +
>  eelf32bmip.c: $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32bmip "$(tdir_elf32bmip)"
> +
>  eelf32bmipn32.c: $(srcdir)/emulparams/elf32bmipn32.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/irix.em $(srcdir)/emultempl/mipself.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32bmipn32 "$(tdir_elf32bmipn32)"
> +
>  eelf32bsmip.c: $(srcdir)/emulparams/elf32bsmip.sh \
>    $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) $(srcdir)/emultempl/irix.em \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32bsmip "$(tdir_elf32bsmip)"
> +
>  eelf32btsmip.c: $(srcdir)/emulparams/elf32btsmip.sh \
>    $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32btsmip "$(tdir_elf32btsmip)"
> +
>  eelf32btsmip_fbsd.c: $(srcdir)/emulparams/elf32btsmip_fbsd.sh \
>    $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32btsmip_fbsd "$(tdir_elf32btsmip_fbsd)"
> +
>  eelf32btsmipn32.c: $(srcdir)/emulparams/elf32btsmipn32.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32btsmipn32 "$(tdir_elf32btsmipn32)"
> +
>  eelf32btsmipn32_fbsd.c: $(srcdir)/emulparams/elf32btsmipn32_fbsd.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32btsmipn32_fbsd "$(tdir_elf32btsmipn32_fbsd)"
> +
>  eelf32cr16.c: $(srcdir)/emulparams/elf32cr16.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/cr16elf.em \
>    $(srcdir)/scripttempl/elf32cr16.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32cr16 "$(tdir_elf32crx)"
> +
>  eelf32cr16c.c: $(srcdir)/emulparams/elf32cr16c.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf32cr16c.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32cr16c "$(tdir_elf32cr16c)"
> +
>  eelf32crx.c: $(srcdir)/emulparams/elf32crx.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/crxelf.em \
>    $(srcdir)/scripttempl/elf32crx.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32crx "$(tdir_elf32crx)"
> +
>  eelf32ebmip.c: $(srcdir)/emulparams/elf32ebmip.sh \
>    $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ebmip "$(tdir_elf32ebmip)"
> +
>  eelf32ebmipvxworks.c: $(srcdir)/emulparams/elf32ebmipvxworks.sh \
>    $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emulparams/vxworks.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
>    $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ebmipvxworks "$(tdir_elf32ebmipvxworks)"
> +
>  eelf32elmip.c: $(srcdir)/emulparams/elf32elmip.sh \
>    $(srcdir)/emulparams/elf32lmip.sh $(srcdir)/emulparams/elf32bmip.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32elmip "$(tdir_elf32elmip)"
> +
>  eelf32elmipvxworks.c: $(srcdir)/emulparams/elf32elmipvxworks.sh \
>    $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emulparams/vxworks.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
>    $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32elmipvxworks "$(tdir_elf32elmipvxworks)"
> +
>  eelf32lr5900.c: $(srcdir)/emulparams/elf32lr5900.sh \
>    $(srcdir)/emulparams/elf32bmip.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lr5900 "$(tdir_elf32lr5900)"
> +
>  eelf32lr5900n32.c: $(srcdir)/emulparams/elf32lr5900n32.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lr5900n32 "$(tdir_elf32lr5900n32)"
> +
>  eelf32epiphany.c: $(srcdir)/emulparams/elf32epiphany.sh \
>    $(ELF_DEPS) ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32epiphany "$(tdir_epiphany)"
> +
>  eelf32epiphany_4x4.c: $(srcdir)/emulparams/elf32epiphany_4x4.sh \
>    $(srcdir)/emultempl/elf32.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/epiphany_4x4.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32epiphany_4x4 "$(tdir_epiphany_4x4)"
> +
>  eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
> +
>  eelf32frv.c: $(srcdir)/emulparams/elf32frv.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32frv "$(tdir_frv)"
> +
>  eelf32frvfd.c: $(srcdir)/emulparams/elf32frvfd.sh \
>    $(srcdir)/emulparams/elf32frv.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32frvfd "$(tdir_frv)"
> +
>  eelf32i370.c: $(srcdir)/emulparams/elf32i370.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elfi370.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32i370 "$(tdir_elf32i370)"
> +
>  eelf32ip2k.c: $(srcdir)/emulparams/elf32ip2k.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ip2k "$(tdir_ip2k)"
> +
>  eelf32iq10.c: $(srcdir)/emulparams/elf32iq10.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32iq10 "$(tdir_iq10)"
> +
>  eelf32iq2000.c: $(srcdir)/emulparams/elf32iq2000.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32iq2000 "$(tdir_iq2000)"
> +
>  eelf32l4300.c: $(srcdir)/emulparams/elf32l4300.sh \
>    $(srcdir)/emulparams/elf32b4300.sh $(srcdir)/emulparams/elf32bmip.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32l4300 "$(tdir_elf32l4300)"
> +
>  eelf32lm32.c: $(srcdir)/emulparams/elf32lm32.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lm32 "$(tdir_elf32lm32)"
> +
>  eelf32lm32fd.c: $(srcdir)/emulparams/elf32lm32fd.sh \
>    $(srcdir)/emulparams/elf32lm32.sh $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lm32fd "$(tdir_elf32lm32fd)"
> +
>  eelf32lmip.c: $(srcdir)/emulparams/elf32lmip.sh \
>    $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lmip "$(tdir_elf32lmip)"
> +
>  eelf32lppc.c: $(srcdir)/emulparams/elf32lppc.sh \
>    $(srcdir)/emulparams/elf32ppccommon.sh \
>    $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emultempl/ppc32elf.em \
>    ldemul-list.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lppc "$(tdir_elf32lppc)"
> +
>  eelf32lppclinux.c: $(srcdir)/emulparams/elf32lppclinux.sh \
>    $(srcdir)/emulparams/elf32lppc.sh $(srcdir)/emulparams/elf32ppc.sh \
>    $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
>    ldemul-list.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lppclinux "$(tdir_elf32lppclinux)"
> +
>  eelf32lppcnto.c: $(srcdir)/emulparams/elf32lppcnto.sh \
>    $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
>    $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
>    ldemul-list.h \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lppcnto "$(tdir_elf32lppcnto)"
> +
>  eelf32lppcsim.c: $(srcdir)/emulparams/elf32lppcsim.sh \
>    $(srcdir)/emulparams/elf32lppc.sh $(srcdir)/emulparams/elf32ppc.sh \
>    $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
>    ldemul-list.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lppcsim "$(tdir_elf32lppcsim)"
> +
>  eelf32lsmip.c: $(srcdir)/emulparams/elf32lsmip.sh \
>    $(srcdir)/emulparams/elf32lmip.sh $(srcdir)/emulparams/elf32bmip.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32lsmip "$(tdir_elf32lsmip)"
> +
>  eelf32ltsmip.c: $(srcdir)/emulparams/elf32ltsmip.sh \
>    $(srcdir)/emulparams/elf32btsmip.sh $(srcdir)/emulparams/elf32bmip.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ltsmip "$(tdir_elf32ltsmip)"
> +
>  eelf32ltsmip_fbsd.c: $(srcdir)/emulparams/elf32ltsmip_fbsd.sh \
>    $(srcdir)/emulparams/elf32btsmip.sh $(srcdir)/emulparams/elf32bmip.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ltsmip_fbsd "$(tdir_elf32ltsmip_fbsd)"
> +
>  eelf32ltsmipn32.c: $(srcdir)/emulparams/elf32ltsmipn32.sh \
>    $(srcdir)/emulparams/elf32btsmipn32.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ltsmipn32 "$(tdir_elf32ltsmipn32)"
> +
>  eelf32ltsmipn32_fbsd.c: $(srcdir)/emulparams/elf32ltsmipn32_fbsd.sh \
>    $(srcdir)/emulparams/elf32btsmipn32.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ltsmipn32_fbsd "$(tdir_elf32ltsmipn32_fbsd)"
> +
>  eelf32m32c.c: $(srcdir)/emulparams/elf32m32c.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32m32c "$(tdir_m32c)"
> +
>  eelf32mbel_linux.c: $(srcdir)/emulparams/elf32mbel_linux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32mbel_linux "$(tdir_microblazeel)"
> +
>  eelf32mb_linux.c: $(srcdir)/emulparams/elf32mb_linux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32mb_linux "$(tdir_microblaze)"
> +
>  eelf32mcore.c: $(srcdir)/emulparams/elf32mcore.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32mcore "$(tdir_mcore)"
> +
>  eelf32mep.c: $(srcdir)/emulparams/elf32mep.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/mep.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32mep "$(tdir_mep)"
> +
>  eelf32metag.c: $(srcdir)/emulparams/elf32metag.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/metagelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32metag "$(tdir_metag)"
> +
>  eelf32microblazeel.c: $(srcdir)/emulparams/elf32microblazeel.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elfmicroblaze.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32microblazeel "$(tdir_microblazeel)"
> +
>  eelf32microblaze.c: $(srcdir)/emulparams/elf32microblaze.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elfmicroblaze.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32microblaze "$(tdir_microblaze)"
> +
>  eelf32mipswindiss.c: $(srcdir)/emulparams/elf32mipswindiss.sh $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32mipswindiss "$(tdir_elf32mipswindiss)"
> +
>  eelf32moxie.c: $(srcdir)/emulparams/elf32moxie.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32moxie "$(tdir_moxie)"
> +
>  eelf32mt.c: $(srcdir)/emulparams/elf32mt.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32mt "$(tdir_mt)"
> +
>  eelf32or1k.c: $(srcdir)/emulparams/elf32or1k.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32or1k "$(tdir_elf32or1k)"
> +
>  eelf32or1k_linux.c: $(srcdir)/emulparams/elf32or1k_linux.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32or1k_linux "$(tdir_elf32or1k_linux)"
> +
>  eelf32ppc.c: $(srcdir)/emulparams/elf32ppc.sh \
>    $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emultempl/ppc32elf.em \
>    ldemul-list.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ppc "$(tdir_elf32ppc)"
> +
>  eelf32ppc_fbsd.c: $(srcdir)/emulparams/elf32ppc_fbsd.sh \
>    $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
>    $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
>    ldemul-list.h \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ppc_fbsd "$(tdir_elf32ppc_fbsd)"
> +
>  eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \
>    $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
>    $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
>    ldemul-list.h \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ppclinux "$(tdir_elf32ppclinux)"
> +
>  eelf32ppcnto.c: $(srcdir)/emulparams/elf32ppcnto.sh \
>    $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
>    $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
>    ldemul-list.h \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ppcnto "$(tdir_elf32ppcnto)"
> +
>  eelf32ppcsim.c: $(srcdir)/emulparams/elf32ppcsim.sh \
>    $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
>    $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
>    ldemul-list.h \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ppcsim "$(tdir_elf32ppcsim)"
> +
>  eelf32ppcvxworks.c: $(srcdir)/emulparams/elf32ppcvxworks.sh \
>    $(srcdir)/emulparams/elf32ppccommon.sh $(srcdir)/emulparams/vxworks.sh \
>    $(srcdir)/emultempl/vxworks.em $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ppcvxworks "$(tdir_elf32ppcvxworks)"
> +
>  eelf32ppcwindiss.c: $(srcdir)/emulparams/elf32ppcwindiss.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32ppcwindiss "$(tdir_elf32ppcwindiss)"
> +
>  eelf32rl78.c: $(srcdir)/emulparams/elf32rl78.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32rl78 "$(tdir_elf32rl78)"
> +
>  eelf32rx.c: $(srcdir)/emulparams/elf32rx.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32rx "$(tdir_elf32rx)"
> +
>  eelf32tilegx.c: $(srcdir)/emulparams/elf32tilegx.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32tilegx "$(tdir_tilegx)"
> +
>  eelf32tilegx_be.c: $(srcdir)/emulparams/elf32tilegx_be.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32tilegx_be "$(tdir_tilegx_be)"
> +
>  eelf32tilepro.c: $(srcdir)/emulparams/elf32tilepro.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32tilepro "$(tdir_tilepro)"
> +
>  eelf32vax.c: $(srcdir)/emulparams/elf32vax.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32vax "$(tdir_elf32vax)"
> +
>  eelf32xc16x.c: $(srcdir)/emulparams/elf32xc16x.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32xc16x "$(tdir_xc16x)"
> +
>  eelf32xc16xl.c: $(srcdir)/emulparams/elf32xc16xl.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32xc16xl "$(tdir_xc16xl)"
> +
>  eelf32xc16xs.c: $(srcdir)/emulparams/elf32xc16xs.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32xc16xs "$(tdir_xc16xs)"
> +
>  eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/xstormy16.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32xstormy16 "$(tdir_xstormy16)"
> +
>  eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/xtensaelf.em $(INCDIR)/xtensa-config.h \
>    $(BFDDIR)/elf-bfd.h $(BFDDIR)/libbfd.h $(INCDIR)/elf/xtensa.h \
>    $(srcdir)/scripttempl/elfxtensa.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32xtensa "$(tdir_elf32xtensa)"
> +
>  eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_i386 "$(tdir_elf_i386)"
> +
>  eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_i386_be "$(tdir_elf_i386_be)"
> +
>  eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_i386_chaos "$(tdir_elf_i386_chaos)"
> +
>  eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \
>    $(srcdir)/emulparams/elf_i386.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_i386_fbsd "$(tdir_elf_i386_fbsd)"
> +
>  eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)"
> +
>  eelf_i386_nacl.c: $(srcdir)/emulparams/elf_i386_nacl.sh \
>    $(srcdir)/emulparams/elf_i386.sh \
>    $(srcdir)/emulparams/elf_nacl.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_i386_nacl "$(tdir_elf_i386_nacl)"
> +
>  eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \
>    $(srcdir)/emulparams/solaris2.sh \
>    $(srcdir)/emultempl/solaris2.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_i386_sol2 "$(tdir_elf_i386_sol2)"
> +
>  eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \
>    $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_i386_vxworks "$(tdir_elf_i386_vxworks)"
> +
>  eelf_s390.c: $(srcdir)/emulparams/elf_s390.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_s390 "$(tdir_elf_s390)"
> +
>  egld960.c: $(srcdir)/emulparams/gld960.sh \
>    $(srcdir)/emultempl/gld960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} gld960 "$(tdir_gld960)"
> +
>  egld960coff.c: $(srcdir)/emulparams/gld960coff.sh \
>    $(srcdir)/emultempl/gld960c.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} gld960coff "$(tdir_gld960coff)"
> +
>  eh8300.c: $(srcdir)/emulparams/h8300.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300 "$(tdir_h8300)"
> +
>  eh8300elf.c: $(srcdir)/emulparams/h8300elf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300elf "$(tdir_h8300elf)"
> +
>  eh8300h.c: $(srcdir)/emulparams/h8300h.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300h "$(tdir_h8300h)"
> +
>  eh8300helf.c: $(srcdir)/emulparams/h8300helf.sh \
>    $(srcdir)/emulparams/h8300elf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300helf "$(tdir_h8300helf)"
> +
>  eh8300hn.c: $(srcdir)/emulparams/h8300hn.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300hn.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300hn "$(tdir_h8300hn)"
> +
>  eh8300hnelf.c: $(srcdir)/emulparams/h8300hnelf.sh \
>    $(srcdir)/emulparams/h8300elf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300hnelf "$(tdir_h8300hnelf)"
> +
>  eh8300s.c: $(srcdir)/emulparams/h8300s.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300s.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300s "$(tdir_h8300s)"
> +
>  eh8300self.c: $(srcdir)/emulparams/h8300self.sh \
>    $(srcdir)/emulparams/h8300elf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300self "$(tdir_h8300self)"
> +
>  eh8300sn.c: $(srcdir)/emulparams/h8300sn.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sn.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300sn "$(tdir_h8300sn)"
> +
>  eh8300snelf.c: $(srcdir)/emulparams/h8300snelf.sh \
>    $(srcdir)/emulparams/h8300elf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300snelf "$(tdir_h8300snelf)"
> +
>  eh8300sx.c: $(srcdir)/emulparams/h8300sx.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sx.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300sx "$(tdir_h8300sx)"
> +
>  eh8300sxelf.c: $(srcdir)/emulparams/h8300sxelf.sh \
>    $(srcdir)/emulparams/h8300elf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300sxelf "$(tdir_h8300sxelf)"
> +
>  eh8300sxn.c: $(srcdir)/emulparams/h8300sxn.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sxn.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300sxn "$(tdir_h8300sxn)"
> +
>  eh8300sxnelf.c: $(srcdir)/emulparams/h8300sxnelf.sh \
>    $(srcdir)/emulparams/h8300elf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8300sxnelf "$(tdir_h8300sxnelf)"
> +
>  eh8500.c: $(srcdir)/emulparams/h8500.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8500 "$(tdir_h8500)"
> +
>  eh8500b.c: $(srcdir)/emulparams/h8500b.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500b.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8500b "$(tdir_h8500b)"
> +
>  eh8500c.c: $(srcdir)/emulparams/h8500c.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500c.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8500c "$(tdir_h8500c)"
> +
>  eh8500m.c: $(srcdir)/emulparams/h8500m.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500m.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8500m "$(tdir_h8500m)"
> +
>  eh8500s.c: $(srcdir)/emulparams/h8500s.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500s.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} h8500s "$(tdir_h8500s)"
> +
>  ehp300bsd.c: $(srcdir)/emulparams/hp300bsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} hp300bsd "$(tdir_hp300bsd)"
> +
>  ehp3hpux.c: $(srcdir)/emulparams/hp3hpux.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} hp3hpux "$(tdir_hp3hpux)"
> +
>  ehppaelf.c: $(srcdir)/emulparams/hppaelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
>    $(srcdir)/scripttempl/hppaelf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} hppaelf "$(tdir_hppaelf)"
> +
>  ehppalinux.c: $(srcdir)/emulparams/hppalinux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} hppalinux "$(tdir_hppalinux)"
> +
>  ehppanbsd.c: $(srcdir)/emulparams/hppanbsd.sh \
>    $(srcdir)/emulparams/hppaelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} hppanbsd "$(tdir_hppanbsd)"
> +
>  ehppaobsd.c: $(srcdir)/emulparams/hppaobsd.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/hppaelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} hppaobsd "$(tdir_hppaobsd)"
> +
>  ei386aout.c: $(srcdir)/emulparams/i386aout.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386aout "$(tdir_i386aout)"
> +
>  ei386beos.c: $(srcdir)/emulparams/i386beos.sh \
>    $(srcdir)/emultempl/beos.em $(srcdir)/scripttempl/i386beos.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386beos "$(tdir_i386beos)"
> +
>  ei386bsd.c: $(srcdir)/emulparams/i386bsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386bsd "$(tdir_i386bsd)"
> +
>  ei386coff.c: $(srcdir)/emulparams/i386coff.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386coff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386coff "$(tdir_i386coff)"
> +
>  ei386go32.c: $(srcdir)/emulparams/i386go32.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386go32.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386go32 "$(tdir_i386go32)"
> +
>  ei386linux.c: $(srcdir)/emulparams/i386linux.sh \
>    $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386linux "$(tdir_i386linux)"
> +
>  ei386lynx.c: $(srcdir)/emulparams/i386lynx.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386lynx "$(tdir_i386lynx)"
> +
>  ei386mach.c: $(srcdir)/emulparams/i386mach.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386mach "$(tdir_i386mach)"
> +
>  ei386moss.c: $(srcdir)/emulparams/i386moss.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386moss "$(tdir_i386moss)"
> +
>  ei386msdos.c: $(srcdir)/emulparams/i386msdos.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386msdos.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386msdos "$(tdir_i386msdos)"
> +
>  ei386nbsd.c:   $(srcdir)/emulparams/i386nbsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386nbsd "$(tdir_i386nbsd)"
> +
>  ei386nto.c:    $(srcdir)/emulparams/i386nto.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386nto "$(tdir_i386nto)"
> +
>  ei386nw.c:     $(srcdir)/emulparams/i386nw.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386nw "$(tdir_i386nw)"
> +
>  ei386pe.c: $(srcdir)/emulparams/i386pe.sh \
>    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386pe "$(tdir_i386pe)"
> +
>  ei386pe_posix.c: $(srcdir)/emulparams/i386pe_posix.sh \
>    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386pe_posix "$(tdir_i386pe_posix)"
> +
>  ei386pep.c: $(srcdir)/emulparams/i386pep.sh \
>    $(srcdir)/emultempl/pep.em $(srcdir)/scripttempl/pep.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} i386pep "$(tdir_i386pe)"
> +
>  elnk960.c: $(srcdir)/emulparams/lnk960.sh \
>    $(srcdir)/emultempl/lnk960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} lnk960 "$(tdir_lnk960)"
> +
>  em32relf.c: $(srcdir)/emulparams/m32relf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m32relf "$(tdir_m32r)"
> +
>  em32relf_linux.c: $(srcdir)/emulparams/m32relf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m32relf_linux "$(tdir_m32relf_linux)"
> +
>  em32rlelf.c: $(srcdir)/emulparams/m32rlelf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m32rlelf "$(tdir_m32rlelf)"
> +
>  em32rlelf_linux.c: $(srcdir)/emulparams/m32rlelf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m32rlelf_linux "$(tdir_m32rlelf_linux)"
> +
>  em68hc11elf.c: $(srcdir)/emulparams/m68hc11elf.sh \
>    $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elfm68hc11.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68hc11elf "$(tdir_m68hc11)"
> +
>  em68hc11elfb.c: $(srcdir)/emulparams/m68hc11elfb.sh \
>    $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elfm68hc11.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68hc11elfb "$(tdir_m68hc11b)"
> +
>  em68hc12elf.c: $(srcdir)/emulparams/m68hc12elf.sh \
>    $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elfm68hc12.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68hc12elf "$(tdir_m68hc12)"
> +
>  em68hc12elfb.c: $(srcdir)/emulparams/m68hc12elfb.sh \
>    $(srcdir)/emultempl/m68hc1xelf.em $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elfm68hc12.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68hc12elfb "$(tdir_m68hc12b)"
> +
>  em68k4knbsd.c: $(srcdir)/emulparams/m68k4knbsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68k4knbsd "$(tdir_m68k4knbsd)"
> +
>  em68kaout.c: $(srcdir)/emulparams/m68kaout.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68kaout "$(tdir_m68kaout)"
> +
>  em68kaux.c: $(srcdir)/emulparams/m68kaux.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m68kaux.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68kaux "$(tdir_m68kaux)"
> +
>  em68kcoff.c: $(srcdir)/emulparams/m68kcoff.sh \
>    $(srcdir)/emultempl/m68kcoff.em $(srcdir)/scripttempl/m68kcoff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68kcoff "$(tdir_m68kcoff)"
> +
>  em68kelf.c: $(srcdir)/emulparams/m68kelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/m68kelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68kelf "$(tdir_m68kelf)"
> +
>  em68kelfnbsd.c: $(srcdir)/emulparams/m68kelfnbsd.sh \
>    $(srcdir)/emulparams/m68kelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/m68kelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68kelfnbsd "$(tdir_m68kelfnbsd)"
> +
>  em68klinux.c: $(srcdir)/emulparams/m68klinux.sh \
>    $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68klinux "$(tdir_m68klinux)"
> +
>  em68knbsd.c:   $(srcdir)/emulparams/m68knbsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68knbsd "$(tdir_m68knbsd)"
> +
>  em68kpsos.c:   $(srcdir)/emulparams/m68kpsos.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/psos.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m68kpsos "$(tdir_m68kpsos)"
> +
>  em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} m88kbcs "$(tdir_m88kbcs)"
> +
>  emcorepe.c: $(srcdir)/emulparams/mcorepe.sh \
>    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} mcorepe "$(tdir_mcorepe)"
> +
>  emn10200.c: $(srcdir)/emulparams/mn10200.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} mn10200 "$(tdir_mn10200)"
> +
>  emn10300.c: $(srcdir)/emulparams/mn10300.sh \
>    $(srcdir)/emulparams/mn10200.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} mn10300 "$(tdir_mn10300)"
> +
>  emsp430.c: $(srcdir)/emulparams/msp430all.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} msp430 "$(tdir_msp430)" msp430all
> +
>  emsp430X.c: $(srcdir)/emulparams/msp430all.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} msp430X "$(tdir_msp430X)" msp430all
> +
>  ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} nds32elf "$(tdir_nds32)"
> +
>  ends32elf16m.c: $(srcdir)/emulparams/nds32elf16m.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} nds32elf16m "$(tdir_nds32)"
> +
>  ends32belf.c: $(srcdir)/emulparams/nds32belf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} nds32belf "$(tdir_nds32belf)"
> +
>  ends32belf16m.c: $(srcdir)/emulparams/nds32belf16m.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} nds32belf16m "$(tdir_nds32belf)"
> +
>  ends32elf_linux.c: $(srcdir)/emulparams/nds32elf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} nds32elf_linux "$(tdir_nds32elf_linux)"
> +
>  ends32belf_linux.c: $(srcdir)/emulparams/nds32belf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} nds32belf_linux "$(tdir_nds32belf_linux)"
> +
>  enews.c: $(srcdir)/emulparams/news.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} news "$(tdir_news)"
> +
>  enios2elf.c: $(srcdir)/emulparams/nios2elf.sh \
>    $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/nios2elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} nios2elf "$(tdir_nios2elf)"
> +
>  enios2linux.c: $(srcdir)/emulparams/nios2linux.sh \
>    $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/nios2elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} nios2linux "$(tdir_nios2linux)"
> +
>  ens32knbsd.c:  $(srcdir)/emulparams/ns32knbsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/netbsd.em \
>    $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} ns32knbsd "$(tdir_ns32knbsd)"
> +
>  eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aarch64elf "$(tdir_aarch64elf)"
> +
>  eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aarch64elf32 "$(tdir_aarch64elf32)"
> +
>  eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aarch64elfb "$(tdir_aarch64elfb)"
> +
>  eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aarch64elf32b "$(tdir_aarch64elf32b)"
> +
>  eaarch64linux.c: $(srcdir)/emulparams/aarch64linux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aarch64linux "$(tdir_aarch64linux)"
> +
>  eaarch64linuxb.c: $(srcdir)/emulparams/aarch64linuxb.sh $(srcdir)/emulparams/aarch64linux.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aarch64linuxb "$(tdir_aarch64linuxb)"
> +
>  eaarch64linux32.c: $(srcdir)/emulparams/aarch64linux32.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aarch64linux32 "$(tdir_aarch64linux32)"
> +
>  eaarch64linux32b.c: $(srcdir)/emulparams/aarch64linux32b.sh $(srcdir)/emulparams/aarch64linux32.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} aarch64linux32b "$(tdir_aarch64linux32b)"
> +
>  epc532macha.c: $(srcdir)/emulparams/pc532macha.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} pc532macha "$(tdir_pc532macha)"
> +
>  epdp11.c: $(srcdir)/emulparams/pdp11.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} pdp11 "$(tdir_pdp11)"
> +
>  epjelf.c: $(srcdir)/emulparams/pjelf.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} pjelf "$(tdir_pjelf)"
> +
>  epjlelf.c: $(srcdir)/emulparams/pjlelf.sh $(srcdir)/emulparams/pjelf.sh \
>    $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} pjlelf "$(tdir_pjlelf)"
> +
>  eppclynx.c: $(srcdir)/emulparams/ppclynx.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} ppclynx "$(tdir_ppclynx)"
> +
>  eppcmacos.c:   $(srcdir)/emulparams/ppcmacos.sh \
>    $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} ppcmacos "$(tdir_ppcmacos)"
> +
>  eppcnw.c:      $(srcdir)/emulparams/ppcnw.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} ppcnw "$(tdir_ppcnw)"
> +
>  eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \
>    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/ppcpe.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} ppcpe "$(tdir_ppcpe)"
> +
>  eriscix.c: $(srcdir)/emulparams/riscix.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} riscix "$(tdir_riscix)"
> +
>  escore3_elf.c: $(srcdir)/emulparams/scoreelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} score3_elf "$(tdir_score3_elf)" scoreelf
> +
>  escore7_elf.c: $(srcdir)/emulparams/scoreelf.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} score7_elf "$(tdir_score7_elf)" scoreelf
> +
>  esh.c: $(srcdir)/emulparams/sh.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} sh "$(tdir_sh)"
> +
>  eshelf.c: $(srcdir)/emulparams/shelf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf "$(tdir_shelf)"
> +
>  eshelf32.c: $(srcdir)/emulparams/shelf32.sh \
>    $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
>    $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf32 "$(tdir_shelf32)"
> +
>  eshelf32_linux.c: $(srcdir)/emulparams/shelf32_linux.sh \
>    $(srcdir)/emulparams/shelf32.sh \
>    $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
>    $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf32_linux "$(tdir_shelf32_linux)"
> +
>  eshelf32_nbsd.c: $(srcdir)/emulparams/shelf32_nbsd.sh \
>    $(srcdir)/emulparams/shelf32.sh \
>    $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
>    $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf32_nbsd "$(tdir_shelf32_nbsd)"
> +
>  eshelf_fd.c: $(srcdir)/emulparams/shelf_fd.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf_fd "$(tdir_shelf_fd)"
> +
>  eshelf_linux.c: $(srcdir)/emulparams/shelf_linux.sh \
>    $(srcdir)/emulparams/shlelf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf_linux "$(tdir_shelf_linux)"
> +
>  eshelf_nbsd.c: $(srcdir)/emulparams/shelf_nbsd.sh \
>    $(srcdir)/emulparams/shelf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf_nbsd "$(tdir_shelf_nbsd)"
> +
>  eshelf_nto.c: $(srcdir)/emulparams/shelf_nto.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf_nto "$(tdir_shelf_nto)"
> +
>  eshelf_uclinux.c: $(srcdir)/emulparams/shelf_uclinux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf_uclinux "$(tdir_shelf_uclinux)"
> +
>  eshelf_vxworks.c: $(srcdir)/emulparams/shelf_vxworks.sh \
>    $(srcdir)/emulparams/vxworks.sh $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc \
>    $(srcdir)/emultempl/vxworks.em ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf_vxworks "$(tdir_shelf_vxworks)"
> +
>  eshl.c: $(srcdir)/emulparams/shl.sh \
>    $(srcdir)/emulparams/sh.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shl "$(tdir_shl)"
> +
>  eshlelf.c: $(srcdir)/emulparams/shlelf.sh \
>    $(srcdir)/emulparams/shelf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf "$(tdir_shlelf)"
> +
>  eshlelf32.c: $(srcdir)/emulparams/shlelf32.sh \
>    $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h $(srcdir)/emulparams/shelf32.sh \
>    $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf32 "$(tdir_shlelf32)"
> +
>  eshlelf32_linux.c: $(srcdir)/emulparams/shlelf32_linux.sh \
>    $(srcdir)/emulparams/shelf32_linux.sh $(srcdir)/emulparams/shelf32.sh \
>    $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
>    $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf32_linux "$(tdir_shlelf32_linux)"
> +
>  eshlelf32_nbsd.c: $(srcdir)/emulparams/shlelf32_nbsd.sh \
>    $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
>    $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \
>    $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf32_nbsd "$(tdir_shlelf32_nbsd)"
> +
>  eshlelf_fd.c: $(srcdir)/emulparams/shlelf_fd.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf_fd "$(tdir_shlelf_fd)"
> +
>  eshlelf_linux.c: $(srcdir)/emulparams/shlelf_linux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf_linux "$(tdir_shlelf_linux)"
> +
>  eshlelf_nbsd.c: $(srcdir)/emulparams/shlelf_nbsd.sh \
>    $(srcdir)/emulparams/shelf_nbsd.sh \
>    $(srcdir)/emulparams/shelf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf_nbsd "$(tdir_shlelf_nbsd)"
> +
>  eshlelf_nto.c: $(srcdir)/emulparams/shlelf_nto.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf_nto "$(tdir_shlelf_nto)"
> +
>  eshlelf_vxworks.c: $(srcdir)/emulparams/shlelf_vxworks.sh \
>    $(srcdir)/emulparams/shelf_vxworks.sh $(srcdir)/emulparams/vxworks.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc $(srcdir)/emultempl/vxworks.em \
>    ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf_vxworks "$(tdir_shlelf_vxworks)"
> +
>  eshlsymbian.c: $(srcdir)/emulparams/shlsymbian.sh \
>    $(srcdir)/emulparams/shelf.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf32sh-symbian.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlsymbian "$(tdir_shlelf)"
> +
>  eshpe.c: $(srcdir)/emulparams/shpe.sh \
>    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shpe "$(tdir_shl)"
> +
>  esparcaout.c: $(srcdir)/emulparams/sparcaout.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} sparcaout "$(tdir_sparcaout)"
> +
>  esparclinux.c: $(srcdir)/emulparams/sparclinux.sh \
>    $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} sparclinux "$(tdir_sparclinux)"
> +
>  esparcnbsd.c:  $(srcdir)/emulparams/sparcnbsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} sparcnbsd "$(tdir_sparcnbsd)"
> +
>  est2000.c: $(srcdir)/emulparams/st2000.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/st2000.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} st2000 "$(tdir_st2000)"
> +
>  esun3.c: $(srcdir)/emulparams/sun3.sh \
>    $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} sun3 "$(tdir_sun3)"
> +
>  esun4.c: $(srcdir)/emulparams/sun4.sh \
>    $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} sun4 "$(tdir_sun4)"
> +
>  etic30aout.c: $(srcdir)/emulparams/tic30aout.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic30aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} tic30aout "$(tdir_tic30aout)"
> +
>  etic30coff.c: $(srcdir)/emulparams/tic30coff.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic30coff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} tic30coff "$(tdir_tic30coff)"
> +
>  etic3xcoff.c: $(srcdir)/emulparams/tic3xcoff.sh \
>    $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} tic3xcoff "$(tdir_tic4xcoff)"
> +
>  etic3xcoff_onchip.c: $(srcdir)/emulparams/tic3xcoff_onchip.sh \
>    $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} tic3xcoff_onchip "$(tdir_tic4xcoff)"
> +
>  etic4xcoff.c: $(srcdir)/emulparams/tic4xcoff.sh \
>    $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic4xcoff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} tic4xcoff "$(tdir_tic4xcoff)"
> +
>  etic54xcoff.c: $(srcdir)/emulparams/tic54xcoff.sh \
>    $(srcdir)/emultempl/ticoff.em $(srcdir)/scripttempl/tic54xcoff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} tic54xcoff "$(tdir_tic54xcoff)"
> +
>  etic80coff.c: $(srcdir)/emulparams/tic80coff.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic80coff.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} tic80coff "$(tdir_tic80coff)"
> +
>  ev850.c: $(srcdir)/emulparams/v850.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/v850.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} v850 "$(tdir_v850)"
> +
>  ev850_rh850.c: $(srcdir)/emulparams/v850_rh850.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/v850_rh850.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} v850_rh850 "$(tdir_v850_rh850)"
> +
>  evanilla.c: $(srcdir)/emulparams/vanilla.sh \
>    $(srcdir)/emultempl/vanilla.em $(srcdir)/scripttempl/vanilla.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} vanilla "$(tdir_vanilla)"
> +
>  evax.c: $(srcdir)/emulparams/vax.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} vax "$(tdir_vax)"
> +
>  evaxnbsd.c: $(srcdir)/emulparams/vaxnbsd.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} vaxnbsd "$(tdir_vaxnbsd)"
> +
>  evsta.c: $(srcdir)/emulparams/vsta.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} vsta "$(tdir_vsta)"
> +
>  ew65.c: $(srcdir)/emulparams/w65.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/w65.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} w65 "$(tdir_w65)"
> +
>  exgateelf.c: $(srcdir)/emulparams/xgateelf.sh \
>    $(srcdir)/emultempl/generic.em $(ELF_DEPS) \
>    $(srcdir)/scripttempl/elfxgate.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} xgateelf "$(tdir_xgate)"
> +
>  ez80.c: $(srcdir)/emulparams/z80.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/z80.em \
>    $(srcdir)/scripttempl/z80.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} z80 "$(tdir_z80)"
> +
>  ez8001.c: $(srcdir)/emulparams/z8001.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} z8001 "$(tdir_z8001)"
> +
>  ez8002.c: $(srcdir)/emulparams/z8002.sh \
>    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} z8002 "$(tdir_z8002)"
> 
>  eelf32_x86_64.c: $(srcdir)/emulparams/elf32_x86_64.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_x86_64 "$(tdir_elf32_x86_64)"
> +
>  eelf32_x86_64_nacl.c: $(srcdir)/emulparams/elf32_x86_64_nacl.sh \
>    $(srcdir)/emulparams/elf32_x86_64.sh \
>    $(srcdir)/emulparams/elf_nacl.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf32_x86_64_nacl "$(tdir_elf32_x86_64_nacl)"
> +
>  eelf64_aix.c: $(srcdir)/emulparams/elf64_aix.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64_aix "$(tdir_elf64_aix)"
> +
>  eelf64_ia64.c: $(srcdir)/emulparams/elf64_ia64.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/ia64elf.em \
>    $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64_ia64 "$(tdir_elf64_ia64)"
> +
>  eelf64_ia64_fbsd.c: $(srcdir)/emulparams/elf64_ia64_fbsd.sh \
>    $(srcdir)/emulparams/elf64_ia64.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/ia64elf.em \
>    $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64_ia64_fbsd "$(tdir_elf64_ia64_fbsd)"
> +
>  eelf64_ia64_vms.c: $(srcdir)/emulparams/elf64_ia64_vms.sh \
>    $(srcdir)/emultempl/vms.em $(srcdir)/emultempl/elf-generic.em \
>    $(srcdir)/scripttempl/ia64vms.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64_ia64_vms "$(tdir_elf64_ia64_vms)"
> +
>  eelf64_s390.c: $(srcdir)/emulparams/elf64_s390.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64_s390 "$(tdir_elf64_s390)"
> +
>  eelf64_sparc.c: $(srcdir)/emulparams/elf64_sparc.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64_sparc "$(tdir_elf64_sparc)"
> +
>  eelf64_sparc_fbsd.c: $(srcdir)/emulparams/elf64_sparc_fbsd.sh \
>    $(srcdir)/emulparams/elf64_sparc.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64_sparc_fbsd "$(tdir_elf64_sparc_fbsd)"
> +
>  eelf64_sparc_sol2.c: $(srcdir)/emulparams/elf64_sparc_sol2.sh \
>    $(srcdir)/emulparams/elf64_sparc.sh \
>    $(srcdir)/emulparams/solaris2.sh \
>    $(srcdir)/emultempl/solaris2.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64_sparc_sol2 "$(tdir_elf64_sparc_sol2)"
> +
>  eelf64alpha.c: $(srcdir)/emulparams/elf64alpha.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64alpha "$(tdir_elf64alpha)"
> +
>  eelf64alpha_fbsd.c: $(srcdir)/emulparams/elf64alpha_fbsd.sh \
>    $(srcdir)/emulparams/elf64alpha.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64alpha_fbsd "$(tdir_elf64alpha_fbsd)"
> +
>  eelf64alpha_nbsd.c: $(srcdir)/emulparams/elf64alpha_nbsd.sh \
>    $(srcdir)/emulparams/elf64alpha.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64alpha_nbsd "$(tdir_elf64alpha_nbsd)"
> +
>  eelf64bmip.c: $(srcdir)/emulparams/elf64bmip.sh \
>    $(srcdir)/emulparams/elf64bmip-defs.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/irix.em $(srcdir)/emultempl/mipself.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64bmip "$(tdir_elf64bmip)"
> +
>  eelf64btsmip.c: $(srcdir)/emulparams/elf64btsmip.sh \
>    $(srcdir)/emulparams/elf64bmip-defs.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64btsmip "$(tdir_elf64btsmip)"
> +
>  eelf64btsmip_fbsd.c: $(srcdir)/emulparams/elf64btsmip_fbsd.sh \
>    $(srcdir)/emulparams/elf64bmip-defs.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64btsmip_fbsd "$(tdir_elf64btsmip_fbsd)"
> +
>  eelf64hppa.c: $(srcdir)/emulparams/elf64hppa.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf64hppa.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64hppa "$(tdir_elf64hppa)"
> +
>  eelf64lppc.c: $(srcdir)/emulparams/elf64lppc.sh \
>    $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
>    ldemul-list.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64lppc "$(tdir_elf64lppc)"
> +
>  eelf64ltsmip.c: $(srcdir)/emulparams/elf64ltsmip.sh \
>    $(srcdir)/emulparams/elf64btsmip.sh $(srcdir)/emulparams/elf64bmip-defs.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64ltsmip "$(tdir_elf64ltsmip)"
> +
>  eelf64ltsmip_fbsd.c: $(srcdir)/emulparams/elf64ltsmip_fbsd.sh \
>    $(srcdir)/emulparams/elf64btsmip_fbsd.sh $(srcdir)/emulparams/elf64bmip-defs.sh \
>    $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
>    $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64ltsmip_fbsd "$(tdir_elf64ltsmip_fbsd)"
> +
>  eelf64mmix.c: $(srcdir)/emulparams/elf64mmix.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/mmix-elfnmmo.em \
>    $(srcdir)/emultempl/mmixelf.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64mmix "$(tdir_elf64mmix)"
> +
>  eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
>    ldemul-list.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64ppc "$(tdir_elf64ppc)"
> +
>  eelf64ppc_fbsd.c: $(srcdir)/emulparams/elf64ppc_fbsd.sh \
>    $(srcdir)/emultempl/ppc64elf.em ldemul-list.h \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64ppc_fbsd "$(tdir_elf64ppc_fbsd)"
> +
>  eelf64rdos.c: $(srcdir)/emulparams/elf64rdos.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64rdos "$(tdir_elf64rdos)"
> +
>  eelf64tilegx.c: $(srcdir)/emulparams/elf64tilegx.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64tilegx "$(tdir_tilegx)"
> +
>  eelf64tilegx_be.c: $(srcdir)/emulparams/elf64tilegx_be.sh \
>    $(ELF_DEPS) $(srcdir)/emultempl/needrelax.em \
>    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf64tilegx_be "$(tdir_tilegx_be)"
> +
>  eelf_l1om.c: $(srcdir)/emulparams/elf_l1om.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_l1om "$(tdir_elf_l1om)"
> +
>  eelf_l1om_fbsd.c: $(srcdir)/emulparams/elf_l1om_fbsd.sh \
>    $(srcdir)/emulparams/elf_l1om.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_l1om_fbsd "$(tdir_elf_l1om_fbsd)"
> +
>  eelf_k1om.c: $(srcdir)/emulparams/elf_k1om.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_k1om "$(tdir_elf_k1om)"
> +
>  eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \
>    $(srcdir)/emulparams/elf_k1om.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_k1om_fbsd "$(tdir_elf_k1om_fbsd)"
> +
>  eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_x86_64 "$(tdir_elf_x86_64)"
> +
>  eelf_x86_64_fbsd.c: $(srcdir)/emulparams/elf_x86_64_fbsd.sh \
>    $(srcdir)/emulparams/elf_x86_64.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_x86_64_fbsd "$(tdir_elf_x86_64_fbsd)"
> +
>  eelf_x86_64_nacl.c: $(srcdir)/emulparams/elf_x86_64_nacl.sh \
>    $(srcdir)/emulparams/elf_x86_64.sh \
>    $(srcdir)/emulparams/elf_nacl.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_x86_64_nacl "$(tdir_elf_x86_64_nacl)"
> +
>  eelf_x86_64_sol2.c: $(srcdir)/emulparams/elf_x86_64_sol2.sh \
>    $(srcdir)/emulparams/elf_x86_64.sh \
>    $(srcdir)/emulparams/solaris2.sh \
>    $(srcdir)/emultempl/solaris2.em \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} elf_x86_64_sol2 "$(tdir_elf_x86_64_sol2)"
> +
>  ehppa64linux.c: $(srcdir)/emulparams/hppa64linux.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} hppa64linux "$(tdir_hppa64linux)"
> +
>  emmo.c: $(srcdir)/emulparams/mmo.sh $(srcdir)/emultempl/mmix-elfnmmo.em \
>    $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em \
>    $(srcdir)/emultempl/mmo.em $(srcdir)/scripttempl/DWARF.sc \
>    $(srcdir)/scripttempl/mmo.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} mmo "$(tdir_mmo)"
> +
>  eshelf64.c: $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf64 "$(tdir_shelf64)"
> +
>  eshelf64_nbsd.c: $(srcdir)/emulparams/shelf64_nbsd.sh \
>    $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shelf64_nbsd "$(tdir_shelf64_nbsd)"
> +
>  eshlelf64.c: $(srcdir)/emulparams/shlelf64.sh \
>    $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf64 "$(tdir_shlelf64)"
> +
>  eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \
>    $(srcdir)/emulparams/shelf64_nbsd.sh \
>    $(srcdir)/emulparams/shelf32_nbsd.sh $(srcdir)/emulparams/shelf32.sh \
>    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
> -       ${GENSCRIPTS} shlelf64_nbsd "$(tdir_shlelf64_nbsd)"
> +
> 
>  # We need this for automake to use YLWRAP.
>  EXTRA_ld_new_SOURCES = deffilep.y ldlex.l
> 
> brgds, H-P
> 

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-05-28 13:16         ` Hans-Peter Nilsson
@ 2014-05-28 14:15           ` Alan Modra
  2014-05-29 10:08             ` Require GNU make? (was: Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds) Pedro Alves
  2014-06-02  6:30             ` [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds Alan Modra
  0 siblings, 2 replies; 19+ messages in thread
From: Alan Modra @ 2014-05-28 14:15 UTC (permalink / raw)
  To: Hans-Peter Nilsson; +Cc: binutils

On Wed, May 28, 2014 at 03:15:51PM +0200, Hans-Peter Nilsson wrote:
> Ping.  I'd rather *not* tie this fix to moving to require GNU
> make, please.

OK then, since no one else has supported moving to GNU make.

-- 
Alan Modra
Australia Development Lab, IBM

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Require GNU make? (was: Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds)
  2014-05-28 14:15           ` Alan Modra
@ 2014-05-29 10:08             ` Pedro Alves
  2014-05-29 12:54               ` Require GNU make? Richard Earnshaw
  2014-06-04 18:33               ` Tom Tromey
  2014-06-02  6:30             ` [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds Alan Modra
  1 sibling, 2 replies; 19+ messages in thread
From: Pedro Alves @ 2014-05-29 10:08 UTC (permalink / raw)
  To: Hans-Peter Nilsson, binutils

On 05/28/2014 03:15 PM, Alan Modra wrote:
> On Wed, May 28, 2014 at 03:15:51PM +0200, Hans-Peter Nilsson wrote:
>> Ping.  I'd rather *not* tie this fix to moving to require GNU
>> make, please.
> 
> OK then, since no one else has supported moving to GNU make.

(not speaking for tying the fix, but,)

Seems no one objected either.  Changed subject to catch attention.

I was kind of hoping binutils would start requiring it, so
we could use it as excuse for GDB to require it as well.  :-)

-- 
Pedro Alves

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: Require GNU make?
  2014-05-29 10:08             ` Require GNU make? (was: Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds) Pedro Alves
@ 2014-05-29 12:54               ` Richard Earnshaw
  2014-05-29 13:09                 ` Ralf Corsepius
  2014-06-04 18:33               ` Tom Tromey
  1 sibling, 1 reply; 19+ messages in thread
From: Richard Earnshaw @ 2014-05-29 12:54 UTC (permalink / raw)
  To: Pedro Alves; +Cc: Hans-Peter Nilsson, binutils

On 29/05/14 11:08, Pedro Alves wrote:
> On 05/28/2014 03:15 PM, Alan Modra wrote:
>> On Wed, May 28, 2014 at 03:15:51PM +0200, Hans-Peter Nilsson wrote:
>>> Ping.  I'd rather *not* tie this fix to moving to require GNU
>>> make, please.
>>
>> OK then, since no one else has supported moving to GNU make.
> 
> (not speaking for tying the fix, but,)
> 
> Seems no one objected either.  Changed subject to catch attention.
> 
> I was kind of hoping binutils would start requiring it, so
> we could use it as excuse for GDB to require it as well.  :-)
> 

Not directly relevant, but I put a feature into the newlib build earlier
this year that relied on a GNU make extension.  There were no objections
at the time I did that.

My feelings are that if there are good technical reasons to require GNU
Make (ie no way to avoid the requirement without seriously convoluted
changes), we should go ahead and do it.

R.

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: Require GNU make?
  2014-05-29 12:54               ` Require GNU make? Richard Earnshaw
@ 2014-05-29 13:09                 ` Ralf Corsepius
  2014-05-29 13:23                   ` Richard Earnshaw
  2014-05-29 15:32                   ` Jeff Law
  0 siblings, 2 replies; 19+ messages in thread
From: Ralf Corsepius @ 2014-05-29 13:09 UTC (permalink / raw)
  To: binutils

On 05/29/2014 02:54 PM, Richard Earnshaw wrote:

> Not directly relevant, but I put a feature into the newlib build earlier
> this year that relied on a GNU make extension.  There were no objections
> at the time I did that.
Correct me if I'm wrong, but IIRC, GCC already requires gmake.
As newlib is commonly used with GCC, probably everybody who uses newlib 
also uses gmake :-)

Ralf

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: Require GNU make?
  2014-05-29 13:09                 ` Ralf Corsepius
@ 2014-05-29 13:23                   ` Richard Earnshaw
  2014-05-29 16:09                     ` ISHIKAWA,chiaki
  2014-05-29 15:32                   ` Jeff Law
  1 sibling, 1 reply; 19+ messages in thread
From: Richard Earnshaw @ 2014-05-29 13:23 UTC (permalink / raw)
  To: Ralf Corsepius; +Cc: binutils

On 29/05/14 14:06, Ralf Corsepius wrote:
> On 05/29/2014 02:54 PM, Richard Earnshaw wrote:
> 
>> Not directly relevant, but I put a feature into the newlib build earlier
>> this year that relied on a GNU make extension.  There were no objections
>> at the time I did that.
> Correct me if I'm wrong, but IIRC, GCC already requires gmake.
> As newlib is commonly used with GCC, probably everybody who uses newlib 
> also uses gmake :-)
> 
> Ralf
> 
> 

Possibly.  As I said, it's not directly relevant...

I tend to build all off gcc/binutils/gdb/newlib in one go, so always use
gmake for the lot.

R.

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: Require GNU make?
  2014-05-29 13:09                 ` Ralf Corsepius
  2014-05-29 13:23                   ` Richard Earnshaw
@ 2014-05-29 15:32                   ` Jeff Law
  1 sibling, 0 replies; 19+ messages in thread
From: Jeff Law @ 2014-05-29 15:32 UTC (permalink / raw)
  To: Ralf Corsepius, binutils

On 05/29/14 07:06, Ralf Corsepius wrote:
> On 05/29/2014 02:54 PM, Richard Earnshaw wrote:
>
>> Not directly relevant, but I put a feature into the newlib build earlier
>> this year that relied on a GNU make extension.  There were no objections
>> at the time I did that.
> Correct me if I'm wrong, but IIRC, GCC already requires gmake.
Correct.  3.80 or later.  I don't think we exploit too many GNU make 
features, but gmake 3.80 is now a prerequisite for GCC.

> As newlib is commonly used with GCC, probably everybody who uses newlib
> also uses gmake :-)
I'd be surprised if anyone is using newlib with anything other than gcc. 
  But then again, I'm continually surprised by how some folks bolt 
together various components to build systems.

jeff

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: Require GNU make?
  2014-05-29 13:23                   ` Richard Earnshaw
@ 2014-05-29 16:09                     ` ISHIKAWA,chiaki
  2014-05-29 22:17                       ` Pedro Alves
  0 siblings, 1 reply; 19+ messages in thread
From: ISHIKAWA,chiaki @ 2014-05-29 16:09 UTC (permalink / raw)
  To: binutils

(2014/05/29 22:23), Richard Earnshaw wrote:
> On 29/05/14 14:06, Ralf Corsepius wrote:
>> On 05/29/2014 02:54 PM, Richard Earnshaw wrote:
>>
>>> Not directly relevant, but I put a feature into the newlib build earlier
>>> this year that relied on a GNU make extension.  There were no objections
>>> at the time I did that.
>> Correct me if I'm wrong, but IIRC, GCC already requires gmake.
>> As newlib is commonly used with GCC, probably everybody who uses newlib
>> also uses gmake :-)
>>
>> Ralf
>>
>>
>
> Possibly.  As I said, it's not directly relevant...
>
> I tend to build all off gcc/binutils/gdb/newlib in one go, so always use
> gmake for the lot.
>
> R.
>

Hi,

I don't know the recent code, but at least long time ago,
'Makefile' for gmake used portable constructs only so that gmake source 
files can be compiled and linked to produce gmake binary with BSDmake 
and other variants of make look-alikes. (I think there was even a 
special makefile for DOS-based DeLorie-GCC environment)

There is a bootstrapping issue of native binutils tools
for a new CPU, say, when there is only a limited set of available tools 
under a given OS for which the CPU vendors are providing initial support 
limited. Selection of GNUmake or BSDmake can be such an issue.

But, today, we have Cygwin that runs well (albeit slowly in terms of 
I/O) under Windows even so that cross-compilation using gmake is 
possible under Windows platforms, POSIX-platforms such as linux, Mac 
OSX, FreeBSD, Solaris, and even on a single board computer environemtn 
Raspberry-PI using Debian-based linux distribution.

Creating a cross-compilation chain using GCC and binutils for a new CPU 
is not an impossible task [or it is not that difficult to write a 
wrapper that lets a proprietary cross-compiler from the CPU vendor to 
understand options passed to GCC reasonably well for compilation 
purposes at least], I think using gmake-specific constructs in 
Makefile(s) for native and cross binutils is OK as long as it is clearly 
documented and self-checking code is embedded in Makefile.
We don't want incorrect compilation that produce seemingly complete 
binary due to the mishandling of non-portable make rules, and such.

Maybe someone who has ported binutils tools RECENTLY to a new CPU using
the proprietary (cross-)compiler (and assembler and linker, more 
importantly) from a CPU vendor and had some difficulty because of the 
limitation of tools on the particular OS which the CPU vendor chose for 
initial support can comment on this.
I doubt difference of make versions is not a major cause of headache 
these days (in principle!)

Just a thought from an observer who has used microprocessors since late 
1970's...

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: Require GNU make?
  2014-05-29 16:09                     ` ISHIKAWA,chiaki
@ 2014-05-29 22:17                       ` Pedro Alves
  2014-05-29 22:23                         ` Joel Brobecker
  0 siblings, 1 reply; 19+ messages in thread
From: Pedro Alves @ 2014-05-29 22:17 UTC (permalink / raw)
  To: ISHIKAWA,chiaki, binutils

On 05/29/2014 05:09 PM, ISHIKAWA,chiaki wrote:
> (2014/05/29 22:23), Richard Earnshaw wrote:
>> On 29/05/14 14:06, Ralf Corsepius wrote:
>>> On 05/29/2014 02:54 PM, Richard Earnshaw wrote:
>>>
>>>> Not directly relevant, but I put a feature into the newlib build earlier
>>>> this year that relied on a GNU make extension.  There were no objections
>>>> at the time I did that.
>>> Correct me if I'm wrong, but IIRC, GCC already requires gmake.
>>> As newlib is commonly used with GCC, probably everybody who uses newlib
>>> also uses gmake :-)
>>>
>>> Ralf
>>>
>>>
>>
>> Possibly.  As I said, it's not directly relevant...
>>
>> I tend to build all off gcc/binutils/gdb/newlib in one go, so always use
>> gmake for the lot.
>>
>> R.
>>
> 
> Hi,
> 
> I don't know the recent code, but at least long time ago,
> 'Makefile' for gmake used portable constructs only so that gmake source 
> files can be compiled and linked to produce gmake binary with BSDmake 
> and other variants of make look-alikes. (I think there was even a 
> special makefile for DOS-based DeLorie-GCC environment)

Yeah, GNU make itself assuming GNU make to built itself while
other GNU tools not assuming would be ... a
"wth-are-we-doing-who-are-we-caring-for?" day.

> There is a bootstrapping issue of native binutils tools
> for a new CPU, say, when there is only a limited set of available tools 
> under a given OS for which the CPU vendors are providing initial support 
> limited. Selection of GNUmake or BSDmake can be such an issue.

Not really.  It just means that before building binutils, you need
to build GNU make.  That is, in effect, push the build system
portability problem to a single and logical entry point, rather
than have all GNU programs (that use make) need to care.  GNU
only needs to invent the wheel once.

> But, today, we have Cygwin that runs well (albeit slowly in terms of 
> I/O) under Windows even so that cross-compilation using gmake is 
> possible under Windows platforms, POSIX-platforms such as linux, Mac 
> OSX, FreeBSD, Solaris, and even on a single board computer environemtn 
> Raspberry-PI using Debian-based linux distribution.

GNU make even builds with Microsoft's compilers.  At least,
there's README.W32.template in the sources saying that's supported,
and I see "make_msvc_net2003.sln" and "make_msvc_net2003.vcproj" files.

> Maybe someone who has ported binutils tools RECENTLY to a new CPU using
> the proprietary (cross-)compiler (and assembler and linker, more 
> importantly) from a CPU vendor and had some difficulty because of the 
> limitation of tools on the particular OS which the CPU vendor chose for 
> initial support can comment on this.

Nowadays you're more likely to start by cross compiling, but in any case,
that is really a false problem.  That someone would just have to
port/build GNU make first with the proprietary compiler, _then_
port binutils, then gcc, etc.

-- 
Pedro Alves

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: Require GNU make?
  2014-05-29 22:17                       ` Pedro Alves
@ 2014-05-29 22:23                         ` Joel Brobecker
  0 siblings, 0 replies; 19+ messages in thread
From: Joel Brobecker @ 2014-05-29 22:23 UTC (permalink / raw)
  To: Pedro Alves; +Cc: ISHIKAWA,chiaki, binutils

> Not really.  It just means that before building binutils, you need
> to build GNU make.  That is, in effect, push the build system
> portability problem to a single and logical entry point, rather
> than have all GNU programs (that use make) need to care.  GNU
> only needs to invent the wheel once.
[...]
> GNU make even builds with Microsoft's compilers.  At least,
> there's README.W32.template in the sources saying that's supported,
> and I see "make_msvc_net2003.sln" and "make_msvc_net2003.vcproj" files.
[...]
> Nowadays you're more likely to start by cross compiling, but in any case,
> that is really a false problem.  That someone would just have to
> port/build GNU make first with the proprietary compiler, _then_
> port binutils, then gcc, etc.

+1.

I am particularly sensitive to the argument that GNU projects
at large shouldn't have to suffer because we can't ask developers
(or build systems such as the *BSDs) to build GNU Make first and
use that instead.

-- 
Joel

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-05-28 14:15           ` Alan Modra
  2014-05-29 10:08             ` Require GNU make? (was: Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds) Pedro Alves
@ 2014-06-02  6:30             ` Alan Modra
  2014-06-02 17:28               ` Hans-Peter Nilsson
  1 sibling, 1 reply; 19+ messages in thread
From: Alan Modra @ 2014-06-02  6:30 UTC (permalink / raw)
  To: Hans-Peter Nilsson, binutils

bfin, msp, and score all used an extra parameter to genscripts.sh
to select a "customizer_script" different from the standard one
named from the emulation.  Which is why your 2014-05-28 patch caused
http://lists.gnu.org/archive/html/bug-binutils/2014-06/msg00001.html
This patch renames the scripts to avoid the need of a
customizer_script param, tidying them in the process.

	* emulparams/elf32bfin.sh: Rename from bfin.sh.
	* emulparams/elf32bfinfd.sh: Update to suit.
	* emulparams/msp430.sh: Rename from msp430all.sh.  Remove
	MSP430_NAME and msp430X vars.
	* emulparams/msp430X.sh: New.
	* emulparams/score3_elf.sh: Rename from scoreelf.sh.  Remove
	SCORE_NAME and score7_elf ARCH setting.
	* emulparams/score7_elf.sh: New.
	* Makefile.am (eelf32bfin.c, eelf32bfinfd.c): Update dependencies.
	(emsp430.c, emsp430X.c, escore3_elf.c, escore7_elf.c): Likewise.
	* Makefile.in: Regenerate.
	* genscripts.sh: Delete customizer_script param.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index d66801b..24ba3e1 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -942,12 +942,12 @@ eelf32b4300.c: $(srcdir)/emulparams/elf32b4300.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \
+eelf32bfin.c: $(srcdir)/emulparams/elf32bfin.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
 eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh \
-  $(srcdir)/emulparams/bfin.sh \
+  $(srcdir)/emulparams/elf32bfin.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
@@ -1480,13 +1480,11 @@ emn10300.c: $(srcdir)/emulparams/mn10300.sh \
   $(srcdir)/emulparams/mn10200.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-emsp430.c: $(srcdir)/emulparams/msp430all.sh \
-  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
-  ${GEN_DEPENDS}
+emsp430.c: $(srcdir)/emulparams/msp430.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
 
-emsp430X.c: $(srcdir)/emulparams/msp430all.sh \
-  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
-  ${GEN_DEPENDS}
+emsp430X.c: $(srcdir)/emulparams/msp430.sh $(srcdir)/emulparams/msp430X.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
 
 ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
@@ -1586,11 +1584,12 @@ eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \
 eriscix.c: $(srcdir)/emulparams/riscix.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 
-escore3_elf.c: $(srcdir)/emulparams/scoreelf.sh \
+escore3_elf.c: $(srcdir)/emulparams/score3_elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-escore7_elf.c: $(srcdir)/emulparams/scoreelf.sh \
+escore7_elf.c: $(srcdir)/emulparams/score3_elf.sh \
+  $(srcdir)/emulparams/score7_elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
diff --git a/ld/emulparams/bfin.sh b/ld/emulparams/bfin.sh
deleted file mode 100644
index 6c0bb40..0000000
--- a/ld/emulparams/bfin.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-SCRIPT_NAME=elf
-OUTPUT_FORMAT="elf32-bfin"
-TEXT_START_ADDR=0x0
-MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-TARGET_PAGE_SIZE=0x1000
-ARCH=bfin
-MACHINE=
-TEMPLATE_NAME=elf32
-GENERATE_SHLIB_SCRIPT=yes
-EMBEDDED=yes
-USER_LABEL_PREFIX=_
-EXTRA_EM_FILE=bfin
diff --git a/ld/emulparams/elf32bfin.sh b/ld/emulparams/elf32bfin.sh
new file mode 100644
index 0000000..6c0bb40
--- /dev/null
+++ b/ld/emulparams/elf32bfin.sh
@@ -0,0 +1,12 @@
+SCRIPT_NAME=elf
+OUTPUT_FORMAT="elf32-bfin"
+TEXT_START_ADDR=0x0
+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+TARGET_PAGE_SIZE=0x1000
+ARCH=bfin
+MACHINE=
+TEMPLATE_NAME=elf32
+GENERATE_SHLIB_SCRIPT=yes
+EMBEDDED=yes
+USER_LABEL_PREFIX=_
+EXTRA_EM_FILE=bfin
diff --git a/ld/emulparams/elf32bfinfd.sh b/ld/emulparams/elf32bfinfd.sh
index 26f8f47..4c96bc9 100644
--- a/ld/emulparams/elf32bfinfd.sh
+++ b/ld/emulparams/elf32bfinfd.sh
@@ -1,4 +1,4 @@
-. ${srcdir}/emulparams/bfin.sh
+. ${srcdir}/emulparams/elf32bfin.sh
 unset STACK_ADDR
 OUTPUT_FORMAT="elf32-bfinfdpic"
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
diff --git a/ld/emulparams/msp430.sh b/ld/emulparams/msp430.sh
new file mode 100644
index 0000000..b459698
--- /dev/null
+++ b/ld/emulparams/msp430.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# This called by genscripts_extra.sh
+
+SCRIPT_NAME=elf32msp430
+TEMPLATE_NAME=generic
+EXTRA_EM_FILE=genelf
+OUTPUT_FORMAT="elf32-msp430"
+MACHINE=
+MAXPAGESIZE=1
+EMBEDDED=yes
+
+ARCH=msp:14
+ROM_START=0x8000
+ROM_SIZE=0x7fe0
+RAM_START=0x0200
+RAM_SIZE=1K
+STACK=0x600
diff --git a/ld/emulparams/msp430X.sh b/ld/emulparams/msp430X.sh
new file mode 100644
index 0000000..fea669b
--- /dev/null
+++ b/ld/emulparams/msp430X.sh
@@ -0,0 +1,8 @@
+. ${srcdir}/emulparams/msp430.sh
+
+ARCH=MSP430x43
+ROM_START=0x02000
+ROM_SIZE=0x0dfe0
+RAM_START=0x10000
+RAM_SIZE=0x30000
+STACK=0x600
diff --git a/ld/emulparams/msp430all.sh b/ld/emulparams/msp430all.sh
deleted file mode 100644
index 1f1eef8..0000000
--- a/ld/emulparams/msp430all.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# This called by genscripts_extra.sh
-
-MSP430_NAME=${EMULATION_NAME}
-
-SCRIPT_NAME=elf32msp430
-TEMPLATE_NAME=generic
-EXTRA_EM_FILE=genelf
-OUTPUT_FORMAT="elf32-msp430"
-MACHINE=
-MAXPAGESIZE=1
-EMBEDDED=yes
-
-if [ "${MSP430_NAME}" = "msp430" ] ; then
-ARCH=msp:14
-ROM_START=0x8000
-ROM_SIZE=0x7fe0
-RAM_START=0x0200
-RAM_SIZE=1K
-STACK=0x600
-fi
-
-if [ "${MSP430_NAME}" = "msp430X" ] ; then
-ARCH=MSP430x43
-ROM_START=0x02000
-ROM_SIZE=0x0dfe0
-RAM_START=0x10000
-RAM_SIZE=0x30000
-STACK=0x600
-fi
diff --git a/ld/emulparams/score3_elf.sh b/ld/emulparams/score3_elf.sh
new file mode 100644
index 0000000..4636cd3
--- /dev/null
+++ b/ld/emulparams/score3_elf.sh
@@ -0,0 +1,33 @@
+MACHINE=
+SCRIPT_NAME=elf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=scoreelf
+OUTPUT_FORMAT="elf32-bigscore"
+BIG_OUTPUT_FORMAT="elf32-bigscore"
+LITTLE_OUTPUT_FORMAT="elf32-littlescore"
+NO_RELA_RELOCS=yes
+GROUP="-lm -lc -lglsim -lgcc -lstdc++"
+
+TEXT_START_ADDR=0x00000000
+MAXPAGESIZE=256
+NONPAGED_TEXT_START_ADDR=0x0400000
+SHLIB_TEXT_START_ADDR=0x5ffe0000
+OTHER_GOT_SYMBOLS='
+  _gp = ALIGN(16) + 0x3ff0;
+'
+
+OTHER_BSS_START_SYMBOLS='_bss_start__ = . + ALIGN(4);'
+OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
+DATA_START_SYMBOLS='_fdata = . ;'
+SDATA_START_SYMBOLS='_sdata_begin = . ;'
+OTHER_BSS_SYMBOLS='
+  _bss_start = ALIGN(4) ;
+'
+# This sets the stack to the top of the simulator memory (2^19 bytes).
+STACK_ADDR=0x8000000
+
+ARCH=score3
+MACHINE=
+ENTRY=_start
+EMBEDDED=yes
+GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/score7_elf.sh b/ld/emulparams/score7_elf.sh
new file mode 100644
index 0000000..9b7ce9b
--- /dev/null
+++ b/ld/emulparams/score7_elf.sh
@@ -0,0 +1,2 @@
+. ${srcdir}/emulparams/score3_elf.sh
+ARCH=score7
diff --git a/ld/emulparams/scoreelf.sh b/ld/emulparams/scoreelf.sh
deleted file mode 100644
index 3a7ed31..0000000
--- a/ld/emulparams/scoreelf.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-MACHINE=
-SCRIPT_NAME=elf
-TEMPLATE_NAME=elf32
-EXTRA_EM_FILE=scoreelf
-OUTPUT_FORMAT="elf32-bigscore"
-BIG_OUTPUT_FORMAT="elf32-bigscore"
-LITTLE_OUTPUT_FORMAT="elf32-littlescore"
-NO_RELA_RELOCS=yes
-GROUP="-lm -lc -lglsim -lgcc -lstdc++"
-
-TEXT_START_ADDR=0x00000000
-MAXPAGESIZE=256
-NONPAGED_TEXT_START_ADDR=0x0400000
-SHLIB_TEXT_START_ADDR=0x5ffe0000
-OTHER_GOT_SYMBOLS='
-  _gp = ALIGN(16) + 0x3ff0;
-'
-
-OTHER_BSS_START_SYMBOLS='_bss_start__ = . + ALIGN(4);'
-OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
-DATA_START_SYMBOLS='_fdata = . ;'
-SDATA_START_SYMBOLS='_sdata_begin = . ;'
-OTHER_BSS_SYMBOLS='
-  _bss_start = ALIGN(4) ;
-'
-# This sets the stack to the top of the simulator memory (2^19 bytes).
-STACK_ADDR=0x8000000
-
-SCORE_NAME=${EMULATION_NAME}
-if [ "${SCORE_NAME}" = "score3_elf" ] ; then
-ARCH=score3
-fi
-
-if [ "${SCORE_NAME}" = "score7_elf" ] ; then
-ARCH=score7
-fi
-
-MACHINE=
-ENTRY=_start
-EMBEDDED=yes
-GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/genscripts.sh b/ld/genscripts.sh
index 4436070..499607a 100755
--- a/ld/genscripts.sh
+++ b/ld/genscripts.sh
@@ -33,8 +33,7 @@
 #          enable_initfini_array \
 #          this_emulation \
 # optional:
-#          tool_dir \
-#          customizer_script
+#          tool_dir
 #
 # Sample usage:
 #
@@ -93,14 +92,9 @@ use_sysroot=$1
 ENABLE_INITFINI_ARRAY=$2
 EMULATION_NAME=$3
 TOOL_LIB=$4
-CUSTOMIZER_SCRIPT=$5
-
-if [ "x${CUSTOMIZER_SCRIPT}" = "x" ] ; then
-  CUSTOMIZER_SCRIPT=${EMULATION_NAME}
-fi
-CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${CUSTOMIZER_SCRIPT}.sh"
 
 # Include the emulation-specific parameters:
+CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${EMULATION_NAME}.sh"
 . ${CUSTOMIZER_SCRIPT}
 
 if test -d ldscripts; then

-- 
Alan Modra
Australia Development Lab, IBM

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds
  2014-06-02  6:30             ` [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds Alan Modra
@ 2014-06-02 17:28               ` Hans-Peter Nilsson
  0 siblings, 0 replies; 19+ messages in thread
From: Hans-Peter Nilsson @ 2014-06-02 17:28 UTC (permalink / raw)
  To: amodra; +Cc: binutils

> From: Alan Modra <amodra@gmail.com>
> Date: Mon, 2 Jun 2014 08:30:29 +0200

> bfin, msp, and score all used an extra parameter to genscripts.sh
> to select a "customizer_script" different from the standard one
> named from the emulation.  Which is why your 2014-05-28 patch caused
> http://lists.gnu.org/archive/html/bug-binutils/2014-06/msg00001.html
> This patch renames the scripts to avoid the need of a
> customizer_script param, tidying them in the process.

Thanks for fixing this, I missed that.  It certainly seems the
right solution.

brgds, H-P

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: Require GNU make?
  2014-05-29 10:08             ` Require GNU make? (was: Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds) Pedro Alves
  2014-05-29 12:54               ` Require GNU make? Richard Earnshaw
@ 2014-06-04 18:33               ` Tom Tromey
  1 sibling, 0 replies; 19+ messages in thread
From: Tom Tromey @ 2014-06-04 18:33 UTC (permalink / raw)
  To: Pedro Alves; +Cc: Hans-Peter Nilsson, binutils

>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:

Pedro> I was kind of hoping binutils would start requiring it, so
Pedro> we could use it as excuse for GDB to require it as well.  :-)

FWIW, to do actual development on gdb, you pretty much need GNU make --
dependency tracking only works with GNU make.

I think the argument for Makefile portability was pretty strong 15 years
ago, but isn't very important now.  I'm in favor of switching.

Tom

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2014-06-04 18:33 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-19 22:48 [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds Hans-Peter Nilsson
2014-05-20  9:21 ` Alan Modra
2014-05-20 11:23   ` Hans-Peter Nilsson
2014-05-20 12:36     ` Alan Modra
2014-05-20 16:20       ` Hans-Peter Nilsson
2014-05-22  8:02         ` Alan Modra
2014-05-28 13:16         ` Hans-Peter Nilsson
2014-05-28 14:15           ` Alan Modra
2014-05-29 10:08             ` Require GNU make? (was: Re: [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds) Pedro Alves
2014-05-29 12:54               ` Require GNU make? Richard Earnshaw
2014-05-29 13:09                 ` Ralf Corsepius
2014-05-29 13:23                   ` Richard Earnshaw
2014-05-29 16:09                     ` ISHIKAWA,chiaki
2014-05-29 22:17                       ` Pedro Alves
2014-05-29 22:23                         ` Joel Brobecker
2014-05-29 15:32                   ` Jeff Law
2014-06-04 18:33               ` Tom Tromey
2014-06-02  6:30             ` [RFA:] fix PR ld/16963, missing SEARCH_DIR for non-sysroot cross-builds Alan Modra
2014-06-02 17:28               ` Hans-Peter Nilsson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).