Fixed sanitization bugs.

diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 34b56e3..547f8bc 100644 (file)
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -292,6 +292,14 @@ fi
 v850e_files="tc-v850.c tc-v850.h"
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
        for i in $v850e_files ; do
+               if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping v850e stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in $v850e_files ; do
                if test -r $i && (grep sanitize-v850e $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
                                echo Removing traces of \"v850e\" from $i...

diff --git a/gas/doc/.Sanitize b/gas/doc/.Sanitize
index 56ce962..d1eae15 100644 (file)
--- a/gas/doc/.Sanitize
+++ b/gas/doc/.Sanitize
@@ -22,20 +22,6 @@ Do-first:
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
 
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-       keep_these_too="c-v850.texi"
-else
- if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-       keep_these_too="c-v850.texi"
- else
-  if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-       keep_these_too="c-v850.texi"
-  else
-       lose_these_too="c-v850.texi"
-  fi
- fi
-fi
-
 Things-to-keep:
 
 Makefile.am
@@ -56,6 +42,7 @@ c-mips.texi
 c-ns32k.texi
 c-sh.texi
 c-sparc.texi
+c-v850.texi
 c-vax.texi
 c-z8k.texi
 gasp.texi
@@ -66,45 +53,8 @@ Things-to-lose:
 
 Do-last:
 
-v850_files="all.texi as.texinfo"
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-       for i in $v850_files ; do
-               if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping v850 stuff in $i
-                       fi
-               fi
-       done
-else
-  if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-    true
-  else
-    if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-      true
-    else
-       for i in $v850_files ; do
-               if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"v850\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-v850/,/end-\sanitize\-v850/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
-  fi
-fi
-
 v850e_files="c-v850.texi"
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-  if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
        for i in $v850e_files ; do
                if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
@@ -112,14 +62,14 @@ if ( echo $* | grep keep\-v850e > /dev/null ) ; then
                        fi
                fi
        done
-  else
+else
        for i in $v850e_files ; do
-               if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
+               if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"v850eq\" from $i...
+                               echo Removing traces of \"v850e\" from $i...
                        fi
                        cp $i new
-                       sed '/start\-sanitize\-v850eq/,/end-\sanitize\-v850eq/d' < $i > new
+                       sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new
                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
                                if [ -n "${verbose}" ] ; then
                                        echo Caching $i in .Recover...
@@ -129,7 +79,6 @@ if ( echo $* | grep keep\-v850e > /dev/null ) ; then
                        mv new $i
                fi
        done
-  fi
 fi
 
 # Don't try to clean directories here, as the 'mv' command will fail.

diff --git a/include/elf/.Sanitize b/include/elf/.Sanitize
index 828c3cc..173984e 100644 (file)
--- a/include/elf/.Sanitize
+++ b/include/elf/.Sanitize
@@ -76,7 +76,7 @@ if ( echo $* | grep keep\-v850e > /dev/null ) ; then
        for i in $v850_files ; do
                if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
-                               echo Keeping v850eq stuff in $i
+                               echo Keeping v850e stuff in $i
                        fi
                fi
        done

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index abc59c7..fe19a1c 100644 (file)
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -146,9 +146,6 @@ if ( echo $* | grep keep\-v850e > /dev/null ) ; then
                fi
        done
 else
-    if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-      true
-    else
        for i in $v850e_files ; do
                if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
@@ -165,7 +162,6 @@ else
                        mv new $i
                fi
        done
-    fi
 fi