Removed v850 sanitization.

Fixed v850e sanitization.

11 files changed, 8 insertions, 126 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 7522881..ea2e829 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -23,22 +23,6 @@ else
 	lose_these_too="${d30v_files} ${lose_these_too}"
 fi
 
-v850_files="elf32-v850.c"
-
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-	keep_these_too="cpu-v850.c ${v850_files} ${keep_these_too}"
-else
- if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-	keep_these_too="cpu-v850.c ${v850_files} ${keep_these_too}"
- else
-  if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-	keep_these_too="cpu-v850.c ${v850_files} ${keep_these_too}"
-  else
-	lose_these_too="cpu-v850.c ${v850_files} ${lose_these_too}"
-  fi
- fi
-fi
-
 tic80_files="cpu-tic80.c coff-tic80.c"
 
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
@@ -153,6 +137,7 @@ cpu-sparc.c
 cpu-vax.c
 cpu-we32k.c
 cpu-w65.c
+cpu-v850.c
 cpu-z8k.c
 demo64.c
 dep-in.sed
@@ -173,6 +158,7 @@ elf32-m32r.c
 elf32-m68k.c
 elf32-m88k.c
 elf32-mips.c
+elf32-v850.c
 elf-m10200.c
 elf-m10300.c
 elf32-ppc.c
@@ -331,8 +317,7 @@ else
 	done
 fi
 
-v850_files="ChangeLog ChangeLog.2 Makefile.in Makefile.am archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h elf32-v850.c"
-v850e_files="ChangeLog ChangeLog.2 Makefile.in Makefile.am archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h"
+v850_files="ChangeLog Makefile.in Makefile.am archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h elf32-v850.c cpu-v850.c"
 if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
 	for i in $v850_files ; do
 		if test -r $i && (grep sanitize-v850eq $i > /dev/null) ; then
@@ -386,41 +371,6 @@ else
 	done
 fi
 
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-	for i in $v850_files ; do
-		if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping v850 stuff in $i
-			fi
-		fi
-	done
-else
-  if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-    true
-  else
-    if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-      true
-    else
-	for i in $v850e_files ; do
-		if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"v850\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-v850/,/end\-sanitize\-v850/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
-  fi
-fi
-
 r5900_files="ChangeLog config.bfd"
 if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
 	for i in $r5900_files ; do
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e3e7381..1bd2139 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -86,7 +86,6 @@ Mon Aug 25 16:11:04 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* cpu-arm.c (compatible): If B is a default type, return A.
 
-start-sanitize-v850
 Mon Aug 25 15:35:46 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* cpu-v850.c (scan): New function.
@@ -120,7 +119,7 @@ start-sanitize-v850eq
 	* elf.c (prep_headers): Add support for v850eq machine number. 
 
 end-sanitize-v850eq
-end-sanitize-v850
+
 Mon Aug 25 14:07:33 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* syms.c (_bfd_stab_section_find_nearest_line): Clear the
@@ -167,7 +166,6 @@ start-sanitize-tic80
  	section header for TIC80COFF files.
 end-sanitize-tic80
 
