Remove m32r sanitization.

diff --git a/.Sanitize b/.Sanitize
index 71262e141bf27f4499e2b86d56b2cea9b011a67c..6cac558b34e869995f0d6599a2ba12178a368e5e 100644 (file)
--- a/.Sanitize
+++ b/.Sanitize
@@ -274,35 +274,6 @@ if [ -n "${verbose}" ] ; then
        echo Processing \"m32r\"...
 fi
 
-m32r_files="config.sub configure.in ChangeLog"
-
-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
-
 v850_files="ChangeLog config.sub configure.in"
 
 if ( echo $* | grep keep\-v850 > /dev/null ) ; then

diff --git a/ChangeLog b/ChangeLog
index 8808164e2b47e465dba2652585ab0ab25bb2fd42..37ba007de6e6a0867d38d7242b09c99f627d84dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -188,12 +188,10 @@ Tue Dec  3 23:26:50 1996  Jason Merrill  <jason@yorick.cygnus.com>
 
        * configure.in: Don't use --with-stabs on IRIX 6.
 
-start-sanitize-m32r
 Tue Dec  3 09:05:25 1996  Doug Evans  <dje@canuck.cygnus.com>
 
        * configure.in (m32r): Build gdb, libg++ now.
 
-end-sanitize-m32r
 Sun Dec  1 00:18:59 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
        * configure.in (mips*-sgi-irix6*):  Remove gdb and related
@@ -346,12 +344,10 @@ Fri Oct 18 13:37:13 1996  Ian Lance Taylor  <ian@cygnus.com>
        CC_FOR_TARGET was specified on the command line.
        (MAKEOVERRIDES): Don't define.
 
-start-sanitize-m32r
 Thu Oct 17 10:27:56 1996  Doug Evans  <dje@canuck.cygnus.com>
 
        * configure.in (m32r): Fix spelling of libg++ libs.
 
-end-sanitize-m32r
 Thu Oct 10 10:37:17 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
        * config.sub (-apple*): Remove, now redundant.
@@ -458,12 +454,10 @@ Mon Sep 16 17:00:52 1996  Ian Lance Taylor  <ian@cygnus.com>
 
        * configure.in: Use a single line for host_tools and native_only.
 
-start-sanitize-m32r
 Mon Sep  9 12:21:30 1996  Doug Evans  <dje@canuck.cygnus.com>
 
        * config.sub, configure.in: Add entries for m32r.
 
-end-sanitize-m32r
 Thu Sep  5 13:52:47 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * Makefile.in (inet-install): Don't run install-gzip.

diff --git a/config.sub b/config.sub
index 2ecf073b662d8b6972da61842306f8174c3ba170..86b159ff4a2de4a4ccc7d282d5207fcf622f436c 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -217,11 +217,9 @@ case $basic_machine in
                basic_machine=$basic_machine-unknown
                ;;
 # end-sanitize-d30v
-# start-sanitize-m32r
-       m32r)                           # CYGNUS LOCAL
+       m32r)
                basic_machine=$basic_machine-unknown
                ;;
-# end-sanitize-m32r
        mn10200)                        # CYGNUS LOCAL
                basic_machine=$basic_machine-unknown
                ;;
@@ -937,12 +935,12 @@ case $os in
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -beos* | -linux-gnu* | -uxpv*)
+             | -linux-gnu* | -uxpv*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        # CYGNUS LOCAL
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug |  -netware* | -os9* \
+             | -windows* | -osx | -abug |  -netware* | -os9* | -beos* \
              | -macos* | -mpw* | -magic* | -mon960* | -lnews* )
                ;;
        -mac*)