From: Gavin Romig-Koch <gavin@redhat.com>
Date: Fri, 6 Mar 1998 21:22:59 +0000 (+0000)
Subject: Scrap the un-needed vr4111 stuff.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e599ab169e9a23bd68ecd195b5097c9f3d0f8944;p=binutils-gdb.git

Scrap the un-needed vr4111 stuff.
---

diff --git a/.Sanitize b/.Sanitize
index efb8379fef2..ef2054471f2 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -459,35 +459,6 @@ else
 	done
 fi
 
-vr4111_files="ChangeLog config.sub"
-
-if ( echo $* | grep keep\-vr4111 > /dev/null ) ; then
-	for i in $vr4111_files ; do
-		if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping vr4111 stuff in $i
-			fi
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"vr4111\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-vr4111/,/end-\sanitize\-vr4111/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\-ide > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
diff --git a/gas/.Sanitize b/gas/.Sanitize
index 1c49c5c598f..a4d57b90813 100644
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -430,34 +430,6 @@ else
 	done
 fi
 
-vr4111_files="ChangeLog"
-if ( echo $* | grep keep\-vr4111 > /dev/null ) ; then
-	for i in $vr4111_files ; do
-		if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping vr4111 stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $vr4111_files ; do
-		if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"vr4111\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-vr4111/,/end-\sanitize\-vr4111/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
-
 vr4320_files="ChangeLog"
 if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then
 	for i in $vr4320_files ; do
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 76b38975f2a..c1239de1883 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -703,13 +703,6 @@ Thu Jan 15 13:46:48 1998  Richard Henderson  <rth@cygnus.com>
 	account when attempting to match a register name.
 	* tc-h8500.c (parse_reg): Likewise.
 
-start-sanitize-vr4111
-Thu Jan 15 09:33:11 1998  Gavin Koch  <gavin@cygnus.com>
-
-	* config/tc-mips.c (md_begin): Create the vr4111 as a copy of
-	the vr4100.
-
-end-sanitize-vr4111
 Wed Jan 14 17:52:33 1998  Nick Clifton  <nickc@cygnus.com>
 
 start-sanitize-m32rx
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index f5870a614aa..6ff4be088aa 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -440,34 +440,6 @@ else
 	done
 fi
 
-vr4111_files="tc-mips.c"
-if ( echo $* | grep keep\-vr4111 > /dev/null ) ; then
-	for i in $vr4111_files ; do
-		if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping vr4111 stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $vr4111_files ; do
-		if test -r $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"vr4111\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-vr4111/,/end\-sanitize\-vr4111/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
-
 vr4320_files="tc-mips.c"
 if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then
 	for i in $vr4320_files ; do
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 33c9e9a96c6..739bcc9f517 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -897,11 +897,7 @@ md_begin ()
 	mips_cpu = 4320;
 
       /* end-sanitize-vr4320 */
-      else if (strcmp (cpu, "mips64vr4100") == 0
-	       /* start-sanitize-vr4111 */
-	       || strcmp (cpu, "mips64vr4111") == 0
-               /* end-sanitize-vr4111 */
-	       )
+      else if (strcmp (cpu, "mips64vr4100") == 0)
         mips_cpu = 4100;
 
       else if (strcmp (cpu, "r4010") == 0)
diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 0249433cbaf..0ec485c3904 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -782,33 +782,6 @@ else
 	done
 fi
 
-if ( echo $* | grep keep\-vr4111 > /dev/null ) ; then
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping vr4111 stuff in $i
-			fi
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"vr4111\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-vr4111/,/end-\sanitize\-vr4111/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\-ide > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 5b73f43faa3..09e5d48e0be 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -176,9 +176,6 @@ mips64*vr4300*-*-elf*)	gdb_target=vr4300 ;;
 mips64*vr4320*-*-elf)   gdb_target=vr4xxx ;;
 mips64*vr4100*el-*-elf*)	gdb_target=vr4300el ;;
 mips64*vr4100*-*-elf*)	gdb_target=vr4xxx ;;
-# start-sanitize-vr4111
-mips64*vr4111*el-*-elf*)gdb_target=vr4300el ;;
-# end-sanitize-vr4111
 mips64*vr5000*el-*-elf*)	gdb_target=vr5000el ;;
 mips64*vr5000*-*-elf*)	gdb_target=vr5000
 		configdirs="${configdirs} gdbserver" ;;