From 5c680afdc4ad38f0003d859eee11cafa2409ad0e Mon Sep 17 00:00:00 2001
From: Michael Tiemann <tiemann@cygnus>
Date: Thu, 24 Nov 1994 21:36:00 +0000
Subject: [PATCH] Fix .Sanitize scrips so that r16 is truly scrubbed out. Also,
 report errors if any traces of sanitize remain after sanitizing.

---
 .Sanitize         | 29 +++++++++++++++++++++++++++++
 bfd/.Sanitize     | 36 +++++++++++++++++++++++++++++++++++-
 gas/.Sanitize     | 34 ++++++++++++++++++++++++++++++++++
 opcodes/.Sanitize | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 132 insertions(+), 1 deletion(-)

diff --git a/.Sanitize b/.Sanitize
index 26787c6..402d926 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -207,6 +207,35 @@ else
 	done
 fi
 
+r16_files = "config.sub"
+
+if ( echo $* | grep keep\-r16 > /dev/null ) ; then
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping r16 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"r16\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/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
diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 3cbe36b..3391b0a 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -220,7 +220,7 @@ Things-to-lose:
 
 Do-last:
 
-mpwfiles="coffswap.h"
+mpwfiles="ecoffswap.h coffswap.h"
 if ( echo $* | grep keep\-mpw > /dev/null ) ; then
 	if [ -n "${verbose}" ] ; then
 		echo Keeping mpw stuff in $mpwfiles.
@@ -263,4 +263,38 @@ else
 	done
 fi
 
+r16_files = "ChangeLog archures.c config.bfd configure.in targets.c"
+if ( echo $* | grep keep\-r16 > /dev/null ) ; then
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping r16 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"r16\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/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
+	fi
+done
+
 # End of file.
diff --git a/gas/.Sanitize b/gas/.Sanitize
index cb0fba5..78022e5 100644
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -125,5 +125,39 @@ else
 	done
 fi
 
+r16_files = "configure.in"
+if ( echo $* | grep keep\-r16 > /dev/null ) ; then
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping r16 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"r16\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/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
+	fi
+done
+
 #
 # End of file.
diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index 83c73b4..8270e39 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -96,4 +96,38 @@ else
 	done
 fi
 
+r16_files = "configure.in"
+if ( echo $* | grep keep\-r16 > /dev/null ) ; then
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping r16 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"r16\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/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
+	fi
+done
+
 # End of file.
-- 
2.7.4