Fix PR 17135 (whilst keeping PR14827 fixed) by prefering register names over

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

diff --git a/gas/.Sanitize b/gas/.Sanitize
index b3df6317881aa864facea959d07ab90826c69d6a..32e433100684e11d904e64732a1a5c791ef9fe05 100644 (file)
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -22,6 +22,13 @@ for d in obsolete regress regress.m68k testscripts ; do
     fi
 done
 
+# Remember the current list of files in config.
+if test -d config; then
+  gas_config_files=`cd config; echo *`
+else
+  gas_config_files=
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -492,35 +499,6 @@ else
        done
 fi
 
-armelf_files="ChangeLog configure configure.in write.c"
-
-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 $armelf_files ; 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
-
 for i in * ; do
   if test ! -d $i && (grep sanitize $i > /dev/null) ; then
     echo '***' Some mentions of Sanitize are still left in gas/$i! 1>&2
@@ -537,6 +515,22 @@ for lost in .. $lose_these_too; do
   fi
 done
 
+# Check each file we removed from gas/config, and make sure it is not
+# mentioned in Makefiles or configure files.
+for lost in .. $gas_config_files; do
+  if test $lost != .. && test $lost != CVS; then
+    if test -f config/$lost; then
+      :
+    else
+      for i in Makefile.am Makefile.in configure.in configure; do
+        if fgrep $lost $i >/dev/null 2>&1; then
+          echo '***' File gas/config/$lost was sanitized out but is still mentioned in gas/$i 1>&2
+        fi
+      done
+    fi
+  fi
+done
+
 # This must come after all other sanitizations.  Re-sanitize the .pot
 # file.
 if [ -n "${verbose}" ]; then