-start-sanitize-v850
 Mon Aug 18 11:36:19 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* elf32-v850.c (v850_elf_howto_table, v850_elf_reloc_map,
@@ -181,7 +179,6 @@ Mon Aug 18 11:36:19 1997  Nick Clifton  <nickc@cygnus.com>
 	* libbfd.h: Add support for BFD_RELOC_V850_16_PCREL relocation.
 
 	* bfd-in2.h: Add support for BFD_RELOC_V850_16_PCREL relocation.
-end-sanitize-v850
 
 start-sanitize-v850e
 Mon Aug 18 11:33:56 1997  Nick Clifton  <nickc@cygnus.com>
@@ -1872,13 +1869,11 @@ Tue Feb 18 11:41:00 1996  Dawn Perchik  <dawn@cygnus.com>
 
 	* sysdep.h: Don't define errno in MSVC if error.h is included.
 
-start-sanitize-v850
 Tue Feb 18 10:04:13 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-v850.c (v850_elf_relocate_section): Make sure r_symndx
 	is initialized before it is used.
 
-end-sanitize-v850
 Mon Feb 17 11:28:40 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* hp300hpux.c (convert_sym_type): Don't convert a secondary common
@@ -2021,10 +2016,8 @@ Mon Jan 27 12:25:02 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* aout-arm.c (MY_swap_std_reloc_in): Remove unused r_length.
 	* elf32-ppc.c (ppc_elf_check_relocs): Remove unused plt.
-start-sanitize-v850
 	* elf32-v850.c (v850_elf_final_link_relocate): Remove used
 	r_format and r_pcrel.  Always return a value.
-end-sanitize-v850
 	* riscix.c (MY_final_link_callback): Define to dummy value.
 
 	* elf32-i386.c (elf_i386_size_dynamic_sections): When checking for
@@ -2077,7 +2070,6 @@ Mon Jan 13 22:39:08 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
 	* config.bfd (tic80-*-*): Don't require 'coff'.
 
 end-sanitize-tic80
-start-sanitize-v850
 Mon Jan 13 19:36:25 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* elf32-v850.c (v850_elf_howto_table): Set the special_function
@@ -2088,7 +2080,6 @@ Mon Jan 13 19:36:25 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
 	(v850_elf_relocate_section): Fix up error message, don't just call
 	abort.
 
-end-sanitize-v850
 Mon Jan  6 13:28:35 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-mn10200.c (elf_mn10200_howto): Don't ever set partial-inplace.
@@ -2154,7 +2145,6 @@ Fri Jan  3 16:58:31 1997  Richard Henderson  <rth@tamu.edu>
 
 	* elf64-alpha.c: Rewrite everything touching relocations.
 
-start-sanitize-v850
 Fri Jan  3 11:42:53 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* elf32-v850.c (all functions and static variables): Go through
@@ -2170,7 +2160,6 @@ Tue Dec 31 15:15:28 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* elf32-v850.c (elf_v850_howto_table): Fix some spacing.
 
-end-sanitize-v850
 Tue Dec 31 14:44:50 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config.bfd (mips*el-*-linux*): New target.
@@ -2514,19 +2503,16 @@ Fri Oct 25 16:56:40 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* ieee.c (ieee_write_external_part): Correctly record whether
 	there is an external part.
 
-start-sanitize-v850
 Thu Oct 24 14:32:52 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-v850.c (elf32_v850_bfd_final_link_relocate): Correctly
 	handle tda offsets for sld.w and sst.w instructions.
 	Fix alignment check in sld.w and sst.w tda reloc handling.
 
-end-sanitize-v850
 Thu Oct 24 09:08:47 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* aclocal.m4, configure:  Set USE_BINARY_FOPEN for *-*-windows.
 
-start-sanitize-v850
 Wed Oct 23 00:53:16 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-v850.c: Add comments about assumptions about
@@ -2537,7 +2523,6 @@ Wed Oct 23 00:53:16 1996  Jeffrey A Law  (law@cygnus.com)
 	* elf32-v850.c (elf32_v850_howto_table): Fix typo in
 	R_V850_SDA_OFFSET entry.
 
-end-sanitize-v850
 Wed Oct 23 00:20:34 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* xcofflink.c (bfd_xcoff_import_symbol): Don't allocate ldsym.
@@ -2545,7 +2530,6 @@ Wed Oct 23 00:20:34 1996  Ian Lance Taylor  <ian@cygnus.com>
 	(xcoff_build_ldsyms): Assume that ldsym was not previously
 	allocated.  For an imported symbol, copy ldindx into l_ifile.
 
-start-sanitize-v850
 Tue Oct 22 19:20:38 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-v850.c (elf_v850_howto_table): Fix ordering of
@@ -2562,7 +2546,6 @@ Tue Oct 22 19:20:38 1996  Jeffrey A Law  (law@cygnus.com)
 	(v850_elf_relocation_section): Likewise.
 	(elf_backend_relocate_section): Define.
 
-end-sanitize-v850
 Tue Oct 22 17:22:43 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* binary.c (binary_set_section_contents): Ignore sections which
@@ -2599,9 +2582,6 @@ Wed Oct 16 11:24:35 1996  Jeffrey A Law  (law@cygnus.com)
 	all sections that will be included in the output file.
 	(_bfd_generic_link_output_symbols): Discard symbols in sections
 	which are being discarded.
-
-start-sanitize-v850
-
 	* elf32-v850.c (enum reloc_type): Add R_V850_SDA_OFFSET,
 	R_V850_TDA_OFFSET and R_V850_ZDA_OFFSET.
 	(elf_v850_howto_table): Corresponding changes.
@@ -2621,7 +2601,6 @@ Tue Oct 15 16:17:28 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* elf32-v850.c:  Define elf_symbol_leading_char to be '_'.
 
-end-sanitize-v850
 Tue Oct 15 12:40:41 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* VERSION: Bump for new relocation.
@@ -2827,13 +2806,11 @@ Tue Oct  1 12:31:39 1996  Ian Lance Taylor  <ian@cygnus.com>
 	a dynamic object in the dynamic symbol table if it is referenced
 	or defined by a regular object.
 
-start-sanitize-v850
 Fri Sep 27 18:41:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* elf32-v850.c (bfd_elf32_v850_is_local_label):  New function to
 	remove dwarf local labels.  Shrinks binaries by a factor of 3!
 
-end-sanitize-v850
 Mon Sep 23 13:33:00 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* elf32-ppc.c (ppc_elf_add_symbol_hook): Create the .sbss section
@@ -3026,14 +3003,12 @@ Mon Sep  9 12:31:22 1996  Doug Evans  <dje@canuck.cygnus.com>
 	* Makefile.in,archures.c,elf.c,targets.c: Likewise.
 	* config.bfd: Keep target list alphabetically sorted.
 
-start-sanitize-v850
 Mon Sep  9 11:48:41 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-v850.c (bfd_elf32_v850_reloc, case R_V850_HI16): Don't forget
 	to add in the constant part found in the instruction itself.
 	(case R_V850_HI16_S): Likewise.
 
-end-sanitize-v850
 Fri Sep  6 17:04:39 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* elf32-d10v.c (elf_d10v_howto_table): Modify the size of R_D10V_16
@@ -3056,7 +3031,6 @@ Tue Sep  3 12:16:20 1996  Doug Evans  <dje@canuck.cygnus.com>
 	(bfd_target_vector): Add sparcle_aout_vec.
 	* aout-sparcle.c: New file.
 
-start-sanitize-v850
 Tue Sep  3 00:57:02 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-v850.c (bfd_elf32_v850_reloc): Fix handling of
@@ -3068,7 +3042,6 @@ Tue Sep  3 00:57:02 1996  Jeffrey A Law  (law@cygnus.com)
 	relocations.  Twiddle masks & shifts for some relocs.
 	Set partial_inplace where needed.
 
-end-sanitize-v850
 Mon Sep  2 12:12:34 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* cpu-mips.c: Add an explicit mips:3000 entry, and change the
@@ -3078,7 +3051,6 @@ Mon Sep  2 12:12:34 1996  Ian Lance Taylor  <ian@cygnus.com>
 	(_bfd_mips_elf_merge_private_bfd_data): If the machine number of
 	the output BFD is the default, set it from the first input BFD.
 
-start-sanitize-v850
 Sun Sep  1 18:38:01 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-v850.c (elf_v850_howto_table): All the 16bit relocs
@@ -3089,14 +3061,12 @@ Sun Sep  1 18:38:01 1996  Jeffrey A Law  (law@cygnus.com)
 	(TARGET_BIG_SYM, TARGET_BIG_NAME): Remove.  The V850 is little
 	endian!
 
-end-sanitize-v850
 Sun Sep  1 15:41:08 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* rs6000-core.c (rs6000coff_core_file_matches_executable_p):
 	Rewrite to use BFD file read routines and to avoid using a fixed
 	length for the file name.
 
-start-sanitize-v850
 Sat Aug 31 10:22:25 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-v850.c (enum reloc_type): Add R_V850_{32,16,8}.
@@ -3111,7 +3081,6 @@ Fri Aug 30 18:06:04 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
 	(v850_reloc_map): Add HI_16_S reloc.
 	* reloc.c: Define BFD_RELOC_V850_* relocs.
 
-end-sanitize-v850
 Fri Aug 30 11:49:19 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	Add SH ELF support.
@@ -3200,7 +3169,6 @@ Thu Aug 22 10:54:38 1996  Ian Lance Taylor  <ian@cygnus.com>
 	undefined symbol merely because we are generating a shared
 	library.
 
-start-sanitize-v850
 Tue Aug 20 15:06:05 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
 
 	* Makefile.in (ALL_MACHINES): Add cpu-v850.o.
@@ -3215,7 +3183,6 @@ Tue Aug 20 15:06:05 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
 	* elf32-v850.c: New file.
 	* targets.c (bfd_elf32_v850_vec): New vector.
 
-end-sanitize-v850
 Fri Aug 16 16:25:35 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* xcofflink.c (xcoff_link_add_dynamic_symbols): Create and define
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 556b9f6..86db1ee 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -69,9 +69,7 @@ ALL_MACHINES = \
 	$(start-sanitize-tic80) \
 	cpu-tic80.lo \
 	$(end-sanitize-tic80) \
-	$(start-sanitize-v850) \
 	cpu-v850.lo \
-	$(end-sanitize-v850) \
 	cpu-vax.lo \
 	cpu-we32k.lo \
 	cpu-w65.lo \
@@ -164,9 +162,7 @@ BFD32_BACKENDS = \
 	elf32-ppc.lo \
 	elf32-sh.lo \
 	elf32-sparc.lo \
-	$(start-sanitize-v850) \
 	elf32-v850.lo \
-	$(end-sanitize-v850) \
 	elf32.lo \
 	elflink.lo \
 	hp300bsd.lo \
@@ -569,12 +565,10 @@ elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \
   elf32-target.h
 end-sanitize-d30v:
 
-start-sanitize-v850:
 cpu-v850.lo: cpu-v850.c
 elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
   elf32-target.h
-end-sanitize-v850:
 
 start-sanitize-tic80:
 cpu-tic80.lo: cpu-tic80.c
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index c2b53ac..4c67810 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -151,9 +151,7 @@ ALL_MACHINES = \
 	$(start-sanitize-tic80) \
 	cpu-tic80.lo \
 	$(end-sanitize-tic80) \
-	$(start-sanitize-v850) \
 	cpu-v850.lo \
-	$(end-sanitize-v850) \
 	cpu-vax.lo \
 	cpu-we32k.lo \
 	cpu-w65.lo \
@@ -246,9 +244,7 @@ BFD32_BACKENDS = \
 	elf32-ppc.lo \
 	elf32-sh.lo \
 	elf32-sparc.lo \
-	$(start-sanitize-v850) \
 	elf32-v850.lo \
-	$(end-sanitize-v850) \
 	elf32.lo \
 	elflink.lo \
 	hp300bsd.lo \
@@ -1003,12 +999,10 @@ elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \
   elf32-target.h
 end-sanitize-d30v:
 
-start-sanitize-v850:
 cpu-v850.lo: cpu-v850.c
 elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
   elf32-target.h
-end-sanitize-v850:
 
 start-sanitize-tic80:
 cpu-tic80.lo: cpu-tic80.c
diff --git a/bfd/archures.c b/bfd/archures.c
index 9695451..907120b 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -149,7 +149,6 @@ DESCRIPTION
 . {* start-sanitize-tic80 *}
 .  bfd_arch_tic80,     {* TI TMS320c80 (MVP) *}
 . {* end-sanitize-tic80 *}
-. {* start-sanitize-v850 *}
 .  bfd_arch_v850,      {* NEC V850 *}
 .#define bfd_mach_v850          0
 . {* start-sanitize-v850e *}
@@ -158,7 +157,6 @@ DESCRIPTION
 . {* start-sanitize-v850eq *}
 .#define bfd_mach_v850eq	'Q'
 . {* end-sanitize-v850eq *}
-. {* end-sanitize-v850 *}
 .  bfd_arch_arc,       {* Argonaut RISC Core *}
 .#define bfd_mach_arc_base 0
 .  bfd_arch_m32r,      {* Mitsubishi M32R/D *}
@@ -234,9 +232,7 @@ extern const bfd_arch_info_type bfd_we32k_arch;
 extern const bfd_arch_info_type bfd_z8k_arch;
 extern const bfd_arch_info_type bfd_ns32k_arch;
 extern const bfd_arch_info_type bfd_w65_arch;
-/* start-sanitize-v850 */
 extern const bfd_arch_info_type bfd_v850_arch;
-/* end-sanitize-v850 */
 
 static const bfd_arch_info_type * const bfd_archures_list[] =
 {
@@ -275,9 +271,7 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
   &bfd_z8k_arch,
   &bfd_ns32k_arch,
   &bfd_w65_arch,
-/* start-sanitize-v850*/
   &bfd_v850_arch,
-/* end-sanitize-v850 */
 #endif
   0
 };
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 8e7a018..af6a774 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1241,7 +1241,6 @@ enum bfd_architecture
   /* start-sanitize-tic80 */
   bfd_arch_tic80,      /* TI TMS320c80 (MVP) */
   /* end-sanitize-tic80 */
-  /* start-sanitize-v850 */
   bfd_arch_v850,       /* NEC V850 */
 #define bfd_mach_v850          0
   /* start-sanitize-v850e */
@@ -1250,7 +1249,6 @@ enum bfd_architecture
   /* start-sanitize-v850eq */
 #define bfd_mach_v850eq	'Q'
   /* end-sanitize-v850eq */
-  /* end-sanitize-v850 */
   bfd_arch_arc,        /* Argonaut RISC Core */
 #define bfd_mach_arc_base 0
   bfd_arch_m32r,       /* Mitsubishi M32R/D */
@@ -1937,7 +1935,6 @@ used when the lower 16 bits are treated as signed. */
 /* This is a 16-bit reloc containing the small data area offset for use in
 add3, load, and store instructions. */
   BFD_RELOC_M32R_SDA16,
-/* start-sanitize-v850 */
 
 /* This is a 9-bit reloc */
   BFD_RELOC_V850_9_PCREL,
@@ -1957,9 +1954,7 @@ add3, load, and store instructions. */
   BFD_RELOC_V850_TDA_4_4_OFFSET, 		/* A  4 bit reloc in the tiny data area.  */
   BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET, 	/* A 16 bit reloc (but the bits are not contiguous) in the small data area.  */
   BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET, 	/* A 16 bit reloc (but the bits are not contiguous) in the zero data area.  */
-/* end-santize-v850e */
-/* end-sanitize-v850 */
-
+/* end-sanitize-v850e */
 
 /* This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
 instruction. */
diff --git a/bfd/config.bfd b/bfd/config.bfd
index a0b29a2..1488ef4 100755
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -37,9 +37,7 @@ mips*)	targ_archs=bfd_mips_arch ;;
 powerpc*) targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
 rs6000)	targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
 sparc*)	targ_archs=bfd_sparc_arch ;;
