Remove v850e sanitization

4 files changed, 2 insertions, 49 deletions

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index fcc3361..86ed309 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -175,35 +175,6 @@ else
 	done
 fi
 
-v850e_files="ChangeLog Makefile.in Makefile.am configure.in configure disassemble.c v850-opc.c v850-dis.c"
-if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-	for i in $v850e_files ; do
-		if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping v850e stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $v850e_files ; do
-		if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"v850e\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-v850e/,/end\-sanitize\-v850e/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
-
-
 r5900_files="ChangeLog mips-opc.c mips-dis.c Makefile.am Makefile.in"
 if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
 	for i in $r5900_files ; do
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 3c073a8..557ccfa 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -2175,13 +2175,11 @@ Fri Oct  3 17:26:54 1997  Ian Lance Taylor  <ian@cygnus.com>
 	values, rather than assuming that short is 16 bits.
 	(OP_sI, OP_J, OP_DIR): Likewise.
 
-start-sanitize-v850e
 Thu Oct  2 13:36:45 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* v850-dis.c (v850_sreg_names): Use symbolic names for higher
 	system registers.
 
-end-sanitize-v850e
 Wed Oct  1 16:58:54 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* v850-opc.c: Fix typo in comment.
@@ -2213,12 +2211,10 @@ Wed Sep 24 11:29:35 1997  Ian Lance Taylor  <ian@cygnus.com>
 	* aclocal.m4: Rebuild with new libtool.
 	* configure: Rebuild.
 
-start-sanitize-v850e
 Fri Sep 19 11:45:49 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* v850-opc.c ("cmov"): Order reg param r1, r2 not r2, r2.
 
-end-sanitize-v850e
 Thu Sep 18 11:21:43 1997  Doug Evans  <dje@canuck.cygnus.com>
 
 	* sparc-opc.c (sparclet_cpreg_table): Add %ccsr2, %cccrr, %ccrstr.
@@ -2297,12 +2293,10 @@ Wed Aug 27 21:42:39 1997  Ken Raeburn  <raeburn@cygnus.com>
 
 	* d30v-opc.c (SHORT_M2, LONG_M2):  Two new forms.
 
-start-sanitize-v850e
 Fri Sep 12 11:43:54 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* v850-dis.c (disassemble): Improved display of register lists.
 
-end-sanitize-v850e
 Thu Sep 11 17:35:10 1997  Doug Evans  <dje@canuck.cygnus.com>
 
 	* sparc-opc.c (sparc_opcodes): Fix assembler args to
@@ -2352,11 +2346,9 @@ Fri Aug 22 10:35:15 1997  Nick Clifton  <nickc@cygnus.com>
 	* v850-opc.c (v850_opcodes[]): Add NOT_R0 flag to decect cases
 	where r0 is being used as a destination register.
 
-start-sanitize-v850e
 Thu Aug 21 11:09:09 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* v850-opc.c (v850_opcodes[]): Move divh opcodes next to each other.
-end-sanitize-v850e
 
 Wed Aug 20 00:43:11 1997  J"orn Rennecke <amylaar@cygnus.co.uk>
 
@@ -2370,7 +2362,6 @@ Tue Aug 19 10:59:59 1997  Richard Henderson  <rth@cygnus.com>
 
 	* alpha-opc.c (alpha_opcodes): Fix hw_rei_stall mungage.
 
-start-sanitize-v850e
 Mon Aug 18 11:10:03 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* v850-opc.c (v850_opcodes[]): Remove use of flag field.
@@ -2386,7 +2377,6 @@ Mon Aug 18 11:08:25 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* configure (cgen_files): Add support for v850ea target.
 	* configure.in (cgen_files):  Add support for v850ea target.
-end-sanitize-v850e
 
 Fri Aug 15 05:17:48 1997  Doug Evans  <dje@canuck.cygnus.com>
 
@@ -2400,7 +2390,6 @@ Fri Aug 15 05:17:48 1997  Doug Evans  <dje@canuck.cygnus.com>
 
 Wed Aug 13 18:52:11 1997  Nick Clifton  <nickc@cygnus.com>
 
-start-sanitize-v850e
 	* v850-dis.c (disassemble): Add support for v850EA instructions.
 
 	* v850-opc.c (insert_i5div, extract_i5div): New Functions.
