From 330b17b30f85b091a214c2987de5dfef1e9733ac Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 26 Feb 2015 13:01:50 +1030 Subject: [PATCH] Fix recent h8300 configury changes * Makefile.am (ALL_EMULATION_SOURCES): Sort new h8300 entries. (eh8300elf_linux.c, eh8300helf_linux.c, eh8300self_linux.c, eh8300sxelf_linux.c): Do not invoke genscripts here. * Makefile.in: Regenerate. --- ld/ChangeLog | 7 +++++++ ld/Makefile.am | 10 +++------- ld/Makefile.in | 9 +++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index d7c841c..7db30ea 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2015-02-27 Alan Modra + + * Makefile.am (ALL_EMULATION_SOURCES): Sort new h8300 entries. + (eh8300elf_linux.c, eh8300helf_linux.c, eh8300self_linux.c, + eh8300sxelf_linux.c): Do not invoke genscripts here. + * Makefile.in: Regenerate. + 2015-02-24 Nick Clifton * Makefile.am (ev850.c): Add dependency upon diff --git a/ld/Makefile.am b/ld/Makefile.am index 58daa41..22b0419 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -284,12 +284,12 @@ ALL_EMULATION_SOURCES = \ egld960coff.c \ eh8300.c \ eh8300elf.c \ + eh8300elf_linux.c \ eh8300h.c \ eh8300helf.c \ - eh8300elf_linux.c \ + eh8300helf_linux.c \ eh8300hn.c \ eh8300hnelf.c \ - eh8300helf_linux.c \ eh8300s.c \ eh8300self.c \ eh8300self_linux.c \ @@ -297,9 +297,9 @@ ALL_EMULATION_SOURCES = \ eh8300snelf.c \ eh8300sx.c \ eh8300sxelf.c \ + eh8300sxelf_linux.c \ eh8300sxn.c \ eh8300sxnelf.c \ - eh8300sxelf_linux.c \ eh8500.c \ eh8500b.c \ eh8500c.c \ @@ -1311,7 +1311,6 @@ eh8300elf.c: $(srcdir)/emulparams/h8300elf.sh \ eh8300elf_linux.c: $(srcdir)/emulparams/h8300elf_linux.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} h8300elf_linux "$(tdir_h8300elf)" eh8300h.c: $(srcdir)/emulparams/h8300h.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS} @@ -1323,7 +1322,6 @@ eh8300helf.c: $(srcdir)/emulparams/h8300helf.sh \ eh8300helf_linux.c: $(srcdir)/emulparams/h8300helf_linux.sh \ $(srcdir)/emulparams/h8300elf_linux.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} h8300helf_linux "$(tdir_h8300helf)" eh8300hn.c: $(srcdir)/emulparams/h8300hn.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300hn.sc ${GEN_DEPENDS} @@ -1342,7 +1340,6 @@ eh8300self.c: $(srcdir)/emulparams/h8300self.sh \ eh8300self_linux.c: $(srcdir)/emulparams/h8300self_linux.sh \ $(srcdir)/emulparams/h8300elf.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} h8300self_linux "$(tdir_h8300self)" eh8300sn.c: $(srcdir)/emulparams/h8300sn.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sn.sc ${GEN_DEPENDS} @@ -1361,7 +1358,6 @@ eh8300sxelf.c: $(srcdir)/emulparams/h8300sxelf.sh \ eh8300sxelf_linux.c: $(srcdir)/emulparams/h8300sxelf_linux.sh \ $(srcdir)/emulparams/h8300elf.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} h8300sxelf_linux "$(tdir_h8300sxelf)" eh8300sxn.c: $(srcdir)/emulparams/h8300sxn.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sxn.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 83dc7f1..3236d7e 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -2800,9 +2800,10 @@ eh8300.c: $(srcdir)/emulparams/h8300.sh \ eh8300elf.c: $(srcdir)/emulparams/h8300elf.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + eh8300elf_linux.c: $(srcdir)/emulparams/h8300elf_linux.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} h8300elf_linux "$(tdir_h8300elf)" + eh8300h.c: $(srcdir)/emulparams/h8300h.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS} @@ -2813,7 +2814,7 @@ eh8300helf.c: $(srcdir)/emulparams/h8300helf.sh \ eh8300helf_linux.c: $(srcdir)/emulparams/h8300helf_linux.sh \ $(srcdir)/emulparams/h8300elf_linux.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} h8300helf_linux "$(tdir_h8300helf)" + eh8300hn.c: $(srcdir)/emulparams/h8300hn.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300hn.sc ${GEN_DEPENDS} @@ -2831,7 +2832,7 @@ eh8300self.c: $(srcdir)/emulparams/h8300self.sh \ eh8300self_linux.c: $(srcdir)/emulparams/h8300self_linux.sh \ $(srcdir)/emulparams/h8300elf.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} h8300self_linux "$(tdir_h8300self)" + eh8300sn.c: $(srcdir)/emulparams/h8300sn.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sn.sc ${GEN_DEPENDS} @@ -2849,7 +2850,7 @@ eh8300sxelf.c: $(srcdir)/emulparams/h8300sxelf.sh \ eh8300sxelf_linux.c: $(srcdir)/emulparams/h8300sxelf_linux.sh \ $(srcdir)/emulparams/h8300elf.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} h8300sxelf_linux "$(tdir_h8300sxelf)" + eh8300sxn.c: $(srcdir)/emulparams/h8300sxn.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sxn.sc ${GEN_DEPENDS} -- 2.7.4