Merge egcs-19981008.

[deliverable/binutils-gdb.git] / .Sanitize

diff --git a/.Sanitize b/.Sanitize
index 4ba4ba2450d92f40c593f70ca8de4a4e63bc4644..99eddfe4ad1cce35b886ea91e044b5ccc6a07baa 100644 (file)
--- a/.Sanitize
+++ b/.Sanitize
@@ -47,8 +47,8 @@
 Do-first:
 
 keep_these_too="${keep_these_too} .cvsignore autoconf automake
-       apache ash bash 
-       bfd binutils bison byacc cvs deja-gnu dejagnu diff dosrel dvips
+       apache ash bash bfd binutils bison byacc bzip2
+       cvs deja-gnu dejagnu diff dosrel dvips
        emacs emacs19 examples expect fileutils findutils flex
        gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff
        guile gzip
@@ -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