From a3c5b9a4a1194ada4fbaac9a9ac928b92ae79747 Mon Sep 17 00:00:00 2001
From: Jim Wilson <wilson@tuliptree.org>
Date: Mon, 3 Mar 1997 00:35:40 +0000
Subject: [PATCH] Correct d10v sanitization errors.

---
 bfd/.Sanitize                  | 10 ++--------
 gdb/.Sanitize                  | 15 +--------------
 gdb/config/.Sanitize           | 15 +--------------
 gdb/testsuite/config/.Sanitize |  2 +-
 opcodes/.Sanitize              | 10 ++--------
 5 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index bd161755f0..1d57cfc1ab 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -23,14 +23,6 @@ else
 	lose_these_too="${arc_files} ${lose_these_too}"
 fi
 
-d10v_files="cpu-d10v.c elf32-d10v.c"
-
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	keep_these_too="${d10v_files} ${keep_these_too}"
-else
-	lose_these_too="${d10v_files} ${lose_these_too}"
-fi
-
 d30v_files="cpu-d30v.c elf32-d30v.c"
 
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
@@ -144,6 +136,7 @@ corefile.c
 cpu-a29k.c
 cpu-alpha.c
 cpu-arm.c
+cpu-d10v.c
 cpu-h8300.c
 cpu-h8500.c
 cpu-hppa.c
@@ -172,6 +165,7 @@ ecofflink.c
 ecoffswap.h
 elf-bfd.h
 elf.c
+elf32-d10v.c
 elf32-gen.c
 elf32-hppa.c
 elf32-hppa.h
diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 8f5c04e4d3..ff29580d4e 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -29,20 +29,6 @@ else
 	fi
 fi
 
-d10v_files="d10v-tdep.c"
-
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	keep_these_too="${d10v_files} ${keep_these_too}"
-	if [ -n "${verbose}" ] ; then
-		echo Keeping ${d10v_files}
-	fi
-else
-	lose_these_too="${d10v_files} ${lose_these_too}"
-	if [ -n "${verbose}" ] ; then
-		echo Deleting ${d10v_files}
-	fi
-fi
-
 gdbtk_files="README.GDBTK gdbtk.c gdbtk.tcl"
 
 if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
@@ -195,6 +181,7 @@ corelow.c
 cp-valprint.c
 cpu32bug-rom.c
 cxux-nat.c
+d10v-tdep.c
 dbug-rom.c
 dbxread.c
 dcache.c
diff --git a/gdb/config/.Sanitize b/gdb/config/.Sanitize
index d845ea3101..e51c3d5d1e 100644
--- a/gdb/config/.Sanitize
+++ b/gdb/config/.Sanitize
@@ -35,20 +35,6 @@ else
 	fi
 fi
 
-d10v_files="d10v"
-
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	keep_these_too="${d10v_files} ${keep_these_too}"
-	if [ -n "${verbose}" ] ; then
-		echo Keeping ${d10v_files}
-	fi
-else
-	lose_these_too="${d10v_files} ${lose_these_too}"
-	if [ -n "${verbose}" ] ; then
-		echo Deleting ${d10v_files}
-	fi
-fi
-
 v850_files="v850"
 
 if ( echo $* | grep keep\-v850 > /dev/null ) ; then
@@ -89,6 +75,7 @@ a29k
 alpha
 arm
 convex
+d10v
 gould
 h8300
 h8500
diff --git a/gdb/testsuite/config/.Sanitize b/gdb/testsuite/config/.Sanitize
index 0be60aa54e..55ca4d716f 100644
--- a/gdb/testsuite/config/.Sanitize
+++ b/gdb/testsuite/config/.Sanitize
@@ -35,6 +35,7 @@ Things-to-keep:
 
 abug.exp
 cpu32bug.exp
+d10v.exp
 est.exp
 gdbserver.exp
 hmsirom.exp
@@ -69,7 +70,6 @@ vxworks29k.exp
 
 Things-to-lose:
 
-d10v.exp
 sparclet-old.exp
 sparclet.exp
 
diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index 51c166a12b..d96b7c2f3e 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -23,14 +23,6 @@ else
 	lose_these_too="${arc_files} ${lose_these_too}"
 fi
 
-d10v_files="d10v-dis.c d10v-opc.c"
-
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	keep_these_too="${d10v_files} ${keep_these_too}"
-else
-	lose_these_too="${d10v_files} ${lose_these_too}"
-fi
-
 d30v_files="d30v-dis.c d30v-opc.c"
 
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
@@ -76,6 +68,8 @@ config.in
 configure
 configure.bat
 configure.in
+d10v-dis.c
+d10v-opc.c
 dis-buf.c
 disassemble.c
 h8300-dis.c