From ce46249c155b7eac6cf1c1f0d148ea7bbb340dca Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 2 Jun 2014 13:54:54 +0930 Subject: fix 2014-05-28 ld Makefile.am changes 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. This patch renames the scripts to avoid the need, tidying them in the process. * emulparams/elf32bfin.sh: Rename from bfin.sh. * emulparams/elf32bfinfd.sh: Update to suit. * emulparams/: Delete. * emulparams/msp430.sh: Rename from msp430all.sh. Remove MSP430_NAME and msp430X vars. * emulparams/msp430X.sh: New. * emulparams/: Delete. * 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. --- ld/Makefile.am | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'ld/Makefile.am') 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} -- cgit v1.1