Clean up m32rx sanitization

diff --git a/sim/testsuite/.Sanitize b/sim/testsuite/.Sanitize
index dee604f8879669173b39c99785c5c57b804a7668..e5850165e09d956c305e14038c02678f06edbac8 100644 (file)
--- a/sim/testsuite/.Sanitize
+++ b/sim/testsuite/.Sanitize
@@ -36,10 +36,11 @@ else
         lose_these_too="${sky_files} ${lose_these_too}"
 fi
 
+v850e_files="v850e-elf"
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-       keep_these_too="v850e-elf ${keep_these_too}"
+       keep_these_too="${v850e_files} ${keep_these_too}"
 else
-       lose_these_too="v850e-elf ${lose_these_too}"
+       lose_these_too="${v850e_files} ${lose_these_too}"
 fi
 
 # All files listed between the "Things-to-keep:" line and the
@@ -152,6 +153,34 @@ else
         done
 fi
 
+m32rx_files="configure configure.in 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