diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-04-07 06:54:35 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-04-07 06:54:35 -0700 |
| commit | 585cb40c2abb8d9cfb5cc8ac158878eb8d587e6a (patch) | |
| tree | ade736b980423a672af8c658010465bcf481cdb9 | |
| parent | 215c0b332083c717b94b4a204294027971fb43c5 (diff) | |
| download | binutils-gdb-users/hjl/help.tar.gz | |
Add elf-options.ousers/hjl/help
| -rw-r--r-- | ld/Makefile.am | 7 | ||||
| -rw-r--r-- | ld/Makefile.in | 9 | ||||
| -rw-r--r-- | ld/configure.tgt | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/ld/Makefile.am b/ld/Makefile.am index 80c748755c6..8a642ee6b62 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -501,7 +501,8 @@ ALL_64_EMULATIONS = $(ALL_64_EMULATION_SOURCES:.c=.@OBJEXT@) ALL_EMUL_EXTRA_OFILES = \ deffilep.@OBJEXT@ \ - pe-dll.@OBJEXT@ + pe-dll.@OBJEXT@ \ + elf-options.@OBJEXT@ ALL_64_EMUL_EXTRA_OFILES = \ pep-dll.@OBJEXT@ @@ -509,7 +510,7 @@ ALL_64_EMUL_EXTRA_OFILES = \ CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ mri.c ldcref.c pe-dll.c pep-dll.c ldlex-wrapper.c \ - $(PLUGIN_C) ldbuildid.c + $(PLUGIN_C) ldbuildid.c elf-options.c HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h \ ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \ @@ -1992,7 +1993,7 @@ eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \ # We need this for automake to use YLWRAP. EXTRA_ld_new_SOURCES = deffilep.y ldlex.l # Allow dependency tracking to work for these files, too. -EXTRA_ld_new_SOURCES += pep-dll.c pe-dll.c +EXTRA_ld_new_SOURCES += pep-dll.c pe-dll.c elf-options.c ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c $(PLUGIN_C) \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 81159cb851a..0bc910a3b17 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -825,7 +825,8 @@ ALL_64_EMULATION_SOURCES = \ ALL_64_EMULATIONS = $(ALL_64_EMULATION_SOURCES:.c=.@OBJEXT@) ALL_EMUL_EXTRA_OFILES = \ deffilep.@OBJEXT@ \ - pe-dll.@OBJEXT@ + pe-dll.@OBJEXT@ \ + elf-options.@OBJEXT@ ALL_64_EMUL_EXTRA_OFILES = \ pep-dll.@OBJEXT@ @@ -833,7 +834,7 @@ ALL_64_EMUL_EXTRA_OFILES = \ CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ mri.c ldcref.c pe-dll.c pep-dll.c ldlex-wrapper.c \ - $(PLUGIN_C) ldbuildid.c + $(PLUGIN_C) ldbuildid.c elf-options.c HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h \ ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \ @@ -870,7 +871,8 @@ ELF_GEN_DEPS = $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em # Dependency tracking for the generated emulation files. EXTRA_ld_new_SOURCES = deffilep.y ldlex.l pep-dll.c pe-dll.c \ - $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES) + elf-options.c $(ALL_EMULATION_SOURCES) \ + $(ALL_64_EMULATION_SOURCES) ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c $(PLUGIN_C) \ ldbuildid.c @@ -1326,6 +1328,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pe_posix.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pep.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-options.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elnk960.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/em32relf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/em32relf_linux.Po@am__quote@ diff --git a/ld/configure.tgt b/ld/configure.tgt index 4a45f14e858..61040a40a4d 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -791,6 +791,12 @@ z8k-*-coff) targ_emul=z8002; targ_extra_emuls=z8001 esac +case "${targ_emul} ${targ_extra_emuls}" in +*elf*) + targ_extra_ofiles="$targ_extra_ofiles elf-options.o" + ;; +esac + NATIVE_LIB_DIRS='/usr/local/lib /lib /usr/lib' case "${target}" in |