redo fr30 sanitization

diff --git a/gas/.Sanitize b/gas/.Sanitize
index 32e433100684e11d904e64732a1a5c791ef9fe05..2c0aa946afeb23b6ac9e728fd2f14c9d7f844f48 100644 (file)
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -305,6 +305,34 @@ else
        done
 fi
 
+fr30_files="ChangeLog configure.in configure"
+if ( echo $* | grep keep\-fr30 > /dev/null ) ; then
+       for i in $fr30_files ; do
+               if test ! -d $i && (grep sanitize-fr30 $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping fr30 stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in $fr30_files ; do
+               if test ! -d $i && (grep sanitize-fr30 $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"fr30\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-fr30/,/end-\sanitize\-fr30/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
+
 am33_files="ChangeLog"
 if ( echo $* | grep keep\-am33 > /dev/null ) ; then
        for i in $am33_files ; do

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index aeb36657a21d6a05274eb04ea83c69b756667d1f..944a219cfdef441e1505c44e7e272d2950cdd93e 100644 (file)
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -23,6 +23,14 @@ else
        lose_these_too="${cygnus_files} ${lose_these_too}"
 fi
 
+fr30_files="fr30-opc.h fr30-opc.c fr30-asm.c fr30-dis.c"
+
+if ( echo $* | grep keep\-fr30 > /dev/null ) ; then
+       keep_these_too="${fr30_files} ${keep_these_too}"
+else
+       lose_these_too="${fr30_files} ${lose_these_too}"
+fi
+
 tic80_files="tic80-opc.c tic80-dis.c"
 
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
@@ -120,11 +128,6 @@ z8kgen.c
 
 Things-to-lose:
 
-fr30-asm.c
-fr30-dis.c
-fr30-opc.c
-fr30-opc.h
-
 Do-last:
 
 cygnus_files="ChangeLog Makefile.am Makefile.in configure.in configure"
@@ -381,6 +384,34 @@ else
        done
 fi
 
+fr30_files="ChangeLog Makefile.in Makefile.am configure.in configure disassemble.c"
+if ( echo $* | grep keep\-fr30 > /dev/null ) ; then
+       for i in $fr30_files ; do
+               if test ! -d $i && (grep sanitize-fr30 $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping fr30 stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in $fr30_files ; do
+               if test ! -d $i && (grep sanitize-fr30 $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"fr30\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-fr30/,/end-\sanitize\-fr30/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
+
 coldfire_files="ChangeLog m68k-opc.c"
 if ( echo $* | grep keep\-coldfire > /dev/null ) ; then
        for i in $coldfire_files ; do