@@ -2412,7 +2401,6 @@ start-sanitize-v850e
 	extract_d16_16, insert_i9, extract_i9, insert_u9, extract_u9,
 	insert_spe, extract_spe): New Functions.
 	(v850_opcodes): Add v850E instructions.
-end-sanitize-v850e
 
 	* v850-opc.c: Reorganised and re-layed out to improve readability
 	and portability.
diff --git a/opcodes/configure b/opcodes/configure
index 47bcc9f..d0d774a 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -3847,7 +3847,7 @@ if test x${all_targets} = xfalse ; then
 	bfd_hppa_arch)		ta="$ta hppa-dis.lo" ;;
 	bfd_i386_arch)		ta="$ta i386-dis.lo" ;;
 	bfd_i860_arch)		;;
-	bfd_i960_arch)		ta="$ta i960-dis.lo" ;;
+	bfd_i960_arch)		ta="$ta $cgen_files i960-dis.lo i960c-opc.lo i960c-asm.lo i960c-dis.lo" ;;
 	bfd_m32r_arch)		ta="$ta $cgen_files m32r-opc.lo m32r-asm.lo m32r-dis.lo" ;;
 	bfd_m68k_arch)		ta="$ta m68k-dis.lo m68k-opc.lo" ;;
 	bfd_m88k_arch)		ta="$ta m88k-dis.lo" ;;
@@ -3870,10 +3870,8 @@ if test x${all_targets} = xfalse ; then
 	bfd_dvp_arch)		ta="$ta mips-dis.lo mips-opc.lo mips16-opc.lo dvp-dis.lo dvp-opc.lo" ;;
 # end-sanitize-sky
 	bfd_v850_arch)		ta="$ta v850-opc.lo v850-dis.lo" ;;
-# start-sanitize-v850e
 	bfd_v850e_arch)		ta="$ta v850-opc.lo v850-dis.lo" ;;
 	bfd_v850ea_arch)	ta="$ta v850-opc.lo v850-dis.lo" ;;
-# end-sanitize-v850e
 	bfd_vax_arch)		ta="$ta vax-dis.lo" ;;
 	bfd_w65_arch)		ta="$ta w65-dis.lo" ;;
 	bfd_we32k_arch)		;;
diff --git a/opcodes/configure.in b/opcodes/configure.in
index 7f931bd..343d7d9 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -1,4 +1,4 @@
-dnl Process this file with autoconf to produce a configure script.
+nl Process this file with autoconf to produce a configure script.
 dnl
 
 AC_PREREQ(2.12.1)
@@ -163,9 +163,7 @@ if test x${all_targets} = xfalse ; then
 	bfd_convex_arch)	;;
 	bfd_d10v_arch)		ta="$ta d10v-dis.lo d10v-opc.lo" ;;
 	bfd_d30v_arch)		ta="$ta d30v-dis.lo d30v-opc.lo" ;;
-# start-sanitize-fr30
 	bfd_fr30_arch)          ta="$ta $cgen_files fr30-opc.lo fr30-asm.lo fr30-dis.lo" ;;
-# end-sanitize-fr30
 	bfd_h8300_arch)		ta="$ta h8300-dis.lo" ;;
 	bfd_h8500_arch)		ta="$ta h8500-dis.lo" ;;
 	bfd_hppa_arch)		ta="$ta hppa-dis.lo" ;;
@@ -194,10 +192,8 @@ if test x${all_targets} = xfalse ; then
 	bfd_dvp_arch)		ta="$ta mips-dis.lo mips-opc.lo mips16-opc.lo dvp-dis.lo dvp-opc.lo" ;;
 # end-sanitize-sky
 	bfd_v850_arch)		ta="$ta v850-opc.lo v850-dis.lo" ;;
-# start-sanitize-v850e
 	bfd_v850e_arch)		ta="$ta v850-opc.lo v850-dis.lo" ;;
 	bfd_v850ea_arch)	ta="$ta v850-opc.lo v850-dis.lo" ;;
-# end-sanitize-v850e
 	bfd_vax_arch)		ta="$ta vax-dis.lo" ;;
 	bfd_w65_arch)		ta="$ta w65-dis.lo" ;;
 	bfd_we32k_arch)		;;