-# start-sanitize-v850
 v850*)	targ_archs=bfd_v850_arch ;;
-# end-sanitize-v850
 z8k*)	targ_archs=bfd_z8k_arch ;;
 *)	targ_archs=bfd_${targ_cpu}_arch ;;
 esac
@@ -548,12 +546,10 @@ case "${targ}" in
     ;;
 
 # end-sanitize-tic80
-# start-sanitize-v850
   v850-*-*)
     targ_defvec=bfd_elf32_v850_vec
     ;;
 
-# end-sanitize-v850
 # start-sanitize-v850e
   v850e-*-*)
     targ_defvec=bfd_elf32_v850_vec
diff --git a/bfd/configure b/bfd/configure
index ac7d314..d51fbe1 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -2609,9 +2609,7 @@ do
     bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
     bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
     bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elf32.lo $elf" ;;
-# start-sanitize-v850
     bfd_elf32_v850_vec)		tb="$tb elf32-v850.lo elf32.lo $elf" ;;
-# end-sanitize-v850
     bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.lo elf64.lo $elf"
 				target64=true ;;
     bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"
diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 7496e84..55e6675 100644
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -516,7 +516,7 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
 /* start-sanitize-v850e */
 	case R_V850_TDA_4_5_OFFSET:
 	case R_V850_TDA_4_4_OFFSET:
