Added m32rx sanitization.

diff --git a/gas/.Sanitize b/gas/.Sanitize
index 1bf1dd586ed3e6a2ed2a94918f3fd14203547cfa..0c8d0f7563b292e6ea2bc38c75fec120ffc339c1 100644 (file)
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -347,6 +347,34 @@ else
        done
 fi
 
+m32rx_files="ChangeLog configure.in configure"
+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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1b0c42008173ad5f530183000b09c8e99230b585..500d79dcc873f39ebe16d11f66c034656e28fe3e 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -25,11 +25,13 @@ Mon Dec 15 15:20:32 1997  Nick Clifton  <nickc@cygnus.com>
 
        * doc/c-m32r.texi: New file, documenting m32r specific features.  
 
+start-sanitize-m32rx
        * config/tc-m32r.c (allow_m32rx): New function.
        (enable_m32rx): New variable.
        (md_pseudo_table): Added .m32r and .m32rx pseudo ops
        (md_show_usage): Document new --m32rx command line option.
        (md_parse_option): Implement new --m32rx command line option.
+end-sanitize-m32rx
 
 Mon Dec 15 10:32:28 1997  Jeffrey A Law  (law@cygnus.com)
 

diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index e864da15baf1e055f87680d1556c7f589fd005bd..fe1a6c53ee6013ae504dca42b483b341afd30c14 100644 (file)
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -376,4 +376,38 @@ 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
+
+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/doc/.Sanitize b/gas/doc/.Sanitize
index c7bf5e3a4872e561c094251544b76fd975a450dc..f4798dade226e084d52c619b728a347df5277f78 100644 (file)
--- a/gas/doc/.Sanitize
+++ b/gas/doc/.Sanitize
@@ -82,6 +82,34 @@ else
        done
 fi
 
+m32rx_files="c-m32rx.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
+                       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
+
 # Don't try to clean directories here, as the 'mv' command will fail.
 # Also, grep fails on NFS mounted directories.
 

diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 8432f55a8252d9f85e321a5ca27be343c4a0c4a0..2788d0a9cf2fb17d1e5015698a33307f868089c1 100644 (file)
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -240,9 +240,11 @@ Here is a brief summary of how to invoke @code{@value{AS}}.  For details,
  [ -ACA | -ACA_A | -ACB | -ACC | -AKA | -AKB | -AKC | -AMC ]
  [ -b ] [ -no-relax ]
 @end ifset
+@c start-sanitize-m32rx
 @ifset M32R
  [ --m32rx ]
 @end ifset
+@c start-sanitize-m32rx
 @ifset M680X0
  [ -l ] [ -m68000 | -m68010 | -m68020 | ... ]
 @end ifset
@@ -426,6 +428,7 @@ error if necessary.
 @end table
 @end ifset
 
+@c start-sanitize-m32rx
 @ifset M32R
 The following options are available when @value{AS} is configured for the
 Mitsubishi M32R series.
@@ -438,6 +441,7 @@ is normally the M32R, but this option changes it to the M32RX.
 
 @end table
 @end ifset
+@c end-sanitize-m32rx
 
 @ifset M680X0
 The following options are available when @value{AS} is configured for the