remove d30v sanitization

4 files changed, 13 insertions, 86 deletions

diff --git a/.Sanitize b/.Sanitize
index f416299..7db6ade 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -248,39 +248,6 @@ else
 fi
 
 if [ -n "${verbose}" ] ; then
-	echo Processing \"d30v\"...
-fi
-
-d30v_files="ChangeLog config.sub configure.in"
-
-if ( echo $* | grep keep\-d30v > /dev/null ) ; then
-	for i in $d30v_files ; do
-		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d30v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d30v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/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
-
-if [ -n "${verbose}" ] ; then
 	echo Processing \"v850\"...
 fi
 
diff --git a/ChangeLog b/ChangeLog
index 775ac5a..ae76e1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -209,9 +209,7 @@ Wed Apr 22 12:30:10 1998  Michael Meissner  <meissner@cygnus.com>
 	use -Os to compile target libraries rather than -O2.  Default to
 	using -Os for d10v and m32r if --{enable,disable}-target-optspace is
 	not used.
-start-sanitize-d30v
 	* configure.in (target_cflags): Ditto for d30v.
-end-sanitize-d30v
 
 Tue Apr 21 23:06:54 1998  Tom Tromey  <tromey@cygnus.com>
 
@@ -556,12 +554,10 @@ Wed Dec 17 11:27:59 1997  Ian Lance Taylor  <ian@cygnus.com>
 	* configure: Only put libide in GDB_TK if --enable-ide.
 
 end-sanitize-ide
-start-sanitize-d30v
 Wed Dec 17 09:53:02 1997  Michael Meissner  <meissner@cygnus.com>
 
 	* configure.in (d30v-*-*): Allow configuring of libide, vmake, etc.
 
-end-sanitize-d30v
 Tue Dec 16 17:36:05 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* Makefile.in: Add libgui directory.
@@ -627,7 +623,6 @@ Mon Nov 10 15:23:21 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
 	* ltmain.sh: If mkdir fails, check whether the directory was created
 	anyhow by some other process.
 
-start-sanitize-d30v
 Mon Nov 10 14:38:03 1997  Michael Meissner  <meissner@cygnus.com>
 
 	* configure.in (d30v-*-*): Configure all directories.
@@ -641,7 +636,6 @@ Sat Nov  8 14:42:59 1997  Michael Meissner  <meissner@cygnus.com>
 
 	* configure.in (d30v-*-*): Configure target-libgloss on the D30V.
 
-end-sanitize-d30v
 Fri Nov  7 10:34:09 1997  Rob Savoye  <rob@darkstar.cygnus.com>
 
         * include/libiberty.h: Add extern "C" { so it can be used with C++
@@ -663,12 +657,10 @@ Wed Nov  5 11:14:44 1997  Gavin Koch  <gavin@cygnus.com>
 	with gcc/config.sub.
 
 end-sanitize-tx49
-start-sanitize-d30v
 Thu Oct 30 11:09:29 1997  Michael Meissner  <meissner@cygnus.com>
 
 	* configure.in (d30v-*-*): Configure GCC now.
 
-end-sanitize-d30v
 start-sanitize-tx49
 Wed Oct 29 16:52:43 1997  Gavin Koch  <gavin@cygnus.com>
 
@@ -726,13 +718,11 @@ Wed Oct  1 13:11:27 1997  Ian Lance Taylor  <ian@cygnus.com>
 	infodir, libdir, libexecdir, localstatedir, mandir, oldincludedir,
 	sbindir, sharedstatedir, and sysconfdir.
 
-start-sanitize-d30v	
 Wed Sep 24 18:06:27 1997  Stu Grossman  <grossman@babylon-5.cygnus.com>
 
 	* configure.in (d30v):  Remove tcl, tk, expect, gdb, itcl, tix, db,
  	sn, and gnuserv from noconfigdirs.
 
-end-sanitize-d30v	
 Wed Sep 24 15:18:32 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ltmain.sh: Tweak shell pattern to avoid bug in NetBSD /bin/sh.
@@ -1297,13 +1287,11 @@ Tue Feb 25 18:46:14 1997  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* config.sub: Accept -lnews*.
 
-start-sanitize-d30v
 Tue Feb 25 13:19:14 1997  Andrew Cagney  <cagney@kremvax.tpgi.com.au>
 
 	* configure.in (noconfigdirs): Disable target-newlib,
  	target-examples and target-libiberty for d30v.
 
-end-sanitize-d30v
 start-sanitize-tic80
 Tue Feb 25 11:41:51 1997  Tom Tromey  <tromey@cygnus.com>
 
@@ -1321,31 +1309,25 @@ Tue Feb 25 11:41:51 1997  Tom Tromey  <tromey@cygnus.com>
 	(CLEAN_MODULES): Added clean-sn.
 
 end-sanitize-tic80
-start-sanitize-d30v
 Fri Feb 21 17:56:25 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* configure.in (noconfigdirs): Enable ld for d30v.
 
-end-sanitize-d30v
 start-sanitize-tic80
 Fri Feb 21 20:58:51 1997  Michael Meissner  <meissner@cygnus.com>
 
 	* configure.in (tic80-*-*): Build compiler.
 
 end-sanitize-tic80
-start-sanitize-d30v
 Sun Feb 16 15:41:09 1997  Andrew Cagney  <cagney@critters.cygnus.com>
 
 	* configure.in (d30v-*): Remove sim directory from list of
  	unsupported d30v directories
 
-end-sanitize-d30v
-start-sanitize-d30v
 Tue Feb 18 17:32:42 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config.sub, configure.in: Add d30v target cpu. 
 	
-end-sanitize-d30v
 Thu Feb 13 22:04:44 1997  Klaus Kaempf  <kkaempf@progis.de>
 
 	* makefile.vms: New file.
diff --git a/config.sub b/config.sub
index 15ef080..ff21ef7 100755
--- a/config.sub
+++ b/config.sub
@@ -81,11 +81,6 @@ case $1 in
 		set mips64tx49-unknown-elf
                 ;;
 # end-sanitize-tx49
-# start-sanitize-vr4111
-	mips-vr4111-elf)
-		set mips64vr4111-unknown-elf
-                ;;
-# end-sanitize-vr4111
 # start-sanitize-vr5400
 	mips64vr5xxx-elf)
 		set mips64vr5000-elf
