Keep v9 bits now.

4 files changed, 8 insertions, 54 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 98c9b65..b7d7e17 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -15,12 +15,6 @@
 
 Do-first:
 
-if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	keep_these_too="sp64-tdep.c"
-else
-	lose_these_too="sp64-tdep.c"
-fi
-
 mpw_files="mpw-config.in mpw-make.in ser-mac.c mac-xdep.c mac-defs.h macgdb.r ChangeLog.mpw"
 
 if ( echo $* | grep keep\-mpw > /dev/null ) ; then
@@ -267,6 +261,7 @@ signals.h
 solib.c
 solib.h
 source.c
+sp64-tdep.c
 sparc-nat.c
 sparc-pinsn.c
 sparc-stub.c
@@ -350,31 +345,6 @@ tests
 
 Do-last:
 
-echo Looking for signs of \"v9\"...
-
-# Don't try to clean directories here, as the 'mv' command will fail.
-# Also, grep fails on NFS mounted directories.
-if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-v9 $i > /dev/null) ; then
-			echo Keeping v9 stuff in $i
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-v9 $i > /dev/null) ; then
-			echo Cleaning the \"v9\" out of $i...
-			cp $i new
-			sed '/start\-sanitize\-v9/,/end-\sanitize\-v9/d' < $i > new
-			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				echo Caching $i in .Recover...
-				mv $i .Recover
-			fi
-			mv new $i
-		fi
-	done
-fi
-
 echo Removing traces of \"mpw\"...
 
 # Don't try to clean directories here, as the 'mv' command will fail.
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ac1658a..7da1398 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1259,8 +1259,6 @@ Sun Mar 20 15:21:57 1994  Doug Evans  (dje@cygnus.com)
 
 	* sparc-tdep.c (sparc_frame_find_save_regs): Use REGISTER_RAW_SIZE
 	instead of 4.
-
-start-sanitize-v9
 	* sp64-tdep.c (target_ptr_bit, set_target_ptr_bit): Deleted,
 	can no longer set this at run time.
 	* config/sparc/sp64.mt (SIMFILES): Use remote-sim.o now.
@@ -1268,7 +1266,6 @@ start-sanitize-v9
 	* config/sparc/tm-sp64.h (FPS_REGNUM, CPS_REGNUM): Define (so
 	sparc-tdep.c compiles).
 	(TARGET_PTR_BIT): Must be a constant now, fix at 64.
-end-sanitize-v9
 
 Sat Mar 19 08:51:12 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
diff --git a/gdb/ChangeLog-93 b/gdb/ChangeLog-93
index 8b4d615..c11dc0d 100644
--- a/gdb/ChangeLog-93
+++ b/gdb/ChangeLog-93
@@ -2186,13 +2186,11 @@ Sat Sep 18 10:13:18 1993  Jim Kingdon  (kingdon@poseidon.cygnus.com)
 	* remote-sim.h: New file.
 	* remote-sim.c: Add remote debug feature.  Rename stuff to distinguish
 	interface to simulator from gdb-specific stuff.  Other changes.
-start-sanitize-v9
 	* remote-sp64sim.c: Renamed to remote-sim.c.
 	Use sr_get_debug instead of our own sim_verbose/simif_snoop.
 	Use gnutarget in call to bfd_openr.
 	Rename simif_* to gdbsim_*.
 	* config/sparc/sp64sim.mt: Change remote-sp64sim.c to remote-sim.c.
-end-sanitize-v9
 
 Fri Sep 17 04:41:17 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
@@ -3155,12 +3153,10 @@ Tue Aug  3 10:58:04 1993  Fred Fish  (fnf@cygnus.com)
 
 	* Makefile.in (SFILES): Add thread.c
 
-start-sanitize-v9
 Tue Aug  3 10:21:58 1993  Doug Evans  (dje@canuck.cygnus.com)
 
 	* remote-sp64sim.c (simif_create_inferior): Add FIXME regarding
 	sim_set_args return code.
-end-sanitize-v9
 
 Mon Aug  2 16:35:31 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
