v850 files that weren't being removed if !keep-v850

9 files changed, 47 insertions, 13 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index ea2e829..a8e356c 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -31,6 +31,12 @@ else
 	lose_these_too="${tic80_files} ${lose_these_too}"
 fi
 
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+	keep_these_too="cpu-v850.c elf32-v850.c ${keep_these_too}"
+else
+	lose_these_too="cpu-v850.c elf32-v850.c ${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
@@ -137,7 +143,6 @@ cpu-sparc.c
 cpu-vax.c
 cpu-we32k.c
 cpu-w65.c
-cpu-v850.c
 cpu-z8k.c
 demo64.c
 dep-in.sed
@@ -158,7 +163,6 @@ elf32-m32r.c
 elf32-m68k.c
 elf32-m88k.c
 elf32-mips.c
-elf32-v850.c
 elf-m10200.c
 elf-m10300.c
 elf32-ppc.c
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 9f387fa..337de12 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -39,6 +39,12 @@ else
 	lose_these_too="${tic80_files} ${lose_these_too}"
 fi
 
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+	keep_these_too="tc-v850.c tc-v850.h ${keep_these_too}"
+else
+	lose_these_too="tc-v850.c tc-v850.h ${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
@@ -133,8 +139,6 @@ tc-vax.c
 tc-vax.h
 tc-w65.c
 tc-w65.h
-tc-v850.c
-tc-v850.h
 tc-z8k.c
 tc-z8k.h
 te-386bsd.h
diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 5adcd95..cb5ced0 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -74,6 +74,12 @@ else
 	fi
 fi
 
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+	keep_these_too="v850-tdep.c v850ice.c ${keep_these_too}"
+else
+	lose_these_too="v850-tdep.c v850ice.c ${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
@@ -412,8 +418,6 @@ value.h
 values.c
 vax-tdep.c
 vx-share
-v850ice.c
-v850-tdep.c
 w65-tdep.c
 w89k-rom.c
 win32-nat.c
diff --git a/gdb/config/.Sanitize b/gdb/config/.Sanitize
index 43c171d..fa2df86 100644
--- a/gdb/config/.Sanitize
+++ b/gdb/config/.Sanitize
@@ -43,6 +43,12 @@ else
 	fi
 fi
 
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+	keep_these_too="v850 ${keep_these_too}"
+else
+	lose_these_too="v850 ${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
@@ -94,7 +100,6 @@ xm-lynx.h
 xm-mpw.h
 xm-nbsd.h
 xm-sysv4.h
-v850
 w65
 z8k
 
diff --git a/include/elf/.Sanitize b/include/elf/.Sanitize
index f2e0656..d900ff9 100644
--- a/include/elf/.Sanitize
+++ b/include/elf/.Sanitize
@@ -22,6 +22,12 @@ Do-first:
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
 
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+	keep_these_too="v850.h ${keep_these_too}"
+else
+	lose_these_too="v850.h ${lose_these_too}"
+fi
+
 Things-to-keep:
 
 ChangeLog
@@ -37,7 +43,6 @@ m32r.h
 mips.h
 ppc.h
 sparc.h
-v850.h
 
 Things-to-lose:
 
diff --git a/include/opcode/.Sanitize b/include/opcode/.Sanitize
index 672b37a..9da64c0 100644
--- a/include/opcode/.Sanitize
+++ b/include/opcode/.Sanitize
@@ -31,6 +31,11 @@ else
 	lose_these_too="${tic80_files} ${lose_these_too}"
 fi
 
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+	keep_these_too="v850.h ${keep_these_too}"
+else
+	lose_these_too="v850.h ${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.
@@ -65,7 +70,6 @@ ppc.h
 pyr.h
 sparc.h
 tahoe.h
-v850.h
 vax.h
 
 Things-to-lose:
diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index a2f4a5f..38e3b70 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -31,6 +31,12 @@ else
 	lose_these_too="${tic80_files} ${lose_these_too}"
 fi
 
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+	keep_these_too="v850-opc.c v850-dis.c ${keep_these_too}"
+else
+	lose_these_too="v850-opc.c v850-dis.c ${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.
@@ -99,8 +105,6 @@ stamp-h.in
 sysdep.h
 w65-dis.c
 w65-opc.h
-v850-opc.c
-v850-dis.c
 z8k-dis.c
 z8k-opc.h
 z8kgen.c
diff --git a/sim/.Sanitize b/sim/.Sanitize
index 8ef2370..d410d5e 100644
--- a/sim/.Sanitize
+++ b/sim/.Sanitize
@@ -69,7 +69,6 @@ mn10300
 ppc
 sh
 w65
-v850
 z8k
 
 Things-to-lose:
diff --git a/sim/testsuite/.Sanitize b/sim/testsuite/.Sanitize
index 571a17e..5b58dad 100644
--- a/sim/testsuite/.Sanitize
+++ b/sim/testsuite/.Sanitize
@@ -29,6 +29,12 @@ else
         lose_these_too="${r5900_files} ${lose_these_too}"
 fi
 
+if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
+	keep_these_too="v850eq-elf ${keep_these_too}"
+else
+	lose_these_too="v850eq-elf ${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
@@ -46,7 +52,6 @@ Things-to-lose:
 
 common
 tic80-coff
-v850eq-elf
 README
 
 Do-last: