Add d30v, d10v, tic80 to all_emulations; Add Oct 23 changes to Makefile.in to Makefile.am

3 files changed, 30 insertions, 10 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d7d13a0..11795ab 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,6 +1,16 @@
-start-sanitize-d30v
 Tue Dec  9 15:28:17 1997  Michael Meissner  <meissner@cygnus.com>
 
+	* Makefile.am: Add Oct 23 changes to Makefile.in here.
+
+	* Makefile.{am,in}: (ALL_EMULATIONS): Add ed10velf.o.
+
+start-sanitize-d30v
+	* Makefile.{am,in}: (ALL_EMULATIONS): Add etic80coff.o.
+end-sanitize-tic80
+
+start-sanitize-d30v
+	* Makefile.{am,in}: (ALL_EMULATIONS): Add ed30velf.o.
+
 	* emulparams/d30velf.sh (STACK_START_ADDR): Top of default
 	stack.
 	({TEXT,DATA,EMEM}_SIZE): Sizes of the 3 memory areas.
@@ -18,8 +28,8 @@ Tue Dec  9 15:28:17 1997  Michael Meissner  <meissner@cygnus.com>
 	(.data{,1}/.strings/.rodata{,1}): Put in ${DATA_MEMORY} memory
 	region.
 	(.bss): Put in ${BSS_MEMORY} memory region.
-
 end-sanitize-d30v
+
 Tue Dec  2 10:14:47 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* configure.tgt (targ_extra_emuls): Add support for Thumb target.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index d6d1d16..017ebbd 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -100,6 +100,10 @@ ALL_EMULATIONS = \
 	earmcoff.o \
 	earmpe.o \
 	ecoff_sparc.o \
+	ed10velf.o \
+	$(start-sanitize-d30v) \
+	ed30velf.o \
+	$(end-sanitize-d30v) \
 	edelta68.o \
 	eebmon29k.o \
 	eelf32_sparc.o \
@@ -111,7 +115,6 @@ ALL_EMULATIONS = \
 	eelf32lmip.o \
 	eelf32lppc.o \
 	eelf32ppc.o \
-	eelf64_sparc.o \
 	eelf_i386.o \
 	egld960.o \
 	egld960coff.o \
@@ -175,6 +178,9 @@ ALL_EMULATIONS = \
 	est2000.o \
 	esun3.o \
 	esun4.o \
+	$(start-sanitize-tic80) \
+	etic80coff.o \
+	$(end-sanitize-tic80) \
 	evanilla.o \
 	evax.o \
 	evsta.o \
@@ -183,6 +189,7 @@ ALL_EMULATIONS = \
 	ez8002.o
 
 ALL_64_EMULATIONS = \
+	eelf64_sparc.o \
 	eelf64alpha.o
 
 CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \
@@ -304,7 +311,7 @@ eelf64alpha.c: $(srcdir)/emulparams/elf64alpha.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64alpha "$(tdir_elf64alpha)"
 eelf64_sparc.c: $(srcdir)/emulparams/elf64_sparc.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64_sparc "$(tdir_elf64_sparc)"
 eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -515,11 +522,9 @@ evax.c: $(srcdir)/emulparams/vax.sh \
 evsta.c: $(srcdir)/emulparams/vsta.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} vsta "$(tdir_vsta)"
-start-sanitize-v850:
 ev850.c: $(srcdir)/emulparams/v850.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/v850.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} v850 "$(tdir_v850)"
-end-sanitize-v850:
 ew65.c: $(srcdir)/emulparams/w65.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/w65.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} w65 "$(tdir_w65)"
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 0f6cfc3..3a6084e 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -169,6 +169,10 @@ ALL_EMULATIONS = \
 	earmcoff.o \
 	earmpe.o \
 	ecoff_sparc.o \
+	ed10velf.o \
+	$(start-sanitize-d30v) \
+	ed30velf.o \
+	$(end-sanitize-d30v) \
 	edelta68.o \
 	eebmon29k.o \
 	eelf32_sparc.o \
@@ -180,7 +184,6 @@ ALL_EMULATIONS = \
 	eelf32lmip.o \
 	eelf32lppc.o \
 	eelf32ppc.o \
-	eelf64_sparc.o \
 	eelf_i386.o \
 	egld960.o \
 	egld960coff.o \
@@ -244,6 +247,9 @@ ALL_EMULATIONS = \
 	est2000.o \
 	esun3.o \
 	esun4.o \
+	$(start-sanitize-tic80) \
+	etic80coff.o \
+	$(end-sanitize-tic80) \
 	evanilla.o \
 	evax.o \
 	evsta.o \
@@ -252,6 +258,7 @@ ALL_EMULATIONS = \
 	ez8002.o
 
 ALL_64_EMULATIONS = \
+	eelf64_sparc.o \
 	eelf64alpha.o
 
 CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \
@@ -777,7 +784,7 @@ eelf64alpha.c: $(srcdir)/emulparams/elf64alpha.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64alpha "$(tdir_elf64alpha)"
 eelf64_sparc.c: $(srcdir)/emulparams/elf64_sparc.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64_sparc "$(tdir_elf64_sparc)"
 eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -988,11 +995,9 @@ evax.c: $(srcdir)/emulparams/vax.sh \
 evsta.c: $(srcdir)/emulparams/vsta.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} vsta "$(tdir_vsta)"
-start-sanitize-v850:
 ev850.c: $(srcdir)/emulparams/v850.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/v850.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} v850 "$(tdir_v850)"
-end-sanitize-v850:
 ew65.c: $(srcdir)/emulparams/w65.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/w65.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} w65 "$(tdir_w65)"