@@ -3246,9 +3242,7 @@ Sun Aug  1 22:58:18 1993  Stu Grossman  (grossman at cygnus.com)
 	* remote-nindy.c (nindy_resume):  Pass in pid as argument.
 	* remote-sa.sparc.c (remote_resume):  Pass in pid as argument.
 	* remote-sim.c (rem_resume):  Pass in pid as argument.
-	start-sanitize-v9
 	* remote-sp64sim.c (simif_resume):  Pass in pid as argument.
-	end-sanitize-v9
 	* remote-st.c (st2000_resume):  Pass in pid as argument.
 	* remote-udi.c (udi_resume):  Pass in pid as argument.
 	* remote-vx.c (vx_resume):  Pass in pid as argument.
@@ -3310,7 +3304,6 @@ Fri Jul 30 14:44:21 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* c-exp.y (yylex): Detect C++ nested types.
 
-start-sanitize-v9
 Fri Jul 30 11:07:37 1993  Doug Evans  (dje@canuck.cygnus.com)
 
 	* sp64-tdep.c (sparc64_frame_chain, sparc64_frame_saved_pc): Deleted.
@@ -3321,7 +3314,6 @@ Fri Jul 30 11:07:37 1993  Doug Evans  (dje@canuck.cygnus.com)
 	* config/sparc/sp64.mt: New file.
 	* config/sparc/tm-sp64.h (FRAME_CHAIN, FRAME_SAVED_PC): Deleted.
 	(PRINT_REGISTER_HOOK): Call new fn sparc_print_register_hook.
-end-sanitize-v9
 
 Fri Jul 30 10:15:01 1993  Fred Fish  (fnf@deneb.cygnus.com)
 
@@ -3700,11 +3692,9 @@ Wed Jul 14 09:45:52 1993  Doug Evans  (dje@canuck.cygnus.com)
 
 	* configure.in: Recognize h8300h (variant of h8300).
 
-start-sanitize-v9
 Wed Jul 14 09:45:52 1993  Doug Evans  (dje@canuck.cygnus.com)
 
 	* configure.in: Recognize sparc64-*-*.
-end-sanitize-v9
 
 Tue Jul 13 14:03:48 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
@@ -3847,13 +3837,11 @@ Thu Jul  8 14:48:54 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* hppa-tdep.c: Change _initialize_hppab_tdep to _initialize_hppa_tdep.
 
-start-sanitize-v9
 Thu Jul  8 14:47:00 1993  Doug Evans  (dje@canuck.cygnus.com)
 
 	* sparc-tdep.c (sparc_frame_chain): Handle sizeof (CORE_ADDR)
 	!= sizeof (REGISTER_TYPE).
 	(frame_saved_pc): Ditto.
-end-sanitize-v9
 
 Thu Jul  8 08:22:05 1993  Doug Evans  (dje@canuck.cygnus.com)
 
diff --git a/gdb/config/sparc/.Sanitize b/gdb/config/sparc/.Sanitize
index a6199e7..8213c4b 100644
--- a/gdb/config/sparc/.Sanitize
+++ b/gdb/config/sparc/.Sanitize
@@ -1,4 +1,6 @@
-# Each directory to survive it's way into a release will need a file
+# .Sanitize for devo/gdb/config/sparc.
+
+# Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
 # in the tree will be processed, top down, in the following order.
@@ -13,13 +15,6 @@
 
 Do-first:
 
-if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	# sp64sim.h tm-sp64sim.h not currently used.  Left in for now.
-	keep_these_too="sp64.mt tm-sp64.h sp64sim.mt tm-sp64sim.h"
-else
-	lose_these_too="sp64.mt tm-sp64.h sp64sim.mt tm-sp64sim.h"
-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
@@ -30,6 +25,8 @@ Things-to-keep:
 
 nm-sparclynx.h
 nm-sun4os4.h
+sp64.mt
+sp64sim.mt
 sparc-em.mt
 sparclite.mt
 sparclynx.mh
@@ -38,6 +35,8 @@ sun4os4.mh
 sun4os4.mt
 sun4sol2.mh
 sun4sol2.mt
+tm-sp64.h
+tm-sp64sim.h
 tm-sparc.h
 tm-sparclite.h
 tm-sparclynx.h