-/* end-sanitize-v850 */	  
+/* end-sanitize-v850e */	  
 	case R_V850_TDA_6_8_OFFSET:
 	case R_V850_TDA_7_8_OFFSET:
 	case R_V850_TDA_7_7_OFFSET:
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index c069192..9252032 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -768,7 +768,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_M32R_HI16_SLO",
   "BFD_RELOC_M32R_LO16",
   "BFD_RELOC_M32R_SDA16",
-/* start-sanitize-v850 */
   "BFD_RELOC_V850_9_PCREL",
   "BFD_RELOC_V850_22_PCREL",
   "BFD_RELOC_V850_SDA_16_16_OFFSET",
@@ -783,8 +782,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_V850_TDA_4_4_OFFSET",
   "BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET",
   "BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET",
-/* end-santize-v850e */
-/* end-sanitize-v850 */
+/* end-sanitize-v850e */
 
   "BFD_RELOC_MN10300_32_PCREL",
   "BFD_RELOC_MN10300_16_PCREL",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 345d61a..b382609 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -2349,8 +2349,6 @@ ENUMDOC
   This is a 16-bit reloc containing the small data area offset for use in
   add3, load, and store instructions.
 
-COMMENT
-{* start-sanitize-v850 *}
 ENUM
   BFD_RELOC_V850_9_PCREL
 ENUMDOC
@@ -2411,9 +2409,7 @@ ENUM
 ENUMDOC
   This is a 16 bit offset from the zero data area pointer, with the bits placed non-contigously in the instruction..
 COMMENT
-{* end-santize-v850e *}
-COMMENT
-{* end-sanitize-v850 *}
+{* end-sanitize-v850e *}
 
 ENUM
   BFD_RELOC_MN10300_32_PCREL