@@ -144,7 +139,7 @@ case $os in
 		os=-hiuxwe2
 		;;
 	-sco5)
-		os=sco3.2v5
+		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
@@ -194,17 +189,19 @@ case $basic_machine in
 	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 \
 		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 \
 		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
 		| mipstx39 | mipstx39el \
-		| sparc | sparclet | sparclite | sparc64 | v850)
+		| sparc | sparclet | sparclite | sparc64 | sparc86x | v850)
 		basic_machine=$basic_machine-unknown
 		;;
-	m88110 | m680[01234]0 | m683?2 | m68360 | z8k | v70 | h8500 | w65) # CYGNUS LOCAL
+	m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
+		| h8500 | w65) # CYGNUS LOCAL
 		basic_machine=$basic_machine-unknown
 		;;
-	thumb) # CYGNUS LOCAL: angela/thumb
+	thumb)
 		basic_machine=$basic_machine-unknown
 		;;
 # start-sanitize-vr4320
@@ -221,11 +218,6 @@ case $basic_machine in
 	mips64vr5000 | mips64vr5000el) # CYGNUS LOCAL ian/vr5000
 		basic_machine=$basic_machine-unknown
 		;;
-# start-sanitize-vr4111
-	mips64vr4111 | mips64vr4111el)
-		basic_machine=$basic_machine-unknown
-		;;
-# end-sanitize-vr4111
 # start-sanitize-vr5400
 	mips64vr5400)			 # CYGNUS LOCAL cagney/vr5400
 		basic_machine=$basic_machine-unknown
@@ -276,11 +268,9 @@ case $basic_machine in
 	d10v)				# CYGNUS LOCAL meissner/d10v
 		basic_machine=$basic_machine-unknown
 		;;
-# start-sanitize-d30v
 	d30v)				# CYGNUS LOCAL hunt/d30v
 		basic_machine=$basic_machine-unknown
 		;;
-# end-sanitize-d30v
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -298,10 +288,11 @@ case $basic_machine in
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
 	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
-	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
+	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
+	      | xps100-* | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | mips64-* | mipsel-* \
+	      | sparc64-* | sparc86x-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mipstx39-* | mipstx39el-* \
 	      | f301-*)
@@ -322,10 +313,8 @@ case $basic_machine in
 	v850ea-*) # CYGNUS LOCAL
 	        ;;
 # end-sanitize-v850e
-# start-sanitize-d30v
 	d30v-*) # CYGNUS LOCAL
 	        ;;
-# end-sanitize-d30v
 # start-sanitize-vr4320
 	mips64vr4320-* | mips64vr4320el-*)
 		;;
@@ -334,10 +323,6 @@ case $basic_machine in
 		;;
 	mips64vr4100-* | mips64vr4100el-*) # CYGNUS LOCAL jsmith/vr4100
 		;;
-# start-sanitize-vr4111
-	mips64vr4111-* | mips64vr4111el-*)
-		;;
-# end-sanitize-vr4111
 # start-sanitize-tx19
 	mipstx19-* | mipstx19el-*)
 		;;
diff --git a/configure.in b/configure.in
index b4db9fb..f592b84 100644
--- a/configure.in
+++ b/configure.in
@@ -352,14 +352,9 @@ case "${enable_target_optspace}:${target}" in
   yes:*)
     target_makefile_frag="${target_makefile_frag} config/mt-ospace"
     ;;
-  :m32r-* |  :d10v-*)
+  :m32r-* | :d10v-* | :d30v-*)
     target_makefile_frag="${target_makefile_frag} config/mt-ospace"
     ;;
-# start-sanitize-d30v
-  :d30v-*-*)
-    target_makefile_frag="${target_makefile_frag} config/mt-ospace"
-    ;;
-# end-sanitize-d30v
   no:* | :*)
     ;;
   *)
@@ -634,10 +629,8 @@ case "${target}" in
   d10v-*-*)
     noconfigdirs="$noconfigdirs target-librx target-libg++ target-libstdc++ target-libio target-libgloss"
     ;;
-# start-sanitize-d30v
   d30v-*-*)
     ;;
-# end-sanitize-d30v
   h8300*-*-* | \
   h8500-*-*)
     noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"