sanitize-vr5400 -> sanitize-cygnus, for 98r2

3 files changed, 28 insertions, 23 deletions

diff --git a/gas/testsuite/.Sanitize b/gas/testsuite/.Sanitize
index ef93e49..bf61436 100644
--- a/gas/testsuite/.Sanitize
+++ b/gas/testsuite/.Sanitize
@@ -100,23 +100,23 @@ else
 	done
 fi
 
-vr5400_files="ChangeLog"
-if ( echo $* | grep keep\-vr5400 > /dev/null ) ; then
-	for i in $vr5400_files ; do
-		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
+cygnus_files="ChangeLog"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+	for i in $cygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping vr5400 stuff in $i
+				echo Keeping cygnus stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $vr5400_files ; do
-		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
+	for i in $cygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"vr5400\" from $i...
+				echo Removing traces of \"cygnus\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-vr5400/,/end-\sanitize\-vr5400/d' < $i > new
+			sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
diff --git a/gas/testsuite/gas/mips/.Sanitize b/gas/testsuite/gas/mips/.Sanitize
index 9aab641..b829702 100644
--- a/gas/testsuite/gas/mips/.Sanitize
+++ b/gas/testsuite/gas/mips/.Sanitize
@@ -16,7 +16,7 @@
 Do-first:
 
 vr5400_losers="vr5400.s vr5400.d"
-if ( echo $* | grep keep\-vr5400 > /dev/null ) ; then
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
 	keep_these_too="$keep_these_too $vr5400_losers"
 	if [ -n "${verbose}" ] ; then
 		for i in $vr5400_losers ; do
@@ -268,23 +268,23 @@ else
 	done
 fi
 
-vr5400_files="mips.exp"
-if ( echo $* | grep keep\-vr5400 > /dev/null ) ; then
-	for i in $vr5400_files ; do
-		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
+cygnus_files="mips.exp"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+	for i in $cygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping vr5400 stuff in $i
+				echo Keeping cygnus stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $vr5400_files ; do
-		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
+	for i in $cygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"vr5400\" from $i...
+				echo Removing traces of \"cygnus\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-vr5400/,/end-\sanitize\-vr5400/d' < $i > new
+			sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 4953fc6..e729bde 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -24,10 +24,15 @@ if [istarget mips*-*-*] then {
     set no_mips16 [expr $no_mips16 || [istarget mips64tx49*-*-*]]
 #end-sanitize-tx49
 
-# start-sanitize-vr5400
+# start-sanitize-cygnus
     set ilocks [expr $ilocks || [istarget mips64vr5400*-*-*]]
     set gpr_ilocks [expr $gpr_ilocks || [istarget mips64vr5400*-*-*]]
-# end-sanitize-vr5400
+# end-sanitize-cygnus
+
+# start-sanitize-r5900
+    set ilocks [expr $ilocks || [istarget mips64r5900*-*-*]]
+    set gpr_ilocks [expr $gpr_ilocks || [istarget mips64r5900*-*-*]]
+# end-sanitize-r5900
 
     run_dump_test "abs"
     run_dump_test "add"
@@ -101,9 +106,9 @@ if [istarget mips*-*-*] then {
     if { $svr4pic && !$no_mips16 } { run_dump_test "mips16" }
     run_dump_test "delay"
     run_dump_test "nodelay"
-# start-sanitize-vr5400
+# start-sanitize-cygnus
     run_dump_test "vr5400"
-# end-sanitize-vr5400
+# end-sanitize-cygnus
 # start-sanitize-r5900
     run_dump_test "r5900"
     run_dump_test "vu0"