No longer sanitize away h8s stuff.

6 files changed, 3 insertions, 54 deletions

diff --git a/ld/.Sanitize b/ld/.Sanitize
index c63a6f4..3d6589c 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -114,34 +114,6 @@ else
 	done
 fi
 
-h8s_files="ChangeLog Makefile.in configure.tgt"
-if ( echo $* | grep keep\-h8s > /dev/null ) ; then
-	for i in $h8s_files ; do
-		if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping h8s stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $h8s_files ; do
-		if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"h8s\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-h8s/,/end-\sanitize\-h8s/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
-
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4735b29..bde803d 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -134,7 +134,6 @@ Wed Jun 19 11:40:14 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* configure.host (m88*-*-dgux*): Quote HOSTING_CRT0.  From
 	<randall.hron@medaphis.com>.
 
-start-sanitize-h8s
 Tue Jun 18 15:53:09 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
 
 	* scripttempl/h8300s.sc: New file for H8/S.
@@ -143,7 +142,6 @@ Tue Jun 18 15:53:09 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
 	(e_h8300s.c): Add dependencies.
 	* configure.tgt: Add H8/S to targ_extra_emuls.
 
-end-sanitize-h8s
 Tue Jun 18 17:55:39 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.tgt (i[345]86*-*-isc*): New target.  From
diff --git a/ld/Makefile.in b/ld/Makefile.in
index a56bcaf..4c050cf 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -221,9 +221,7 @@ ALL_EMULATIONS = \
 	ego32.o \
 	eh8300.o \
 	eh8300h.o \
-	$(start-sanitize-h8s) \
 	eh8300s.o \
-	$(end-sanitize-h8s) \
 	eh8500.o \
 	eh8500b.o \
 	eh8500c.o \
@@ -430,11 +428,9 @@ eh8300.c: $(srcdir)/emulparams/h8300.sh \
 eh8300h.c: $(srcdir)/emulparams/h8300h.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8300h "$(tdir_h8300h)"
-# start-sanitize-h8s
 eh8300s.c: $(srcdir)/emulparams/h8300s.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300s.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8300s "$(tdir_h8300s)"
-# end-sanitize-h8s
 eh8500.c: $(srcdir)/emulparams/h8500.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8500 "$(tdir_h8500)"
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 1602f5d..1695e6f 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -84,10 +84,7 @@ a29k-*-*)		targ_emul=a29k ;;
 arm-*-aout | armel-*-aout) targ_emul=armaoutl ;;
 armeb-*-aout)		targ_emul=armaoutb ;;
 arm-*-coff)		targ_emul=armcoff ;;
-h8300-*-hms)		targ_emul=h8300; targ_extra_emuls="h8300h"
-#start-sanitize-h8s
-			targ_extra_emuls="h8300h h8300s"
-#end-sanitize-h8s
+h8300-*-hms)		targ_emul=h8300; targ_extra_emuls="h8300h h8300s"
 			;;
 h8500-*-hms)		targ_emul=h8500
 			targ_extra_emuls="h8500s h8500b h8500m h8500c"
diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index da8e516..804a12a 100644
--- a/ld/emulparams/.Sanitize
+++ b/ld/emulparams/.Sanitize
@@ -23,14 +23,6 @@ else
 	lose_these_too="${arc_files} ${lose_these_too}"
 fi
 
-h8s_files="h8300s.sh"
- 
-if ( echo $* | grep keep\-h8s > /dev/null ) ; then
-	keep_these_too="${h8s_files} ${keep_these_too}"
-else
-	lose_these_too="${h8s_files} ${lose_these_too}"
-fi
-
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -66,6 +58,7 @@ gld960coff.sh
 go32.sh
 h8300.sh
 h8300h.sh
+h8300s.sh
 h8500.sh
 h8500b.sh
 h8500c.sh
diff --git a/ld/scripttempl/.Sanitize b/ld/scripttempl/.Sanitize
index 30fd79c..ff7848b 100644
--- a/ld/scripttempl/.Sanitize
+++ b/ld/scripttempl/.Sanitize
@@ -15,14 +15,6 @@
 
 Do-first:
 
-h8s_files="h8300s.sc"
-
-if ( echo $* | grep keep\-h8s > /dev/null ) ; then
-	keep_these_too="${h8s_files} ${keep_these_too}"
-else
-	lose_these_too="${h8s_files} ${lose_these_too}"
-fi
-
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -46,6 +38,7 @@ elfppc.sc
 go32coff.sc
 h8300.sc
 h8300h.sc
+h8300s.sc
 h8500.sc
 h8500b.sc
 h8500c.sc