change armelf sanitization to CYGNUS LOCAL markers

diff --git a/.Sanitize b/.Sanitize
index 4ba4ba2450d92f40c593f70ca8de4a4e63bc4644..035e2191c6d4dae4f24ddd2058ba8ab026e14e74 100644 (file)
--- a/.Sanitize
+++ b/.Sanitize
@@ -631,34 +631,6 @@ else
        done
 fi
 
-armelf_files="ChangeLog configure.in"
-if ( echo $* | grep keep\-armelf > /dev/null ) ; then
-       for i in $armelf_files ; do
-               if test ! -d $i && (grep sanitize-armelf $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping armelf stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in * ; do
-               if test ! -d $i && (grep sanitize-armelf $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"armelf\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-armelf/,/end-\sanitize\-armelf/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
-
 java_files="ChangeLog Makefile.in configure.in"
 if ( echo $* | grep keep\-java > /dev/null ) ; then
        for i in $java_files ; do

diff --git a/configure.in b/configure.in
index a329ab51af117eba477703402878d386b145b7a3..d2f3cba9be00f7b4d2c7a36a6a79c75ca6f7267b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -626,19 +626,19 @@ case "${target}" in
   arm-*-coff*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-# start-sanitize-armelf
+# CYGNUS LOCAL clm/arm-elf
   arm-*-elf*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-# end-sanitize-armelf
+# END CYGNUS LOCAL 
   thumb-*-coff)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-# start-sanitize-armelf
+# CYGNUS LOCAL clm/arm-elf
   thumb-*-elf)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-# end-sanitize-armelf
+# END CYGNUS LOCAL
   thumb-*-pe) # CYGNUS LOCAL nickc/thumb
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;