diff --git a/.Sanitize b/.Sanitize index 4ba4ba2450..035e2191c6 100644 --- 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 a329ab51af..d2f3cba9be 100644 --- 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" ;;