From 446df8b8d507381a7c3a9f9929bae5286fb67ff3 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Sun, 21 Sep 1997 01:19:51 +0000
Subject: [PATCH] Removed v850eq sanitization.

---
 gdb/.Sanitize     | 37 +++----------------------------------
 gdb/ChangeLog     |  4 ++--
 gdb/configure.tgt |  4 +---
 3 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index cb5ced0d30..b7aacefd18 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -74,12 +74,6 @@ else
 	fi
 fi
 
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-	keep_these_too="v850-tdep.c v850ice.c ${keep_these_too}"
-else
-	lose_these_too="v850-tdep.c v850ice.c ${lose_these_too}"
-fi
-
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -410,6 +404,8 @@ ultra3-nat.c
 ultra3-xdep.c
 umax-xdep.c
 utils.c
+v850-tdep.c
+v850ice.c
 valarith.c
 valops.c
 valprint.c
@@ -432,8 +428,8 @@ z8k-tdep.c
 
 Things-to-lose:
 
-ser-go32-para.c
 HOW_TO_RELEASE
+ser-go32-para.c
 
 Do-last:
 
@@ -496,33 +492,6 @@ else
 	done
 fi
 
-if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping v850eq stuff in $i
-			fi
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"v850eq\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-v850eq/,/end-\sanitize\-v850eq/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 ( echo $* | grep keep\-v850e > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 024df22bcc..9e88fd4747 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -236,11 +236,11 @@ Mon Aug 18 11:14:15 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* configure.tgt: Add support for v850e target.
 
-start-sanitize-v850eq
+start-sanitize-v850e
 Mon Aug 18 11:14:15 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* configure.tgt: Add support for v850eq target.
-end-sanitize-v850eq
+end-sanitize-v850e
 
 Sun Aug 17 20:31:57 1997  Michael Snyder  (msnyder@cleaver.cygnus.com)
 
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index ad17d88648..cadcf5dc2d 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -281,8 +281,6 @@ v850e-*-*)		gdb_target=v850
 				LIBS="${LIBS} v850.lib" ;;
 			esac
 			;;
-# end-sanitize-v850e
-# start-sanitize-v850eq
 v850eq-*-*)		gdb_target=v850
 			gdb_target_cpu=v850
 			case $gdb_host in
@@ -291,7 +289,7 @@ v850eq-*-*)		gdb_target=v850
 				LIBS="${LIBS} v850.lib" ;;
 			esac
 			;;
-# end-sanitize-v850eq
+# end-sanitize-v850e
 w65-*-*)		gdb_target=w65 ;;
 
 z8k-*-coff*)		gdb_target=z8k ;;