sanitize keep-cygnus cgen generation

diff --git a/sim/common/.Sanitize b/sim/common/.Sanitize
index fc5d179610436642e1a23513f2f7e66d9b65dd24..a939e15cae13843d801b6e0c28c10a88cf827e59 100644 (file)
--- a/sim/common/.Sanitize
+++ b/sim/common/.Sanitize
@@ -15,6 +15,13 @@
 
 Do-first:
 
+cygnus_files="cgen.sh"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+        keep_these_too="${cygnus_files} ${keep_these_too}"
+else
+        lose_these_too="${cygnus_files} ${lose_these_too}"
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -28,7 +35,6 @@ Make-common.in
 Makefile.in
 aclocal.m4
 callback.c
-cgen.sh
 cgen-mem.h
 cgen-ops.h
 cgen-scache.c
@@ -140,4 +146,32 @@ else
         done
 fi
 
+cygnus_files="ChangeLog Make-common.in"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+        for i in $cygnus_files ; do
+                if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Keeping cygnus stuff in $i
+                        fi
+                fi
+        done
+else
+        for i in $cygnus_files ; do
+                if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Removing traces of \"cygnus\" from $i...
+                        fi
+                        cp $i new
+                        sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/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
+
 # End of file.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 59408c362d0922f7e050b29f22980a7d16d88bc2..24c83fe8d615905a80ab289c8ac3a3d0d4632ac3 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,7 +1,9 @@
 Mon Jan 19 12:45:45 1998  Doug Evans  <devans@seba.cygnus.com>
 
+start-sanitize-cygnus
        * Make-common.in (cgen-{arch,cpu,decode}): New targets.
        * cgen.sh: New file.
+end-sanitize-cygnus
        * cgen-scache.h: Deleted.
        * cgen-scache.c: Only compile contents if WITH_SCACHE.
        (scache_init): Use runtime computed size of SCACHE.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 9ed1bb3fd15e8e8c888036e16669fdee67f577ff..874aa094d4789c79d37e2884392cfae98a7b3004 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -479,6 +479,8 @@ stamp-h: config.in config.status
 .gdbinit: # config.status $(srccom)/gdbinit.in
        CONFIG_FILES=$@:../common/gdbinit.in CONFIG_HEADERS= $(SHELL) ./config.status
 
+# start-sanitize-cygnus
+
 # CGEN support
 
 SCHEME = @SCHEME@
@@ -526,4 +528,6 @@ cgen-decode: force
                $(srccgen) $(CGEN_VERBOSE) \
                $(arch) "$(FLAGS)" $(cpu) $(mach) "$(SUFFIX)" ignored
 
+# end-sanitize-cygnus
+
 ## End COMMON_POST_CONFIG_FRAG