From 1e012223fdd9d1e2c689f467d2619cd5afd35a64 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 14 Aug 1998 19:52:24 +0000 Subject: [PATCH] * Makefile.am: Rebuild dependencies. * Makefile.in: Rebuild. --- ld/ChangeLog | 3 +++ ld/Makefile.am | 11 ++++++++--- ld/Makefile.in | 11 ++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index ce8d936e2a9..627bd8a5b49 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,8 @@ Fri Aug 14 15:34:29 1998 Ian Lance Taylor + * Makefile.am: Rebuild dependencies. + * Makefile.in: Rebuild. + * ldgram.y: Include "ldctor.h". (statement): Accept SORT around CONSTRUCTORS. * ldctor.c: Include . diff --git a/ld/Makefile.am b/ld/Makefile.am index 46dc9090923..76761312d12 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -100,9 +100,11 @@ ALL_EMULATIONS = \ eaixrs6.o \ ealpha.o \ earcelf.o \ + earmelf.o \ earmaoutb.o \ earmaoutl.o \ earmcoff.o \ + earmelf.o \ earmpe.o \ ecoff_sparc.o \ ed10velf.o \ @@ -271,6 +273,9 @@ ealpha.c: $(srcdir)/emulparams/alpha.sh \ earcelf.c: $(srcdir)/emulparams/arcelf.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} arcelf "$(tdir_arcelf)" +earmelf.c: $(srcdir)/emulparams/armelf.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} armelf "$(tdir_armelf)" earmaoutb.c: $(srcdir)/emulparams/armaoutb.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS} ${GENSCRIPTS} armaoutb "$(tdir_armaoutb)" @@ -692,7 +697,7 @@ ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi TEXINPUTS=$(top_srcdir)/../texinfo:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc' $(TEXI2DVI) $(srcdir)/ld.texinfo + MAKEINFO="$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc" $(TEXI2DVI) $(srcdir)/ld.texinfo MAINTAINERCLEANFILES = ldver.texi @@ -716,9 +721,9 @@ install-exec-local: ld-new$(EXEEXT) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done - rm -f $(tooldir)/bin/ld$(EXEEXT) n=`echo ld | sed '$(transform)'`; \ if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \ + rm -f $(tooldir)/bin/ld$(EXEEXT); \ ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT); \ fi @@ -828,7 +833,7 @@ ldcref.o: ldcref.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ ld.h ldexp.h ldver.h ldlang.h ldemul.h ldfile.h ldmisc.h \ - ldmain.h mri.h ldlex.h + ldmain.h mri.h ldctor.h ldlex.h ldlex.o: ldlex.c ../bfd/bfd.h sysdep.h config.h $(INCDIR)/fopen-same.h \ ld.h ldgram.h ldmisc.h ldexp.h ldlang.h ldfile.h ldlex.h \ ldmain.h diff --git a/ld/Makefile.in b/ld/Makefile.in index de24015c57a..ab85776a1be 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -171,9 +171,11 @@ ALL_EMULATIONS = \ eaixrs6.o \ ealpha.o \ earcelf.o \ + earmelf.o \ earmaoutb.o \ earmaoutl.o \ earmcoff.o \ + earmelf.o \ earmpe.o \ ecoff_sparc.o \ ed10velf.o \ @@ -888,6 +890,9 @@ ealpha.c: $(srcdir)/emulparams/alpha.sh \ earcelf.c: $(srcdir)/emulparams/arcelf.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} arcelf "$(tdir_arcelf)" +earmelf.c: $(srcdir)/emulparams/armelf.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} armelf "$(tdir_armelf)" earmaoutb.c: $(srcdir)/emulparams/armaoutb.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS} ${GENSCRIPTS} armaoutb "$(tdir_armaoutb)" @@ -1301,7 +1306,7 @@ ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi TEXINPUTS=$(top_srcdir)/../texinfo:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc' $(TEXI2DVI) $(srcdir)/ld.texinfo + MAKEINFO="$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc" $(TEXI2DVI) $(srcdir)/ld.texinfo # We want to reconfigure if configure.host or configure.tgt changes. config.status: $(srcdir)/configure $(srcdir)/configure.host $(srcdir)/configure.tgt @@ -1319,9 +1324,9 @@ install-exec-local: ld-new$(EXEEXT) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done - rm -f $(tooldir)/bin/ld$(EXEEXT) n=`echo ld | sed '$(transform)'`; \ if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \ + rm -f $(tooldir)/bin/ld$(EXEEXT); \ ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT); \ fi @@ -1425,7 +1430,7 @@ ldcref.o: ldcref.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \ sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h \ ld.h ldexp.h ldver.h ldlang.h ldemul.h ldfile.h ldmisc.h \ - ldmain.h mri.h ldlex.h + ldmain.h mri.h ldctor.h ldlex.h ldlex.o: ldlex.c ../bfd/bfd.h sysdep.h config.h $(INCDIR)/fopen-same.h \ ld.h ldgram.h ldmisc.h ldexp.h ldlang.h ldfile.h ldlex.h \ ldmain.h -- 2.30.2