improve sanitation

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index fe3c086698b67fc2520a9b77ae9861ef3e1aa318..0cbf4ffc64b1364a99ae71f803f5a2948a164908 100644 (file)
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -85,17 +85,17 @@ else
        fi
 fi
 
-vr4111_files="nec4102rom.c"
+vr4xxx_files="nec4102rom.c"
 
-if ( echo $* | grep keep\-vr4111 > /dev/null ) ; then
-       keep_these_too="${vr4111_files} ${keep_these_too}"
+if ( echo $* | grep keep\-vr4xxx > /dev/null ) ; then
+       keep_these_too="${vr4xxx_files} ${keep_these_too}"
        if [ -n "${verbose}" ] ; then
-               echo Keeping ${vr4111_files}
+               echo Keeping ${vr4xxx_files}
        fi
 else
-       lose_these_too="${vr4111_files} ${lose_these_too}"
+       lose_these_too="${vr4xxx_files} ${lose_these_too}"
        if [ -n "${verbose}" ] ; then
-               echo Deleting ${vr4111_files}
+               echo Deleting ${vr4xxx_files}
        fi
 fi
 
@@ -740,33 +740,6 @@ else
        done
 fi
 
-if ( echo $* | grep keep\-vr4111 > /dev/null ) ; then
-       for i in * ; do
-               if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping vr4111 stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in * ; do
-               if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"vr4111\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-vr4111/,/end-\sanitize\-vr4111/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
-
 if ( echo $* | grep keep\-ide > /dev/null ) ; then
        for i in * ; do
                if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then

diff --git a/gdb/ChangeLog-98 b/gdb/ChangeLog-98
index 96d8543e40efc8f6ebec67f5d8d61b0bafea7097..eaac46f8a3fd732af8a5593e37edf45d514f4bdb 100644 (file)
--- a/gdb/ChangeLog-98
+++ b/gdb/ChangeLog-98
@@ -3381,10 +3381,9 @@ Thu Dec 17 02:15:40 1998  Andrew Cagney  <cagney@chook.cygnus.com>
 
        * configure.tgt (gdb_target): Identify mips64*vr4100*-*-elf* as
        vr4100.
+start-sanitize-vr4xxx
        * config/mips/vr4100.mt, config/mips/tm-vr4100.h: Replace
        vr4xxx.mt and tm-vr4xxx.h.
-start-sanitize-vr4xxx
-       
        * configure.tgt (gdb_target): Identify mips64*vr4xxx*-*-elf* as
        vr4xxx.
        * config/mips/vr4xxx.mt, config/mips/tm-vr4xxx.h: New files.
@@ -5933,7 +5932,7 @@ Wed Apr 29 14:02:59 1998  David Taylor  <taylor@texas.cygnus.com>
        to extend the result.
 
 Wed Apr 29 10:20:40 1998  John Metzler  <jmetzler@cygnus.com>
-start-sanitize-vr4111
+start-sanitize-vr4xxx
 
        * nec4102rom.c: New file implements ROM monitor adapter for
         nec-vr4102 board.  This board hosts the vr4111 chip.  This file
@@ -5941,7 +5940,7 @@ start-sanitize-vr4111
         filter, new flags. This version does not support more than one
         breakpoint and resuming after a breakpoint in 16 bit mode is
         completely disfunctional.  
-end-sanitize-vr4111
+end-sanitize-vr4xxx
 
        * monitor.h: Defined additional hooks for dmpregs, configure_hooks
        and wait_filter. These additions require that all ROM monitor
@@ -6774,11 +6773,11 @@ Wed Mar  4 01:39:08 1998  Ron Unrau  <runrau@cygnus.com>
 
 Tue Mar  3 17:19:08 1998  John Metzler  <jmetzler@cygnus.com>
 
-start-sanitize-vr4111
+start-sanitize-vr4xxx
        * config/mips/tm-vr4xxx.h:  implements vr4111 as separate from 4300
        * config/mips/vr4xxx.tm:    implements vr4111 as separate from 4300
        * configure.tgt:  Recognise mips64vr4111-*-elf as vr4xxx
-end-sanitize-vr4111
+end-sanitize-vr4xxx
        * dwarfread.c (read_tag_pointer_type): Pointer sizes now come from
        TARGET_PTR_BIT rather from sizeof(char *) on host.