diff options
| author | Alan Modra <amodra@gmail.com> | 2014-06-02 13:54:54 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2014-06-02 14:52:52 +0930 |
| commit | ce46249c155b7eac6cf1c1f0d148ea7bbb340dca (patch) | |
| tree | e7d42afb7176a437036dd92007fde545fb252e87 /ld/Makefile.in | |
| parent | ad7cf460ea40f0867c3c81ee1c98ba10e20685b4 (diff) | |
| download | gdb-ce46249c155b7eac6cf1c1f0d148ea7bbb340dca.zip gdb-ce46249c155b7eac6cf1c1f0d148ea7bbb340dca.tar.gz gdb-ce46249c155b7eac6cf1c1f0d148ea7bbb340dca.tar.bz2 | |
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.
Diffstat (limited to 'ld/Makefile.in')
| -rw-r--r-- | ld/Makefile.in | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/ld/Makefile.in b/ld/Makefile.in index 42a2cc4..9dd4399 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -2377,12 +2377,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} @@ -2915,13 +2915,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 \ @@ -3021,11 +3019,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} |