Fix .Sanitize scrips so that r16 is truly scrubbed out.

Also, report errors if any traces of sanitize remain after sanitizing.

diff --git a/.Sanitize b/.Sanitize
index 26787c6e79448aca20ef3aa3965457e755407ddb..402d92618aed1caa00c37aee6e3cb36243ccd406 100644 (file)
--- 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 3cbe36b885c2fcc6b477d38063c0363086af356c..3391b0a7fa363eebe80e9114b02ded9a10027d50 100644 (file)
--- 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 cb0fba5bc6a3a16bf2da497948efb447be1a911e..78022e57cfb5ebc4f056b9f48e73d281c424afa7 100644 (file)
--- 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 83c73b45616e32b98c50c37fc5ff3faa51a9cd06..8270e39d4dc6555d5db5f9a01565a734cd2c0db7 100644 (file)
--- 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.