* configure.tgt (arc-*-elf*): Recognize.

	* Makefile.am (ALL_EMULATIONS): Add earcelf.o.
	* Makefile.in: Regenerate.
	* emulparams/arcelf.sh: New file.
Removes arc sanitization.

5 files changed, 35 insertions, 70 deletions

diff --git a/ld/.Sanitize b/ld/.Sanitize
index e6a05ec..4f4d827 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -89,35 +89,6 @@ Things-to-lose:
 
 Do-last:
 
-arc_files="ChangeLog configure.tgt Makefile.am Makefile.in"
-
-if ( echo $* | grep keep\-arc > /dev/null ) ; then
-	for i in $arc_files ; do
-		if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping arc stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $arc_files ; do
-		if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"arc\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-arc/,/end-\sanitize\-arc/d' < $i > new
-			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				if [ -n "${verbose}" ] ; then
-					echo Caching $i in .Recover...
-				fi
-				mv $i .Recover
-			fi
-			mv new $i
-		fi
-	done
-fi
-
 v850_files="ChangeLog configure.tgt Makefile.am Makefile.in"
 
 if ( echo $* | grep keep\-v850 > /dev/null ) ; then
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0a221e5..97db8bb 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+Thu Aug 28 10:12:10 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* configure.tgt (arc-*-elf*): Recognize.
+	* Makefile.am (ALL_EMULATIONS): Add earcelf.o.
+	* Makefile.in: Regenerate.
+	* emulparams/arcelf.sh: New file.
+
 Wed Aug 20 11:14:13 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ldlang.c (wildcardp): Don't let a backslash by itself cause a
@@ -3339,12 +3346,6 @@ Tue Apr 11 12:02:03 1995  Stan Shebs  <shebs@andros.cygnus.com>
 	* ldlex.l (TRUE_FALSE_ALREADY_DEFINED): If MPW, set this to
 	prevent redefinition errors.
 
-start-sanitize-arc
-Thu Apr  6 20:38:36 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* emulparams/arcelf.sh (ENTRY): Define.
-end-sanitize-arc
-
 Tue Apr  4 17:55:18 1995  Steve Chamberlain  <sac@bang.hack.com>
 
 	* ldwrite.c (clone_section): Align clone sections on even
@@ -3433,13 +3434,6 @@ Thu Mar  9 12:21:51 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
 	bfd_merge_private_bfd_data to let the backend do additional
 	checks.
 
-start-sanitize-arc
-Tue Mar  7 21:10:28 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* emulparams/arcelf.sh (OUTPUT_FORMAT): Change to elf32-littlearc.
-	(LITTLE_OUTPUT_FORMAT, BIG_OUTPUT_FORMAT): Define.
-end-sanitize-arc
-
 Tue Mar  7 00:53:08 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ldemul.c (ldemul_choose_mode): If emulation not recognized, list
@@ -3496,12 +3490,6 @@ Fri Feb 17 13:06:47 1995  Michael Meissner  <meissner@cygnus.com>
 	Offset _GLOBAL_OFFSET_TABLE_ 32768 from the start of the GOT area
 	to double the size of the table.
 
-start-sanitize-arc
-Thu Feb  9 19:03:25 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* emulparms/arcelf.sh (TEMPLATE_NAME): Comment out.
-end-sanitize-arc
-
 Thu Feb  9 18:29:43 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* Makefile.in (distclean): Do recursive deletion, since ldscripts
@@ -3635,15 +3623,6 @@ Mon Dec 19 14:02:13 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
 	* ldwrite.c  (clone_section, split_sections): New functions.
 	* lexsup.c (parse_args): Understand new split options.
 
-start-sanitize-arc
-Tue Dec 13 16:45:18 1994  Doug Evans  <dje@canuck.cygnus.com>
-
-	* configure.in (arc-elf): New target.
-	* Makefile.in (earcelf.c): New target.
-	* config/arc-elf.mt: New file.
-	* emulparms/arcelf.sh: New file.
-end-sanitize-arc
-
 Fri Dec  9 17:22:55 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
 
 	* scripttempl/elf.sc: Move .ctors and .dtors from .text segment to
diff --git a/ld/Makefile.am b/ld/Makefile.am
index aad4d29..5624080 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -94,6 +94,7 @@ ALL_EMULATIONS = \
 	eaixppc.o \
 	eaixrs6.o \
 	ealpha.o \
+	earcelf.o \
 	earmaoutb.o \
 	earmaoutl.o \
 	earmcoff.o \
@@ -237,11 +238,9 @@ eaixrs6.c: $(srcdir)/emulparams/aixrs6.sh \
 ealpha.c: $(srcdir)/emulparams/alpha.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/alpha.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} alpha "$(tdir_alpha)"
-start-sanitize-arc:
 earcelf.c: $(srcdir)/emulparams/arcelf.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} arcelf "$(tdir_arcelf)"
-end-sanitize-arc:
 earmaoutb.c:	$(srcdir)/emulparams/armaoutb.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} armaoutb "$(tdir_armaoutb)"
@@ -628,12 +627,18 @@ configdoc.texi:	${DOCVER}-doc.texi
 	  || ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \
 	  || cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
 
