* lib/sim-defs.exp (sim_run): Argument env_vals renamed to options,

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

diff --git a/sim/.Sanitize b/sim/.Sanitize
index 27df4f4be8c3e40e088a2557486f7afa93cfddfe..531d802c843dad121e126e20c03a9a7f9941c6a7 100644 (file)
--- a/sim/.Sanitize
+++ b/sim/.Sanitize
@@ -15,32 +15,21 @@
 
 Do-first:
 
-igen_files="igen"
-
-d30v_files="d30v testsuite"
+d30v_files="d30v"
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
-        keep_these_too="${d30v_files} ${igen_files} ${keep_these_too}"
-       igen_files=
+        keep_these_too="${d30v_files} ${keep_these_too}"
 else
         lose_these_too="${d30v_files} ${lose_these_too}"
 fi
 
 tic80_files="tic80"
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
-        keep_these_too="${tic80_files} ${igen_files} ${keep_these_too}"
-       igen_files=
+        keep_these_too="${tic80_files} ${keep_these_too}"
 else
         lose_these_too="${tic80_files} ${lose_these_too}"
 fi
 
-v850_files="v850"
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-        keep_these_too="${v850_files} ${keep_these_too}"
-else
-        lose_these_too="${v850_files} ${lose_these_too}"
-fi
-
-lose_these_too="${igen_files} ${lose_these_too}"
+lose_these_too="${lose_these_too}"
 
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
@@ -68,6 +57,8 @@ mn10200
 mn10300
 ppc
 sh
+v850
+testsuite
 w65
 z8k
 
@@ -133,22 +124,50 @@ else
 fi
 
 v850_files="configure configure.in ChangeLog"
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+if ( echo $* | grep keep\-v850e > /dev/null ) ; then
         for i in $v850_files ; do
-                if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
+                if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
                         if [ -n "${verbose}" ] ; then
-                                echo Keeping v850 stuff in $i
+                                echo Keeping v850e stuff in $i
                         fi
                 fi
         done
 else
         for i in $v850_files ; do
-                if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
+                if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Removing traces of \"v850e\" from $i...
+                        fi
+                        cp $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...
+                                fi
+                                mv $i .Recover
+                        fi
+                        mv new $i
+                fi
+        done
+fi
+
+vr4320_files="ChangeLog"
+if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then
+        for i in $vr4320_files ; do
+                if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Keeping vr4320 stuff in $i
+                        fi
+                fi
+        done
+else
+        for i in $vr4320_files ; do
+                if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
                         if [ -n "${verbose}" ] ; then
-                                echo Removing traces of \"v850\" from $i...
+                                echo Removing traces of \"vr4320\" from $i...
                         fi
                         cp $i new
-                        sed '/start\-sanitize\-v850/,/end-\sanitize\-v850/d' < $i > new
+                        sed '/start\-sanitize\-vr4320/,/end-\sanitize\-vr4320/d' < $i > new
                         if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
                                 if [ -n "${verbose}" ] ; then
                                         echo Caching $i in .Recover...