Remove m32r sanitization.

diff --git a/binutils/testsuite/binutils-all/.Sanitize b/binutils/testsuite/binutils-all/.Sanitize
index 126573e0210849610b02d655e6256199171addf3..3f2aa0507347599157759657ec5222bccf68edbb 100644 (file)
--- a/binutils/testsuite/binutils-all/.Sanitize
+++ b/binutils/testsuite/binutils-all/.Sanitize
@@ -77,40 +77,7 @@ else
 fi
 
 if [ -n "${verbose}" ] ; then
-       echo Processing \"m32r\"...
-fi
-
-m32r_files="objdump.exp"
-
-if ( echo $* | grep keep\-m32r > /dev/null ) ; then
-       for i in $m32r_files ; do
-               if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping m32r stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in * ; do
-               if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"m32r\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-m32r/,/end-\sanitize\-m32r/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 [ -n "${verbose}" ] ; then
-       echo Processing \"m32r\"...
+       echo Processing \"d30v\"...
 fi
 
 d30v_files="objdump.exp"

diff --git a/ld/.Sanitize b/ld/.Sanitize
index 5d5a4fc2ac9bc57ec213bb0bd9634779d5bc1050..443020ea1881ff9098465f51e54ec4f42fdc02fe 100644 (file)
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -115,35 +115,6 @@ else
        done
 fi
 
-m32r_files="ChangeLog configure.tgt Makefile.in"
-
-if ( echo $* | grep keep\-m32r > /dev/null ) ; then
-       for i in $m32r_files ; do
-               if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping m32r stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in $m32r_files ; do
-               if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"m32r\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-m32r/,/end-\sanitize\-m32r/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
-
 v850_files="ChangeLog configure.tgt Makefile.in"
 
 if ( echo $* | grep keep\-v850 > /dev/null ) ; then

diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index 3e3505e760b5a1a193177af6fcca2070baae7729..3e6c2faea613461a395b8b01e44638adc21a800b 100644 (file)
--- a/ld/emulparams/.Sanitize
+++ b/ld/emulparams/.Sanitize
@@ -31,14 +31,6 @@ else
        lose_these_too="${d30v_files} ${lose_these_too}"
 fi
 
-m32r_files="m32relf.sh"
-
-if ( echo $* | grep keep\-m32r > /dev/null ) ; then
-       keep_these_too="${m32r_files} ${keep_these_too}"
-else
-       lose_these_too="${m32r_files} ${lose_these_too}"
-fi
-
 tic80_files="tic80coff.sh"
 
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
@@ -115,6 +107,7 @@ i386nbsd.sh
 i386nw.sh
 i386pe.sh
 lnk960.sh
+m32relf.sh
 m68k4knbsd.sh
 m68kaout.sh
 m68kaux.sh