m32rx -> cygnus sanitization changes.

4 files changed, 12 insertions, 94 deletions

diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index c3f4e51..4faaeec 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -210,7 +210,7 @@ else
 	done
 fi
 
-cygnus_files="tc-mips.c tc-hppa.c tc-mn10300.c"
+cygnus_files="tc-mips.c tc-hppa.c tc-mn10300.c tc-m32r.c tc-m32r.h"
 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
@@ -323,60 +323,6 @@ else
 	done
 fi
 
-m32rx_files="tc-m32r.c tc-m32r.h"
-if ( echo $* | grep keep\-m32rx > /dev/null ) ; then
-	for i in $m32rx_files ; do
-		if test ! -d $i && (grep sanitize\-m32rx $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping m32rx stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $m32rx_files ; do
-		if test -r $i && (grep sanitize\-m32rx $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"m32rx\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-m32rx/,/end\-sanitize\-m32rx/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\-phase2\-m32rx > /dev/null ) ; then
-	for i in $m32rx_files ; do
-		if test ! -d $i && (grep sanitize\-phase2\-m32rx $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping m32rx stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $m32rx_files ; do
-		if test -r $i && (grep sanitize\-phase2\-m32rx $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"m32rx\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-phase2\-m32rx/,/end\-sanitize\-phase2\-m32rx/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
-
 vr4xxx_files="tc-mips.c"
 if ( echo $* | grep keep\-vr4xxx > /dev/null ) ; then
 	for i in $vr4xxx_files ; do
diff --git a/gas/doc/.Sanitize b/gas/doc/.Sanitize
index 848c29f..a58e98e 100644
--- a/gas/doc/.Sanitize
+++ b/gas/doc/.Sanitize
@@ -60,23 +60,23 @@ Things-to-lose:
 
 Do-last:
 
-m32rx_files="c-m32r.texi as.texinfo"
-if ( echo $* | grep keep\-m32rx > /dev/null ) ; then
-	for i in $m32rx_files ; do
-		if test ! -d $i && (grep sanitize-m32rx $i > /dev/null) ; then
+cygnus_files="c-m32r.texi as.texinfo"
+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 m32rx stuff in $i
+				echo Keeping cygnus stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $m32rx_files ; do
-		if test ! -d $i && (grep sanitize-m32rx $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 \"m32rx\" from $i...
+				echo Removing traces of \"cygnus\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-m32rx/,/end-\sanitize\-m32rx/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/doc/c-m32r.texi b/gas/doc/c-m32r.texi
index bef9aac..998d533 100644
--- a/gas/doc/c-m32r.texi
+++ b/gas/doc/c-m32r.texi
@@ -11,7 +11,7 @@
 @chapter M32R Dependent Features
 @end ifclear
 
-@c start-sanitize-m32rx
+@c start-sanitize-cygnus
 
 @cindex M32R support
 @menu
@@ -134,4 +134,4 @@ For example these code fragments will produce this message:
 @samp{cmp r1, r2 || addx r3, r4} (Both write to the condition bit)
 
 @end table
-@c end-sanitize-m32rx
+@c end-sanitize-cygnus
diff --git a/gas/testsuite/.Sanitize b/gas/testsuite/.Sanitize
index 49b4030..1de6b41 100644
--- a/gas/testsuite/.Sanitize
+++ b/gas/testsuite/.Sanitize
@@ -240,34 +240,6 @@ else
 	done
 fi
 
-m32rx_files="ChangeLog"
-if ( echo $* | grep keep\-m32rx > /dev/null ) ; then
-	for i in $m32rx_files ; do
-		if test ! -d $i && (grep sanitize-m32rx $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping m32rx stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $m32rx_files ; do
-		if test ! -d $i && (grep sanitize-m32rx $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"m32rx\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-m32rx/,/end-\sanitize\-m32rx/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