Re: bug in binutils master specific to msp430-elf

[Alan Modra]

On Sun, Jun 01, 2014 at 07:54:58PM -0500, Peter Bigot wrote:
> 77ac17b8453f60adabaa8931930e2bbe0499757d is the first bad commit
> commit 77ac17b8453f60adabaa8931930e2bbe0499757d
> Author: Hans-Peter Nilsson <address@hidden>
> Date:   Wed May 28 18:20:16 2014 +0200
> 
>     ld: Split GENSCRIPTS rule from dependencies to fix tdir_'s.
> 
>         * 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.

It's because msp, along with bfin and score, take an extra argument to
the genscript invocation.  I think the following should cure the
problem you're seeing, but it leads to a bunch of warnings

Makefile:2400: warning: overriding commands for target `eelf32bfin.c'
Makefile:2105: warning: ignoring old commands for target `eelf32bfin.c'
Makefile:2406: warning: overriding commands for target `eelf32bfinfd.c'
Makefile:2105: warning: ignoring old commands for target `eelf32bfinfd.c'
Makefile:2940: warning: overriding commands for target `emsp430.c'
Makefile:2105: warning: ignoring old commands for target `emsp430.c'
Makefile:2945: warning: overriding commands for target `emsp430X.c'
Makefile:2105: warning: ignoring old commands for target `emsp430X.c'
Makefile:3048: warning: overriding commands for target `escore3_elf.c'
Makefile:2105: warning: ignoring old commands for target `escore3_elf.c'
Makefile:3053: warning: overriding commands for target `escore7_elf.c'
Makefile:2105: warning: ignoring old commands for target `escore7_elf.c'

I think I'll look at a different solution, renaming some ld/emulparams
files instead.

        * Makefile.am: Revert 2014-05-28 change for bfin, msp and score.
        * Makefile.in: Regenerate.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index d66801b..18e4845 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -945,11 +945,13 @@ eelf32b4300.c: $(srcdir)/emulparams/elf32b4300.sh \
 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}
@@ -1483,10 +1485,12 @@ emn10300.c: $(srcdir)/emulparams/mn10300.sh \
 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 \
@@ -1589,10 +1593,12 @@ eriscix.c: $(srcdir)/emulparams/riscix.sh \
 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}


-- 
Alan Modra
Australia Development Lab, IBM