-ld.info: $(srcdir)/ld.texinfo configdoc.texi $(BFDDIR)/doc/bfdsumm.texi
-ld.dvi: $(srcdir)/ld.texinfo configdoc.texi $(BFDDIR)/doc/bfdsumm.texi
+ld.info: $(srcdir)/ld.texinfo configdoc.texi bfdsumm.texi
+ld.dvi: $(srcdir)/ld.texinfo configdoc.texi bfdsumm.texi
+
+# We want to include a file from the BFD documentation.  automake
+# doesn't give us a way to set the include directories for makeinfo,
+# so we just create a file locally to include it.
+bfdsumm.texi: Makefile
+	echo @include $(BFDDIR)/doc/bfdsumm.texi > bfdsumm.texi
 
 MOSTCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
 	ldemul-list.h tmpdir crtbegin.o crtend.o
-CLEANFILES = dep.sed .dep .dep1
+CLEANFILES = dep.sed .dep .dep1 bfdsumm.texi
 DISTCLEANFILES = ldscripts
 
 .PHONY: install-exec-local install-data-local
diff --git a/ld/Makefile.in b/ld/Makefile.in
index e198b03..9417287 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -163,6 +163,7 @@ ALL_EMULATIONS = \
 	eaixppc.o \
 	eaixrs6.o \
 	ealpha.o \
+	earcelf.o \
 	earmaoutb.o \
 	earmaoutl.o \
 	earmcoff.o \
@@ -285,7 +286,7 @@ TESTBFDLIB = ../bfd/.libs/libbfd.a
 
 MOSTCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
 	ldemul-list.h tmpdir crtbegin.o crtend.o
-CLEANFILES = dep.sed .dep .dep1
+CLEANFILES = dep.sed .dep .dep1 bfdsumm.texi
 DISTCLEANFILES = ldscripts
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
@@ -347,7 +348,7 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-config.h: stamp-h ; @true
+config.h: stamp-h ; @:
 stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
@@ -710,11 +711,9 @@ eaixrs6.c: $(srcdir)/emulparams/aixrs6.sh \
 ealpha.c: $(srcdir)/emulparams/alpha.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/alpha.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} alpha "$(tdir_alpha)"
-start-sanitize-arc:
 earcelf.c: $(srcdir)/emulparams/arcelf.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} arcelf "$(tdir_arcelf)"
-end-sanitize-arc:
 earmaoutb.c:	$(srcdir)/emulparams/armaoutb.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} armaoutb "$(tdir_armaoutb)"
@@ -1093,8 +1092,14 @@ configdoc.texi:	${DOCVER}-doc.texi
 	  || ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \
 	  || cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
 
-ld.info: $(srcdir)/ld.texinfo configdoc.texi $(BFDDIR)/doc/bfdsumm.texi
-ld.dvi: $(srcdir)/ld.texinfo configdoc.texi $(BFDDIR)/doc/bfdsumm.texi
+ld.info: $(srcdir)/ld.texinfo configdoc.texi bfdsumm.texi
+ld.dvi: $(srcdir)/ld.texinfo configdoc.texi bfdsumm.texi
+
+# We want to include a file from the BFD documentation.  automake
+# doesn't give us a way to set the include directories for makeinfo,
+# so we just create a file locally to include it.
+bfdsumm.texi: Makefile
+	echo @include $(BFDDIR)/doc/bfdsumm.texi > bfdsumm.texi
 
 .PHONY: install-exec-local install-data-local
 
diff --git a/ld/configure.tgt b/ld/configure.tgt
index e3b2dad..2db72fd 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -12,9 +12,7 @@ targ_extra_emuls=
 
 case "${targ}" in
 arm-*-pe)		targ_emul=armpe ;;
-# start-sanitize-arc
 arc-*-elf*)		targ_emul=arcelf ;;
-# end-sanitize-arc
 d10v-*-*)		targ_emul=d10velf ;;
 # start-sanitize-d30v
 d30v-*-*)		targ_emul=d30velf ;;
@@ -58,6 +56,7 @@ m68*-apple-aux*)	targ_emul=m68kaux ;;
 i[3456]86-*-vsta)	targ_emul=vsta ;;
 i[3456]86-go32-rtems*)	targ_emul=i386go32 ;;
 i[3456]86-*-go32)	targ_emul=i386go32 ;;
+i[3456]86-*-msdosdjgpp*) targ_emul=i386go32 ;;
 i[3456]86-*-aix*)	targ_emul=i386coff ;;
 i[3456]86-*-sco*)	targ_emul=i386coff ;;
 i[3456]86-*-isc*)	targ_emul=i386coff ;;
@@ -193,6 +192,12 @@ tic80-*-*)		targ_emul=tic80coff ;;
 # start-sanitize-v850
 v850-*-*)		targ_emul=v850 ;;
 # end-sanitize-v850
+# start-sanitize-v850e
+v850e-*-*)		targ_emul=v850 ;;
+# end-sanitize-v850e
+# start-sanitize-v850eq
+v850eq-*-*)		targ_emul=v850 ;;
+# end-sanitize-v850eq
 w65-*-*)		targ_emul=w65 ;;
 *-*-aout)		targ_emul=${target_cpu}-${target_vendor} ;;
 *-*-coff)		targ_emul=${target_cpu}-${target_vendor} ;;