From 27c3ce29f8920270ca2ed9b533ead5c8ebff215e Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 2 Jan 2017 18:20:20 +0200 Subject: Fix PRU LD for --enable-targets=all config option I noticed that PRU LD is broken when BFD is configured with --enable-targets=all. This patch fixes it, and takes the opportunity to clean the epruelf.c dependencies. * Makefile.am (ALL_EMULATION_SOURCES): Add epruelf.c. (epruelf.c): Remove unneeded dependencies. * Makefile.in: Regenerate Signed-off-by: Dimitar Dimitrov --- ld/ChangeLog | 6 ++++++ ld/Makefile.am | 3 +-- ld/Makefile.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 159b522..1b0e4e0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2017-01-03 Dimitar Dimitrov + + * Makefile.am (ALL_EMULATION_SOURCES): Add epruelf.c. + (epruelf.c): Remove unneeded dependencies. + * Makefile.in: Regenerate + 2017-01-03 Alan Modra * testsuite/ld-elf/shared.exp: Add -rpath-link and -no-as-needed diff --git a/ld/Makefile.am b/ld/Makefile.am index 3a3e34d..5bd0016 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -384,6 +384,7 @@ ALL_EMULATION_SOURCES = \ eppcmacos.c \ eppcnw.c \ eppcpe.c \ + epruelf.c \ eriscix.c \ escore3_elf.c \ escore7_elf.c \ @@ -1708,10 +1709,8 @@ eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/ppcpe.sc ${GEN_DEPENDS} epruelf.c: $(srcdir)/emulparams/pruelf.sh \ - $(srcdir)/emultempl/elf32.em \ $(ELF_DEPS) $(srcdir)/scripttempl/pru.sc \ $(srcdir)/emultempl/pruelf.em ${GEN_DEPENDS} - ${GENSCRIPTS} pruelf "$(tdir_pruelf)" eriscix.c: $(srcdir)/emulparams/riscix.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 9c5f77e..9364402 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -753,6 +753,7 @@ ALL_EMULATION_SOURCES = \ eppcmacos.c \ eppcnw.c \ eppcpe.c \ + epruelf.c \ eriscix.c \ escore3_elf.c \ escore7_elf.c \ @@ -1424,6 +1425,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppcmacos.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppcnw.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppcpe.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epruelf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eriscix.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escore3_elf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escore7_elf.Po@am__quote@ @@ -3270,10 +3272,8 @@ eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/ppcpe.sc ${GEN_DEPENDS} epruelf.c: $(srcdir)/emulparams/pruelf.sh \ - $(srcdir)/emultempl/elf32.em \ $(ELF_DEPS) $(srcdir)/scripttempl/pru.sc \ $(srcdir)/emultempl/pruelf.em ${GEN_DEPENDS} - ${GENSCRIPTS} pruelf "$(tdir_pruelf)" eriscix.c: $(srcdir)/emulparams/riscix.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} -- cgit v1.1