Since d10v is public now, remove all sanitization statements

35 files changed, 411 insertions, 704 deletions

diff --git a/.Sanitize b/.Sanitize
index 79e0140..d29300d 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -241,35 +241,6 @@ if [ -n "${verbose}" ] ; then
 	echo Processing \"d10v\"...
 fi
 
-d10v_files="ChangeLog config.sub configure.in"
-
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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 [ -n "${verbose}" ] ; then
 	echo Processing \"d30v\"...
 fi
diff --git a/ChangeLog b/ChangeLog
index e3d8db7..f35e947 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -117,12 +117,10 @@ Tue Nov 26 11:45:33 1996  Kim Knuttila  <krk@cygnus.com>
 
 	* config.sub (basic_machine): added mips16 configuration
 
-start-sanitize-d10v
 Sat Nov 23 19:26:22 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config.sub: Handle d10v-unknown.
 
-end-sanitize-d10v
 start-sanitize-v850
 Sat Nov 23 14:23:01 1996  Gavin Koch  <gavin@cygnus.com>
         
@@ -142,12 +140,10 @@ Wed Nov 20 10:09:01 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* config.sub: Handle mn10200 and mn10300.
 
-start-sanitize-d10v
 Tue Nov 19 16:35:14 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* configure.in (d10v-*): Do not build librx.
 
-end-sanitize-d10v
 Mon Nov 18 13:28:41 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* configure.in (mn10300): Build everything except gdb & libgloss.
@@ -363,13 +359,11 @@ Fri Sep 27 17:39:44 1996  Stu Grossman  (grossman@critters.cygnus.com)
 	* configure.in:  You can now configure GDB for the v850.
 
 end-sanitize-v850
-start-sanitize-d10v
 Tue Sep 24 19:05:12 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* configure.in (noconfigdirs): Don't configure any C++ dirs
 	if targeting D10V.
 
-end-sanitize-d10v
 Tue Sep 17 12:15:31 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config.sub: Recognize mips64vr5000.
@@ -406,12 +400,10 @@ Thu Aug 29 16:44:58 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config.guess (i[345]86): Ditto.
 
-start-sanitize-d10v
 Mon Aug 26 18:34:42 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* configure.in (noconfigdirs): Removed gdb for D10V.
 
-end-sanitize-d10v
 start-sanitize-v850
 Thu Aug 22 17:13:52 1996  Jeffrey A Law  (law@cygnus.com)
 
@@ -466,12 +458,10 @@ Sat Jul 27 15:10:43 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-config.in: Generate Mac include for elf/dwarf2.h.
 
-start-sanitize-d10v
 Tue Jul 23 10:47:04 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* configure.in (d10v-*-*): Remove ld from $noconfigdirs. 
 
-end-sanitize-d10v	
 Mon Jul 22 13:28:51 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
 	* configure.in (native_only): Add prms.
@@ -481,7 +471,6 @@ Mon Jul 22 12:27:58 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* Makefile.in (GAS_SUPPORT_DIRS): Add make-all.com and setup.com.
 	(BINUTILS_SUPPORT_DIRS): Likewise.
 
-start-sanitize-d10v
 Thu Jul 18 12:55:40 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* configure.in (d10v-*-*): Don't configure ld or gdb until the
@@ -491,7 +480,6 @@ Wed Jul 17 14:33:09 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* configure.in (d10v-*-*): New target.
 
-end-sanitize-d10v
 Mon Jul 15 11:53:00 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* config.guess (HP 9000/811): Recognize this as a PA1.1
@@ -532,11 +520,9 @@ Mon Jul  8 17:33:14 1996  Jim Wilson  <wilson@cygnus.com>
 
 	* configure.in (mips-sgi-irix6*): Use mh-irix6 instead of mh-irix5.
 
-start-sanitize-d10v
 Mon Jul  1 13:31:35 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config.sub (basic_machine): Recognize d10v as a valid processor.
-end-sanitize-d10v
 
 Fri Jun 28 12:14:35 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
@@ -4860,8 +4846,8 @@ Fri Nov 22 07:38:11 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
 
 Local Variables:
-mode: indented-text
+mode: change-log
 left-margin: 8
-fill-column: 74
+fill-column: 76
 version-control: never
 End:
diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 619acca..8a7d210 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -335,34 +335,6 @@ else
 	done
 fi
 
-d10v_files="ChangeLog ChangeLog.2 Makefile.in archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h"
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 d30v_files="ChangeLog ChangeLog.2 Makefile.in archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h"
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	for i in $d30v_files ; do
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d8aec39..cef59c0 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -628,13 +628,11 @@ Wed Nov 20 16:31:31 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* elf32-mn10300.c: Rough cut at relocs for the mn10300.
 
-start-sanitize-d10v
 Wed Nov 13 08:12:38 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* Makefile.in (elf32-d10v.o): Don't depend on elf/d10v.h
 	anymore.
 
-end-sanitize-d10v
 Tue Nov 12 13:30:00 1996  Dawn Perchik  <dawn@cygnus.com>
 
 	* filemode.c: Include sysdep.h.
@@ -656,13 +654,11 @@ Tue Oct 29 15:03:02 1996  Doug Evans  <dje@canuck.cygnus.com>
 	complain_overflow_unsigned.
 
 end-sanitize-m32r
-start-sanitize-d10v
 Tue Oct 29 12:53:46 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* elf32-d10v.c (elf_d10v_howto_table): Don't complain on
 	overflows for R_D10V_16 and R_D10V_18.
 
-end-sanitize-d10v
 Tue Oct 29 13:23:53 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ieee.c (ieee_write_section_part): Use LMA rather than VMA.
@@ -1205,13 +1201,11 @@ Mon Sep  9 11:48:41 1996  Jeffrey A Law  (law@cygnus.com)
 	(case R_V850_HI16_S): Likewise.
 
 end-sanitize-v850 
-start-sanitize-d10v
 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
 	and R_D10V_18 to be 1 (word).
 
-end-sanitize-d10v	
 Thu Sep  5 15:23:08 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* stabs.c (_bfd_link_section_stabs): If the output_section field
@@ -1537,12 +1531,10 @@ Wed Aug  7 12:12:03 1996  Ian Lance Taylor  <ian@cygnus.com>
 	(elf_i386_info_to_howto_rel): Check that the reloc type is valid.
 	(elf_i386_relocate_section): Likewise.
 
-start-sanitize-d10v
 Tue Aug  6 12:54:56 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* elf32-d10v.c (elf_d10v_howto_table): Added R_D10V_32.
 
-end-sanitize-d10v	
 Mon Aug  5 13:42:41 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* elf.c (_bfd_elf_make_section_from_shdr): For a loadable section,
@@ -1606,13 +1598,11 @@ Wed Jul 24 12:02:53 1996  Ian Lance Taylor  <ian@cygnus.com>
 	memory position separately from the file position, and use it to
 	compute the alignment adjustment.
 
-start-sanitize-d10v
 Tue Jul 23 10:43:31 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* elf32-d10v.c (elf_d10v_howto_table): Changed all relocs to "long"
  	and fixed mask on R_D10V_10_PCREL_L.
 
-end-sanitize-d10v	
 Mon Jul 22 15:30:30 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* elf64-mips.c: Include "aout/ar.h".
@@ -1702,7 +1692,6 @@ Wed Jul 17 18:02:32 1996  Kim Knuttila  <krk@cygnus.com>
 	* coff-ppc.c: Redid debug scheme - numerous fprintf's gone.
 	Also removed most abort calls, in favor of using bfd reporting.
 
-start-sanitize-d10v
 Wed Jul 17 14:51:52 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* Makefile.in (ALL_MACHINES): Add cpu-d10v.o.
@@ -1719,7 +1708,6 @@ Wed Jul 17 14:51:52 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* reloc.c (BFD_RELOC_D10V_10_PCREL_R, BFD_RELOC_D10V_10_PCREL_L,
  	BFD_RELOC_D10V_18, BFD_RELOC_D10V_18_PCREL): Define.
 	* targets.c (bfd_elf32_d10v_vec): New vector.
-end-sanitize-d10v
 	
 Wed Jul 17 10:58:55 1996  Kim Knuttila  <krk@cygnus.com>
 
@@ -6411,7 +6399,7 @@ See file ChangeLog.2
 
 
 Local Variables:
-mode: indented-text
+mode: change-log
 left-margin: 8
 fill-column: 74
 version-control: never
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index d46d5ea..7da8b02 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1210,9 +1210,7 @@ enum bfd_architecture
   bfd_arch_powerpc,    /* PowerPC */
   bfd_arch_rs6000,     /* IBM RS/6000 */
   bfd_arch_hppa,       /* HP PA RISC */
-  /* start-sanitize-d10v */
   bfd_arch_d10v,       /* Mitsubishi D10V */
-  /* end-sanitize-d10v */
   /* start-sanitize-d30v */
   bfd_arch_d30v,       /* Mitsubishi D30V */
   /* end-sanitize-d30v */
@@ -1841,8 +1839,6 @@ through 0. */
   BFD_RELOC_ARC_B26,
 /* end-sanitize-arc */
 
-/* start-sanitize-d10v */
-
 /* Mitsubishi D10V relocs.
 This is a 10-bit reloc with the right 2 bits
 assumed to be 0. */
@@ -1862,7 +1858,6 @@ assumed to be 0. */
 /* This is an 18-bit reloc with the right 2 bits
 assumed to be 0. */
   BFD_RELOC_D10V_18_PCREL,
-/* end-sanitize-d10v */
 
 /* start-sanitize-d30v */
 
diff --git a/bfd/elf.c b/bfd/elf.c
index fd97456..07a0b48 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2513,11 +2513,9 @@ prep_headers (abfd)
     case bfd_arch_sh:
       i_ehdrp->e_machine = EM_SH;
       break;
-/* start-sanitize-d10v */
     case bfd_arch_d10v:
       i_ehdrp->e_machine = EM_CYGNUS_D10V;
       break;
-/* end-sanitize-d10v */
 /* start-sanitize-d30v */
     case bfd_arch_d30v:
       i_ehdrp->e_machine = EM_CYGNUS_D30V;
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 2e5214c..66cc841 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -743,12 +743,10 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_ARC_B26",
 /* end-sanitize-arc */
 
-/* start-sanitize-d10v */
   "BFD_RELOC_D10V_10_PCREL_R",
   "BFD_RELOC_D10V_10_PCREL_L",
   "BFD_RELOC_D10V_18",
   "BFD_RELOC_D10V_18_PCREL",
-/* end-sanitize-d10v */
 
 /* start-sanitize-d30v */
   "BFD_RELOC_D30V_6",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 201f142..f499fd7 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -2240,7 +2240,6 @@ COMMENT
 {* end-sanitize-arc *}
 
 COMMENT
-{* start-sanitize-d10v *}
 ENUM
   BFD_RELOC_D10V_10_PCREL_R
 ENUMDOC
@@ -2266,7 +2265,6 @@ ENUMDOC
   This is an 18-bit reloc with the right 2 bits
   assumed to be 0.
 COMMENT
-{* end-sanitize-d10v *}
 
 COMMENT
 {* start-sanitize-d30v *}
diff --git a/configure.in b/configure.in
index d9a3817..e190df9 100644
--- a/configure.in
+++ b/configure.in
@@ -423,11 +423,9 @@ case "${target}" in
   arm-*-riscix*)
     noconfigdirs="$noconfigdirs ld target-libgloss"
     ;;
-# start-sanitize-d10v
   d10v-*-*)
     noconfigdirs="$noconfigdirs target-librx target-libg++ target-libstdc++ target-libio target-libgloss"
     ;;
-# end-sanitize-d10v
 # start-sanitize-d30v
   d30v-*-*)
     noconfigdirs="$noconfigdirs sim tcl tk expect gcc gdb newlib ld target-librx target-libg++ target-libstdc++ target-libio target-libgloss"
diff --git a/gas/.Sanitize b/gas/.Sanitize
index f493f45..8e76fb9 100644
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -163,34 +163,6 @@ else
 fi
 
 
-d10v_files="ChangeLog configure.in configure Makefile.in"
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 v850_files="ChangeLog configure.in configure Makefile.in write.c"
 if ( echo $* | grep keep\-v850 > /dev/null ) ; then
 	for i in $v850_files ; do
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c996f60..869d368 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -366,7 +366,6 @@ Thu Jan 30 12:08:40 1997  Ian Lance Taylor  <ian@cygnus.com>
 	(s_space): Set mri_pending_align if an odd number of bytes were
 	output.
 
-start-sanitize-d10v
 Wed Jan 29 15:31:12 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.h (md_do_align): Add this hook to call
@@ -375,7 +374,6 @@ Wed Jan 29 15:31:12 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* config/tc-d10v.c (find_opcode): Correctly calculate
 	branch displacement when .aligns are present.
 
-end-sanitize-d10v	
 Wed Jan 29 09:42:11 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* config/tc-mn10200.c (md_relax_table): Define.
@@ -654,7 +652,6 @@ Wed Dec 18 22:54:39 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-make.sed: Use NewFolderRecursive for installation.
 
-start-sanitize-d10v
 Wed Dec 18 16:00:42 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c (do_assemble): Correct previous bug fix.
@@ -664,7 +661,6 @@ Wed Dec 18 15:27:40 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* config/tc-d10v.c (md_assemble): Fix bug which caused
 	second instruction in a line to be case sensitize. PR11312
 
-end-sanitize-d10v	
 Wed Dec 18 10:08:46 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* config/tc-mn10200.c (mn10200_insert_operand): Don't
@@ -768,13 +764,11 @@ Thu Dec 12 15:18:21 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 	BFD_RELOC_24_PLT_PCREL relocation.
 	(md_apply_fix3): Support BFD_RELOC_24_PLT_PCREL.
 
-start-sanitize-d10v
 Tue Dec 10 13:51:55 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c (write_2_short): Remove code that called
 	parallel_ok() when the programmer specified parallel instructions.
 
-end-sanitize-d10v
 Tue Dec 10 12:23:19 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* config/tc-mn10300.c (md_assemble): Update to handle endianness
@@ -837,7 +831,6 @@ Fri Dec  6 15:36:32 1996  Jeffrey A Law  (law@cygnus.com)
 	* config/tc-mn10300.c: Fix various gcc -Wall warnings.
 	Remove '$' prefixing for registers.
 
-start-sanitize-d10v
 Fri Dec  6 00:55:48 1996  Martin  <hunt@cygnus.com>
 
 	* config/tc-d10v.c (md_assemble): Check to see if prev_seg
@@ -846,19 +839,16 @@ Fri Dec  6 00:55:48 1996  Martin  <hunt@cygnus.com>
 
 	* config/tc-d10v.h (d10v_cleanup): Change prototype.
 	
-end-sanitize-d10v	
 Thu Dec  5 11:03:31 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* write.c (fixup_segment): Don't discard the symbol for a PC
 	relative fixup to an absolute symbol.
 
-start-sanitize-d10v
 Wed Dec  4 15:42:41 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c (md_assemble, d10v_cleanup): Fix bug
 	with multiple sections.
 
-end-sanitize-d10v	
 Wed Dec  4 13:00:07 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/tc-mips.c (md_longopts): Rename mips-16 to mips16, and
@@ -980,14 +970,12 @@ Thu Nov 21 11:56:11 1996  Jeffrey A Law  (law@cygnus.com)
 	(md_assemble): Create fixups as needed.
 	(md_apply_fix3): Gut.  It shouldn't ever get called anymore.
 
-start-sanitize-d10v
 Tue Nov 19 17:48:06 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config/tc-d10v.c (parallel_ok): When automatically converting
 	serial ops to parallel, do not consider a branch as the first
 	instruction.
 
-end-sanitize-d10v
 Tue Nov 19 13:35:22 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* config/tc-mn10300.c (md_assemble): Handle MN10300_OPERAND_REG_LIST.
@@ -998,7 +986,6 @@ Mon Nov 18 15:26:55 1996  Jeffrey A Law  (law@cygnus.com)
 	via PARAMS.
 	(check_operand): Likewise.
 
-start-sanitize-d10v
 Mon Nov 18 15:22:28 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config/tc-d10v.c (parallel_ok): Branch and link instructions
@@ -1016,7 +1003,6 @@ Fri Nov  8 13:55:03 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* doc/c-d10v.texi: Add info on @word modifier.
 
-end-sanitize-d10v	
 Wed Nov  6 13:46:07 1996  Jeffrey A Law  (law@cygnus.com)
 	
 	* config/tc-mn10300.c (mn10300_insert_operand): MN10300_OPERAND_SPLIT
@@ -1106,13 +1092,11 @@ Tue Oct 29 12:28:16 1996  Jeffrey A Law  (law@cygnus.com)
 	do any fixups.
 
 end-sanitize-v850
-start-sanitize-d10v
 Mon Oct 28 10:48:40 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.h (md_cleanup): New function.  This is needed to
 	write out any buffered instructions when a ".end" is found.
 
-end-sanitize-d10v	
 Mon Oct 28 10:43:45 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* read.c (read_a_source_file): New hook md_cleanup().
@@ -1160,13 +1144,11 @@ Tue Oct 22 22:01:25 1996  Jeffrey A Law  (law@cygnus.com)
 	differently for movea & sst/sld insns.
 
 end-sanitize-v850
-start-sanitize-d10v
 Tue Oct 22 17:09:32 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config/tc-d10v.c (parallel_ok): Don't allow illegal combinations
 	of instructions.
 
-end-sanitize-d10v
 Tue Oct 22 11:28:39 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* obj.h (struct format_ops): Add frob_file_after_relocs field.
@@ -1399,14 +1381,12 @@ Tue Sep 24 19:05:08 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* read.c (float_cons): Call md_flush_pending_output if it is
 	defined.
 
-start-sanitize-d10v
 Tue Sep 24 12:22:18 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c (md_operand): Created.  Allows operands to 
 	start with '#'.
 	* config/tc-d10v.h (md_operand): Undefined.
 
-end-sanitize-d10v	
 Mon Sep 23 12:13:18 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/tc-m68k.c (add_fix): Treat a width of '3' like 'B'.
@@ -1469,7 +1449,6 @@ Sat Sep  7 13:25:55 1996  James G. Smith  <jsmith@cygnus.co.uk>
  	instruction field. Add code to generate shorter sequences for
  	constants with a single contiguous seqeuence of ones.
 
-start-sanitize-d10v
 Fri Sep  6 17:07:12 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c (d10v_dot_word): New function to support
@@ -1477,7 +1456,6 @@ Fri Sep  6 17:07:12 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	(md_apply_fix3): Cleanup and changes to support correct sizes
 	for 16 and 18-bit relocs.
 
-end-sanitize-d10v	
 Fri Sep  6 16:00:29 1996  Doug Evans  <dje@canuck.cygnus.com>
 
 	* configure.in (sparc-*-aout): Set `em'.
@@ -1521,13 +1499,11 @@ Wed Sep  4 11:24:29 1996  James G. Smith  <jsmith@cygnus.co.uk>
 	* config/tc-mips.c (load_register): Remove unnecessary code that
  	was causing the high 32bits of 64bit constants to be lost.
 	
-start-sanitize-d10v
 Tue Sep  3 13:52:56 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Added changes to support function
 	pointers and "@word" syntax.
 
-end-sanitize-d10v	
 start-sanitize-v850
 Tue Sep  3 11:57:18 1996  Jeffrey A Law  (law@cygnus.com)
 
@@ -1614,13 +1590,11 @@ Fri Aug 30 18:12:00 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* read.c (emit_expr): Fix conversion of byte count to BFD reloc
 	code.
 
-start-sanitize-d10v
 Fri Aug 30 14:47:38 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c (find_opcode): Fix problem with calculating 
 	branch sizes in across sections.
 
-end-sanitize-d10v	
 start-sanitize-v850
 Fri Aug 30 00:44:13 1996  Jeffrey A Law  (law@cygnus.com)
 
@@ -1633,14 +1607,12 @@ Wed Aug 28 23:11:08 1996  Jeffrey A Law  (law@cygnus.com)
 	table marker.
 
 end-sanitize-v850
-start-sanitize-d10v
 Wed Aug 28 19:20:04 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c (find_opcode): Fix a bug which could generate
 	the wrong opcode for cases like st2w where there are many forms
 	of the same instruction.
 
-end-sanitize-d10v
 Tue Aug 27 13:53:22 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* expr.c (operand): If md_parse_name is defined, call it before
@@ -1661,7 +1633,6 @@ Tue Aug 27 09:05:50 1996  Jeffrey A Law  (law@cygnus.com)
 	* config/tc-hppa.c (tc_gen_reloc): Add new argument to
 	hppa_gen_reloc_type call.
 
-start-sanitize-d10v
 Mon Aug 26 18:24:51 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Fixed ".word".  Fixed problem with range checking
@@ -1673,7 +1644,6 @@ Mon Aug 26 13:39:27 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* config/tc-d10v.c (parallel_ok): Fix bug in parallel 
 	checking code.
 
-end-sanitize-d10v
 Mon Aug 26 14:38:22 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ecoff.c (init_file): Initialize fMerge to 1.
@@ -1682,12 +1652,10 @@ Mon Aug 26 14:38:22 1996  Ian Lance Taylor  <ian@cygnus.com>
 	(ecoff_directive_loc): Clear fMerge field of current file.
 	(ecoff_generate_asm_lineno): Likewise.
 
-start-sanitize-d10v
 Fri Aug 23 11:40:47 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* doc/c-d10v.texi: Fix typo. 
 
-end-sanitize-d10v	
 start-sanitize-v850
 Fri Aug 23 10:41:32 1996  Jeffrey A Law  (law@cygnus.com)
 
@@ -1728,13 +1696,11 @@ Thu Aug 22 10:20:30 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* ecoff.c (ecoff_directive_endef): Avoid a division by zero error
 	if an array dimension is not known.
 
-start-sanitize-d10v
 Thu Aug 22 10:50:00 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Fix a reloc bug caused by my last change. 
 	* doc/c-d10v.texi: Cleanup.
 	
-end-sanitize-d10v	
 start-sanitize-v850
 Tue Aug 20 15:15:16 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
 
@@ -1744,7 +1710,6 @@ Tue Aug 20 15:15:16 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
 	* configure.in (v850-*-elf): New target.
 	
 end-sanitize-v850
-start-sanitize-d10v
 Wed Aug 21 15:50:54 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* doc/c-d10v.texi: New file.
@@ -1756,7 +1721,6 @@ Tue Aug 20 14:10:02 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* config/tc-d10v.c: All references to defined symbols should
  	now use the optimal instruction.  .float and .double now work. 
 
-end-sanitize-d10v	
 Mon Aug 19 14:41:36 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/obj-coff.c (fixup_segment): Adjust PC relative reloc by
@@ -1767,14 +1731,12 @@ Thu Aug 15 16:37:59 1996  Stan Shebs  <shebs@andros.cygnus.com>
 	* mpw-config.in: Add wildcards for config matching, add mips-*-*
 	case, forward-include bfd/elf-bfd.h.
 
-start-sanitize-d10v
 Thu Aug 15 13:24:30 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Add additional information to the opcode
         table to help determinine which instructions can be done
         in parallel. 
 
-end-sanitize-d10v	
 Thu Aug 15 17:01:31 1996  James G. Smith  <jsmith@cygnus.co.uk>
 
 	* config/tc-arm.c: Major changes to add Thumb support, with lots
@@ -1824,12 +1786,10 @@ Mon Aug 12 16:49:43 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/tc-mips.h (BYTE_ORDER): Don't define.  No longer used.
 
-start-sanitize-d10v
 Fri Aug  9 17:48:28 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Fix problem with relocs. 
 
-end-sanitize-d10v	
 Fri Aug  9 14:16:14 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/tc-sh.c (sh_do_align): If not BFD_ASSEMBLER, always align
@@ -1883,12 +1843,10 @@ Wed Aug  7 11:50:26 1996  Ian Lance Taylor  <ian@cygnus.com>
 	as_fatal.  Change the error message slightly.  Set howto to a
 	non-NULL value in order to keep going.
 
-start-sanitize-d10v
 Tue Aug  6 12:58:03 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Added code to support 32-bit fixups for stabs.
 
-end-sanitize-d10v	
 Tue Aug  6 11:15:26 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* config/tc-h8300.c (get_specific): New operand "size" derived
@@ -1909,23 +1867,19 @@ Thu Aug  1 23:51:52 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* config/tc-hppa.c: Revert yesterday's changes.
 	
-start-sanitize-d10v
 Wed Jul 31 14:46:11 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Disable range checking on 16-bit values.
 
-end-sanitize-d10v	
 Wed Jul 31 16:27:19 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/tc-m68k.c (m68k_ip): Set ok_arch for every instruction,
 	not just the ones that don't match.
 
-start-sanitize-d10v
 Wed Jul 31 11:45:15 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Fixed bugs in short relocs and range checking.
 
-end-sanitize-d10v
 Wed Jul 31 15:41:42 1996  James G. Smith  <jsmith@cygnus.co.uk>
 
 	* config/tc-arm.c: Changed INSN_SIZE to variable insn_size, as
@@ -1963,20 +1917,17 @@ Tue Jul 30 15:51:41 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* config/tc-sparc.c (md_pseudo_table): Add 2byte, 4byte, and 8byte
 	pseudo-ops.
 
-start-sanitize-d10v
 Fri Jul 26 11:43:03 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c: Added lots of error checking.  Added hacks
 	to support accumulator shifts.
 	
-end-sanitize-d10v
 Fri Jul 26 11:56:08 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* symbols.c (S_SET_EXTERNAL): Let .weak override.
 	(S_CLEAR_EXTERNAL): Likewise.
 	(S_SET_WEAK): Remove error; just let .weak override.
 
-start-sanitize-d10v
 Thu Jul 25 15:22:51 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/tc-d10v.c (md_assemble): Now handles multiline
@@ -2002,7 +1953,6 @@ Mon Jul 22 11:32:36 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	(d10v_insert_operand): Now works correctly for either container.
 	* config/tc-d10v.h (d10v_cleanup): Declare. 
 	
-end-sanitize-d10v	
 Mon Jul 22 14:01:33 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/tc-mips.c (tc_gen_reloc): BFD_RELOC_PCREL_HI16_S and
@@ -2059,7 +2009,6 @@ Thu Jul 18 15:54:54 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* config/tc-m68k.c (m68k_ip): Use the correct length when
 	allocating space for the unsupported architecture error message.
 
-start-sanitize-d10v
 Thu Jul 18 12:57:10 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* configure.in (d10v-*-*): Allow d10v-*-*, don't require d10v-*-elf*.
@@ -2070,7 +2019,6 @@ Wed Jul 17 14:25:13 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* config/tc-d10v.h: New file.
 	* configure (d10v-*-elf): New target.
 	* configure.in (d10v-*-elf): New target.
-end-sanitize-d10v
 	
 Fri Jul 12 20:54:19 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
diff --git a/gas/configure b/gas/configure
index 23864c3..2283205 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.10 
+# Generated automatically using autoconf version 2.12 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -55,6 +55,8 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
 
 ac_prev=
 for ac_option
@@ -336,7 +338,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.10"
+    echo "configure generated by autoconf version 2.12"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -438,11 +440,14 @@ do
 done
 
 # NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
 if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
@@ -504,6 +509,7 @@ ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -601,6 +607,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:611: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -615,12 +622,13 @@ NONE)
 esac
 
 host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:632: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -632,12 +640,13 @@ NONE)
 esac
 
 target=`$ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:650: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -649,9 +658,9 @@ NONE)
 esac
 
 build=`$ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$build" 1>&6
 
 test "$host_alias" != "$target_alias" &&
@@ -774,9 +783,7 @@ for this_target in $target $canon_targets ; do
       arm-*-riscix*)        fmt=aout ;;
       arm-*-pe)             fmt=coff targ=armcoff em=pe ;;
 
-# start-sanitize-d10v
       d10v-*-*)		    fmt=elf bfd_gas=yes ;;
-# end-sanitize-d10v
 # start-sanitize-d30v
       d30v-*-*)		    fmt=elf bfd_gas=yes ;;
 # end-sanitize-d30v
@@ -1385,6 +1392,7 @@ EOF
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1396: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1413,6 +1421,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1425: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1459,7 +1468,47 @@ fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:1473: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext <<EOF
+#line 1483 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+if { (eval echo configure:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  ac_cv_prog_cc_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cc_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:1507: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:1512: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1468,7 +1517,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1476,29 +1525,34 @@ fi
 fi
 
 echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  if test "${CFLAGS+set}" != set; then
-    echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1536: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_gcc_g=yes
+  ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_gcc_g=no
+  ac_cv_prog_cc_g=no
 fi
 rm -f conftest*
 
 fi
 
-echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
-    if test $ac_cv_prog_gcc_g = yes; then
-      CFLAGS="-g -O"
-    else
-      CFLAGS="-O"
-    fi
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
   fi
 else
   GCC=
@@ -1516,11 +1570,12 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:1574: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
@@ -1543,7 +1598,7 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_ifs"
+  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -1566,6 +1621,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:1625: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1580,33 +1636,37 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1584 "configure"
+#line 1640 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
   echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1599 "configure"
+#line 1657 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
   echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   CPP=/lib/cpp
 fi
@@ -1623,24 +1683,27 @@ echo "$ac_t""$CPP" 1>&6
 
 for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h errno.h sys/types.h
 do
-ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1689: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1633 "configure"
+#line 1694 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
 else
   echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=no"
 fi
@@ -1648,7 +1711,7 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
@@ -1662,6 +1725,7 @@ done
 # Put this here so that autoconf's "cross-compiling" message doesn't confuse
 # people who are not cross-compiling but are compiling cross-assemblers.
 echo $ac_n "checking whether compiling a cross-assembler""... $ac_c" 1>&6
+echo "configure:1729: checking whether compiling a cross-assembler" >&5
 if test "${host}" = "${target}"; then
   cross_gas=no
 else
@@ -1673,56 +1737,31 @@ EOF
 fi
 echo "$ac_t""$cross_gas" 1>&6
 
-# If we cannot run a trivial program, we must be cross compiling.
-echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_cross=yes
-else
-cat > conftest.$ac_ext <<EOF
-#line 1686 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-{ (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  ac_cv_c_cross=no
-else
-  ac_cv_c_cross=yes
-fi
-fi
-rm -fr conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_cross" 1>&6
-cross_compiling=$ac_cv_c_cross
-
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "configure:1744: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1710 "configure"
+#line 1749 "configure"
 #include "confdefs.h"
 #include <alloca.h>
-int main() { return 0; }
-int t() {
+int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   ac_cv_header_alloca_h=no
 fi
 rm -f conftest*
-
 fi
 
 echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
@@ -1734,11 +1773,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
+echo "configure:1777: checking for alloca" >&5
+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1742 "configure"
+#line 1782 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1757,31 +1797,31 @@ char *alloca ();
 # endif
 #endif
 
-int main() { return 0; }
-int t() {
+int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
-  ac_cv_func_alloca=yes
+  ac_cv_func_alloca_works=yes
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_func_alloca=no
+  ac_cv_func_alloca_works=no
 fi
 rm -f conftest*
-
 fi
 
-echo "$ac_t""$ac_cv_func_alloca" 1>&6
-if test $ac_cv_func_alloca = yes; then
+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
+if test $ac_cv_func_alloca_works = yes; then
   cat >> confdefs.h <<\EOF
 #define HAVE_ALLOCA 1
 EOF
 
 fi
 
-if test $ac_cv_func_alloca = no; then
+if test $ac_cv_func_alloca_works = no; then
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
   # that cause trouble.  Some versions do not even contain alloca or
   # contain a buggy version.  If you still want to use their alloca,
@@ -1793,11 +1833,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo "configure:1837: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1801 "configure"
+#line 1842 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1822,11 +1863,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1867: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1830 "configure"
+#line 1872 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1836,8 +1878,7 @@ else
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
 
-int main() { return 0; }
-int t() {
+int main() {
 
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -1850,16 +1891,18 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-
 fi
+
 if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<EOF
@@ -1875,14 +1918,15 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "configure:1922: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
 else
-cat > conftest.$ac_ext <<EOF
-#line 1886 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1930 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1901,16 +1945,20 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-{ (eval echo configure:1905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
   ac_cv_c_stack_direction=1
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   ac_cv_c_stack_direction=-1
 fi
-fi
 rm -fr conftest*
 fi
 
+fi
+
 echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
 cat >> confdefs.h <<EOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
@@ -1919,26 +1967,28 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:1971: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1929 "configure"
+#line 1978 "configure"
 #include "confdefs.h"
 
-int main() { return 0; }
-int t() {
+int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-
 done
 
 fi
@@ -1961,11 +2011,12 @@ esac
 for ac_func in unlink remove
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2015: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1969 "configure"
+#line 2020 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1975,8 +2026,7 @@ else
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
 
-int main() { return 0; }
-int t() {
+int main() {
 
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -1989,16 +2039,18 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-
 fi
+
 if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
@@ -2016,11 +2068,12 @@ done
 for ac_func in sbrk
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2072: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2024 "configure"
+#line 2077 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2030,8 +2083,7 @@ else
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
 
-int main() { return 0; }
-int t() {
+int main() {
 
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -2044,16 +2096,18 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-
 fi
+
 if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
@@ -2071,16 +2125,16 @@ done
 # enough, but on some of those systems, the assert macro relies on requoting
 # working properly!
 echo $ac_n "checking for working assert macro""... $ac_c" 1>&6
+echo "configure:2129: checking for working assert macro" >&5
 if eval "test \"`echo '$''{'gas_cv_assert_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2079 "configure"
+#line 2134 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
-int main() { return 0; }
-int t() {
+int main() {
 
 /* check for requoting problems */
 static int a, b, c, d;
@@ -2092,15 +2146,16 @@ assert (a == b
 
 ; return 0; }
 EOF
-if { (eval echo configure:2096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gas_cv_assert_ok=yes
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   gas_cv_assert_ok=no
 fi
 rm -f conftest*
-
 fi
 echo "$ac_t""$gas_cv_assert_ok" 1>&6
 test $gas_cv_assert_ok = yes || cat >> confdefs.h <<\EOF
@@ -2132,15 +2187,15 @@ gas_test_headers="
 "
 
 echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6
+echo "configure:2191: checking whether declaration is required for strstr" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_strstr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2140 "configure"
+#line 2196 "configure"
 #include "confdefs.h"
 $gas_test_headers
-int main() { return 0; }
-int t() {
+int main() {
 
 typedef char *(*f)();
 f x;
@@ -2148,15 +2203,16 @@ x = (f) strstr;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gas_cv_decl_needed_strstr=no
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   gas_cv_decl_needed_strstr=yes
 fi
 rm -f conftest*
-
 fi
 echo "$ac_t""$gas_cv_decl_needed_strstr" 1>&6
 test $gas_cv_decl_needed_strstr = no || {
@@ -2168,15 +2224,15 @@ EOF
 
 
 echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6
+echo "configure:2228: checking whether declaration is required for malloc" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2176 "configure"
+#line 2233 "configure"
 #include "confdefs.h"
 $gas_test_headers
-int main() { return 0; }
-int t() {
+int main() {
 
 typedef char *(*f)();
 f x;
@@ -2184,15 +2240,16 @@ x = (f) malloc;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gas_cv_decl_needed_malloc=no
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   gas_cv_decl_needed_malloc=yes
 fi
 rm -f conftest*
-
 fi
 echo "$ac_t""$gas_cv_decl_needed_malloc" 1>&6
 test $gas_cv_decl_needed_malloc = no || {
@@ -2204,15 +2261,15 @@ EOF
 
 
 echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6
+echo "configure:2265: checking whether declaration is required for free" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2212 "configure"
+#line 2270 "configure"
 #include "confdefs.h"
 $gas_test_headers
-int main() { return 0; }
-int t() {
+int main() {
 
 typedef void (*f)();
 f x;
@@ -2220,15 +2277,16 @@ x = (f) free;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gas_cv_decl_needed_free=no
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   gas_cv_decl_needed_free=yes
 fi
 rm -f conftest*
-
 fi
 echo "$ac_t""$gas_cv_decl_needed_free" 1>&6
 test $gas_cv_decl_needed_free = no || {
@@ -2240,15 +2298,15 @@ EOF
 
 
 echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6
+echo "configure:2302: checking whether declaration is required for sbrk" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_sbrk'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2248 "configure"
+#line 2307 "configure"
 #include "confdefs.h"
 $gas_test_headers
-int main() { return 0; }
-int t() {
+int main() {
 
 typedef char *(*f)();
 f x;
@@ -2256,15 +2314,16 @@ x = (f) sbrk;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gas_cv_decl_needed_sbrk=no
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   gas_cv_decl_needed_sbrk=yes
 fi
 rm -f conftest*
-
 fi
 echo "$ac_t""$gas_cv_decl_needed_sbrk" 1>&6
 test $gas_cv_decl_needed_sbrk = no || {
@@ -2279,19 +2338,19 @@ EOF
 # for it?
 
 echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6
+echo "configure:2342: checking whether declaration is required for errno" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2287 "configure"
+#line 2347 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
 
-int main() { return 0; }
-int t() {
+int main() {
 
 typedef int f;
 f x;
@@ -2299,15 +2358,16 @@ x = (f) errno;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gas_cv_decl_needed_errno=no
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   gas_cv_decl_needed_errno=yes
 fi
 rm -f conftest*
-
 fi
 echo "$ac_t""$gas_cv_decl_needed_errno" 1>&6
 test $gas_cv_decl_needed_errno = no || {
@@ -2387,11 +2447,25 @@ cat > confcache <<\EOF
 # --recheck option to rerun configure.
 #
 EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
-  >> confcache
+  case `(ac_space=' '; set) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
 if cmp -s $cache_file confcache; then
   :
 else
@@ -2446,7 +2520,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.10"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -2524,20 +2598,56 @@ s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
 
 CEOF
 EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile .gdbinit:gdbinit.in"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile]", defaulting infile="outfile.in".
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
 
-  # Adjust relative srcdir, etc. for subdirectories.
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 
   # Remove last slash and all that follows it.  Not all systems have dirname.
   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
@@ -2565,6 +2675,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
   [/$]*) INSTALL="$ac_given_INSTALL" ;;
   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
   esac
+
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
@@ -2573,14 +2684,16 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
 s%@INSTALL@%$INSTALL%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 fi; done
-rm -f conftest.subs
+rm -f conftest.s*
 
 # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
 # NAME is the cpp macro being defined and VALUE is the value it is being given.
@@ -2601,11 +2714,17 @@ ac_eB='$%\1#\2define\3'
 ac_eC=' '
 ac_eD='%g'
 
-CONFIG_HEADERS=${CONFIG_HEADERS-"conf"}
+if test "${CONFIG_HEADERS+set}" != set; then
+EOF
+cat >> $CONFIG_STATUS <<EOF
+  CONFIG_HEADERS="conf"
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+fi
 for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile]", defaulting infile="outfile.in".
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
@@ -2613,7 +2732,8 @@ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
   echo creating $ac_file
 
   rm -f conftest.frag conftest.in conftest.out
-  cp $ac_given_srcdir/$ac_file_in conftest.in
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  cat $ac_file_inputs > conftest.in
 
 EOF
 
@@ -2641,8 +2761,6 @@ EOF
 
 # Break up conftest.vals because some shells have a limit on
 # the size of here documents, and old seds have small limits too.
-# Maximum number of lines to put in a single here document.
-ac_max_here_lines=12
 
 rm -f conftest.tail
 while :
@@ -2729,7 +2847,11 @@ while test -n "$ac_sources"; do
     { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
   fi
 done
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 
 exit 0
 EOF
diff --git a/gas/configure.in b/gas/configure.in
index 684ef7b..653a0ef 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -130,9 +130,7 @@ changequote([,])dnl
       arm-*-riscix*)        fmt=aout ;;
       arm-*-pe)             fmt=coff targ=armcoff em=pe ;;
 
-# start-sanitize-d10v
       d10v-*-*)		    fmt=elf bfd_gas=yes ;;
-# end-sanitize-d10v
 # start-sanitize-d30v
       d30v-*-*)		    fmt=elf bfd_gas=yes ;;
 # end-sanitize-d30v
diff --git a/gas/doc/.Sanitize b/gas/doc/.Sanitize
index 8770cc7..0ffaa20 100644
--- a/gas/doc/.Sanitize
+++ b/gas/doc/.Sanitize
@@ -94,34 +94,6 @@ if [ -n "${verbose}" ] ; then
 	echo Processing \"arc\"...
 fi
 
-d10v_files="all.texi as.texinfo"
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 3e962ce..864229a 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -207,11 +207,9 @@ Here is a brief summary of how to invoke @code{@value{AS}}.  For details,
  [ -mbig-endian | -mlittle-endian ]
 @end ifset
 @c end-sanitize-arc
-@c start-sanitize-d10v
 @ifset D10V
  [ -O ]
 @end ifset
-@c end-sanitize-d10v
 
 @ifset H8
 @c Hitachi family chips have no machine-dependent assembler options
@@ -221,7 +219,7 @@ Here is a brief summary of how to invoke @code{@value{AS}}.  For details,
 @end ifset
 @ifset SPARC
 @c The order here is important.  See c-sparc.texi.
- [ -Av6 | -Av7 | -Av8 | -Asparclite | -Av9 | -Av9a ]
+ [ -Av6 | -Av7 | -Av8 | -Asparclet | -Asparclite | -Av9 | -Av9a ]
  [ -xarch=v8plus | -xarch=v8plusa ] [ -bump ]
 @end ifset
 @ifset Z8000
@@ -359,7 +357,6 @@ Generate ``little endian'' format output.
 @end table
 @end ifset
 
-@c start-sanitize-d10v
 @ifset D10V
 The following options are available when @value{AS} is configured for
 a D10V processor.
@@ -370,7 +367,6 @@ a D10V processor.
 Optimize output by parallelizing instructions.
 @end table
 @end ifset
-@c end-sanitize-d10v
 
 @ifset I960
 The following options are available when @value{AS} is configured for the
@@ -423,7 +419,7 @@ The following options are available when @code{@value{AS}} is configured
 for the SPARC architecture:
 
 @table @code
-@item -Av6 | -Av7 | -Av8 | -Asparclite | -Av9 | -Av9a
+@item -Av6 | -Av7 | -Av8 | -Asparclet | -Asparclite | -Av9 | -Av9a
 Explicitly select a variant of the SPARC architecture.
 
 @item -xarch=v8plus | -xarch=v8plusa
@@ -3014,18 +3010,27 @@ but ignores it.
 @end ifset
 
 @node Align
-@section @code{.align @var{abs-expr} , @var{abs-expr}}
+@section @code{.align @var{abs-expr}, @var{abs-expr}, @var{abs-expr}}
 
 @cindex padding the location counter
 @cindex @code{align} directive
-Pad the location counter (in the current subsection) to a particular
-storage boundary.  The first expression (which must be absolute) is the
-alignment required, as described below.
-The second expression (also absolute) gives the value to be stored in
-the padding bytes.  It (and the comma) may be omitted.  If it is
-omitted, the padding bytes are zero.  
-For the alpha, if the section is marked as containing code and the
-padding expression is omitted, then the space is filled with no-ops.
+Pad the location counter (in the current subsection) to a particular storage
+boundary.  The first expression (which must be absolute) is the alignment
+required, as described below.
+
+The second expression (also absolute) gives the fill value to be stored in the
+padding bytes.  It (and the comma) may be omitted.  If it is omitted, the
+padding bytes are normally zero.  However, on some systems, if the section is
+marked as containing code and the fill value is omitted, the space is filled
+with no-op instructions.
+
+The third expression is also absolute, and is also optional.  If it is present,
+it is the maximum number of bytes that should be skipped by this alignment
+directive.  If doing the alignment would require skipping more bytes than the
+specified maximum, then the alignment is not done at all.  You can omit the
+fill value (the second argument) entirely by simply using two commas after the
+required alignment; this can be useful if you want the alignment to be filled
+with no-op instructions when appropriate.
 
 The way the required alignment is specified varies from system to system.
 For the a29k, hppa, m68k, m88k, w65, sparc, and Hitachi SH, and i386 using ELF
@@ -3084,7 +3089,7 @@ trailing zero byte) into consecutive addresses.
 a zero byte.  The ``z'' in @samp{.asciz} stands for ``zero''.
 
 @node Balign
-@section @code{.balign[wl] @var{abs-expr} , @var{abs-expr}}
+@section @code{.balign[wl] @var{abs-expr}, @var{abs-expr}, @var{abs-expr}}
 
 @cindex padding the location counter given number of bytes
 @cindex @code{balign} directive
@@ -3094,9 +3099,19 @@ alignment request in bytes.  For example @samp{.balign 8} advances
 the location counter until it is a multiple of 8.  If the location counter
 is already a multiple of 8, no change is needed.
 
-The second expression (also absolute) gives the value to be stored in
-the padding bytes.  It (and the comma) may be omitted.  If it is
-omitted, the padding bytes are zero.
+The second expression (also absolute) gives the fill value to be stored in the
+padding bytes.  It (and the comma) may be omitted.  If it is omitted, the
+padding bytes are normally zero.  However, on some systems, if the section is
+marked as containing code and the fill value is omitted, the space is filled
+with no-op instructions.
+
+The third expression is also absolute, and is also optional.  If it is present,
+it is the maximum number of bytes that should be skipped by this alignment
+directive.  If doing the alignment would require skipping more bytes than the
+specified maximum, then the alignment is not done at all.  You can omit the
+fill value (the second argument) entirely by simply using two commas after the
+required alignment; this can be useful if you want the alignment to be filled
+with no-op instructions when appropriate.
 
 @cindex @code{balignw} directive
 @cindex @code{balignl} directive
@@ -3858,7 +3873,7 @@ absolute expression.  If the comma and @var{fill} are omitted,
 @var{fill} defaults to zero.
 
 @node P2align
-@section @code{.p2align[wl] @var{abs-expr} , @var{abs-expr}}
+@section @code{.p2align[wl] @var{abs-expr}, @var{abs-expr}, @var{abs-expr}}
 
 @cindex padding the location counter given a power of two
 @cindex @code{p2align} directive
@@ -3869,9 +3884,19 @@ advancement.  For example @samp{.p2align 3} advances the location
 counter until it a multiple of 8.  If the location counter is already a
 multiple of 8, no change is needed.
 
-The second expression (also absolute) gives the value to be stored in
-the padding bytes.  It (and the comma) may be omitted.  If it is
-omitted, the padding bytes are zero.
+The second expression (also absolute) gives the fill value to be stored in the
+padding bytes.  It (and the comma) may be omitted.  If it is omitted, the
+padding bytes are normally zero.  However, on some systems, if the section is
+marked as containing code and the fill value is omitted, the space is filled
+with no-op instructions.
+
+The third expression is also absolute, and is also optional.  If it is present,
+it is the maximum number of bytes that should be skipped by this alignment
+directive.  If doing the alignment would require skipping more bytes than the
+specified maximum, then the alignment is not done at all.  You can omit the
+fill value (the second argument) entirely by simply using two commas after the
+required alignment; this can be useful if you want the alignment to be filled
+with no-op instructions when appropriate.
 
 @cindex @code{p2alignw} directive
 @cindex @code{p2alignl} directive
@@ -4077,7 +4102,7 @@ section is executable
 Set the value of @var{symbol} to @var{expression}.  This
 changes @var{symbol}'s value and type to conform to
 @var{expression}.  If @var{symbol} was flagged as external, it remains
-flagged. (@xref{Symbol Attributes}.)
+flagged (@pxref{Symbol Attributes}).
 
 You may @code{.set} a symbol many times in the same assembly.
 
@@ -4446,11 +4471,9 @@ subject, see the hardware manufacturer's manual.
 * ARC-Dependent::               ARC Dependent Features
 @end ifset
 @c end-sanitize-arc
-@c start-sanitize-d10v
 @ifset D10V
 * D10V-Dependent::              D10V Dependent Features
 @end ifset
-@c end-sanitize-d10v
 @ifset H8/300
 * H8/300-Dependent::            Hitachi H8/300 Dependent Features
 @end ifset
@@ -4597,11 +4620,9 @@ family.
 @end ifclear
 @end ifset
 
-@c start-sanitize-d10v
 @ifset D10V
 @include c-d10v.texi
 @end ifset
-@c end-sanitize-d10v
 
 @ifset H8/300
 @include c-h8300.texi
diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index faea153..8f5c04e 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -521,33 +521,6 @@ else
 	done
 fi
 
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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\-gm > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
diff --git a/gdb/ChangeLog-96 b/gdb/ChangeLog-96
index 9134242..e8c1204 100644
--- a/gdb/ChangeLog-96
+++ b/gdb/ChangeLog-96
@@ -90,13 +90,11 @@ Mon Dec 23 02:25:58 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 	to reflect the fact that we are now using an AT_ENTRY_POINT
 	call dummy.
 
-start-sanitize-d10v
 Sun Dec 22 15:52:25 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-tdep.c (d10v_skip_prologue): PR11287.  Fix problem where
 	some breakpoints weren't being set.
 
-end-sanitize-d10v	
 Sat Dec 21 12:57:59 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* config/mips/tm-mips.h (PC_IN_CALL_DUMMY):  Removed, the default
@@ -244,14 +242,12 @@ Sun Dec  8 00:36:31 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 	(xfer_link_map_member):  Work around problem with alignments
 	in struct obj when compiling GDB under N32 ABI.
 
-start-sanitize-d10v
 Thu Dec  5 23:30:44 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* d10v-tdep.c: Add support for examination and interpretation
 	of instruction trace buffer.
 	(trace, untrace, info trace, tdisassemble): New commands.
 
-end-sanitize-d10v
 Thu Dec  5 14:06:23 1996  Doug Evans  <dje@canuck.cygnus.com>
 
 	* config/sparc/tm-sparclet.h (TARGET_BYTE_ORDER): Undef.
@@ -562,7 +558,6 @@ Mon Nov 25 13:17:16 1996  Fred Fish  <fnf@ninemoons.com>
 	From: Paul Eggert <eggert@twinsun.com>
 	* remote-bug.c (wait_strings): Avoid creating a trigraph.
 
-start-sanitize-d10v
 Fri Nov 22 15:55:22 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* valops.c (value_at, value_fetch_lazy): Put in D10V call 
@@ -570,7 +565,6 @@ Fri Nov 22 15:55:22 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* values.c (value_from_longest): Removed previous d10v changes.
 	* config/d10v/tm-d10v.h (TARGET_PTR_BIT): Change to 4 bytes.
 	
-end-sanitize-d10v
 Fri Nov 22 10:06:19 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* config/i386/nm-i386v4.h (LOSING_POLL):  Define, needed for
@@ -593,7 +587,6 @@ Wed Nov 20 19:09:16 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	virtual buf instead of the raw buf.  Needed for REGISTER_CONVERT 
 	to work with non-floating point regs.
 
-start-sanitize-d10v
 	* d10v-tdep.c (d10v_skip_prologue): If we have line debugging 
 	information, then the end of the prologue should the first 
 	assembly instruction of the first source line.
@@ -608,7 +601,7 @@ start-sanitize-d10v
 	(REGISTER_CONVERT_TO_RAW): Define.
 	(D10V_MAKE_DADDR): Define.
 	(D10V_MAKE_IADDR): Define.
-end-sanitize-d10v
+
 Wed Nov 20 16:15:15 1996  Geoffrey Noer  <noer@cygnus.com>
 
         * config/i386/cygwin32.mh: add MMALLOC_CFLAGS = -I$(MMALLOC_SRC)
@@ -667,10 +660,8 @@ Thu Nov 14 15:54:20 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 	instead of doing addr>>32 to eliminate a warning produced by GCC
 	on 32-bit systems.
 
-start-sanitize-d10v
 	* config/d10v/tm-d10v.h (ULONGEST): Define.
 
-end-sanitize-d10v
 Tue Nov 12 12:25:27 1996  Jim Wilson  <wilson@cygnus.com>
 
 	* c-typeprint.c (cp_type_print_method_args): Pass -1 for show in
@@ -768,14 +759,12 @@ Fri Nov  8 12:29:51 1996  Stan Shebs  <shebs@andros.cygnus.com>
 	* remote-sim.c (simulator_command): Set up callbacks before
 	entering the simulator.
 
-start-sanitize-d10v
 Thu Nov  7 15:19:08 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-tdep.c: Fix some problems with inferior function calls.
 	* config/d10v/tm-d10v.h (EXTRA_FRAME_INFO): Change dummy to be
 	a pointer to the dummy's stack instead of just a flag.
 	
-end-sanitize-d10v	
 start-sanitize-m32r
 Tue Nov  5 10:21:02 1996  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
@@ -808,14 +797,12 @@ Sat Nov  2 03:54:13 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 	for shared libraries from the minimal symbol table of the main
 	executable first.
 
-start-sanitize-d10v
 Fri Nov  1 13:59:28 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-tdep.c, config/d10v/tm-d10v.h:  Major fixes to support
 	inferior function calls and proper stack backtracing on D10V-EVA
 	board.
 
-end-sanitize-d10v
 Fri Nov  1 10:50:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config/powerpc/linux.mh (NATDEPFILES): Fix up things so that it
@@ -859,7 +846,6 @@ Tue Oct 29 14:59:20 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* TODO: Add item suggesting an "info bfd" command.
 
-start-sanitize-d10v
 Tue Oct 29 12:48:04 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-tdep.c: Snapshot that supports D10V-EVA board.
@@ -867,7 +853,6 @@ Tue Oct 29 12:48:04 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* config/d10v/tm-d10v.h (REGISTER_NAMES): Add imap0,imap1,dmap.
 	(TARGET_READ_FP,TARGET_WRITE_FP): Define. 
 	
-end-sanitize-d10v
 Mon Oct 28 17:34:24 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* mswin/genmakes mswin/recordit:  New scripts to generate make
@@ -939,13 +924,11 @@ Tue Oct 22 16:28:20 1996  Stu Grossman  (grossman@critters.cygnus.com)
 	* (v850_frame_chain):  Use new calling convention for scan_prologue.
 
 end-sanitize-v850
-start-sanitize-d10v
 Tue Oct 22 10:25:29 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-tdep.c, config/d10v/tm-d10v.h: Changes to allow stack
  	backtraces and inferior function calls.
 
-end-sanitize-d10v	
 Tue Oct 22 10:32:46 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-make.sed: Update init.c editing to work with Oct 8 change.
@@ -1252,13 +1235,11 @@ start-sanitize-gdbtk
 	15 seconds to 30 seconds.
 end-sanitize-gdbtk
 	
-start-sanitize-d10v
 Fri Sep 27 13:32:53 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config/d10v/tm-d10v.h (TARGET_{INT,PTR}_BIT): Define.
 	(TARGET_{,LONG_}DOUBLE_BIT): Ditto.
 
-end-sanitize-d10v
 Thu Sep 26 23:10:26 1996  Mark Alexander  <marka@cygnus.com>
 
 	* configure.in, config/i386/tm-linux.h: Fix configure
@@ -1271,14 +1252,12 @@ Wed Sep 25 18:31:33 1996  Stan Shebs  <shebs@andros.cygnus.com>
 	* config/m68k/monitor.mt (TDEPFILES): Add it.
 	* NEWS: Mention it.
 
-start-sanitize-d10v
 Mon Sep 23 16:13:50 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/d10v/tm-d10v.h (SAVED_PC_AFTER_CALL): Fixed.  
 	Now single-steps correctly.
 	* d10v-tdep.c (d10v_pop_frame): Fixed.
 
-end-sanitize-d10v	
 Fri Sep 20 16:10:58 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* config/sh/tm-sh.h (REGISTER_NAMES): Move fp registers to
@@ -1289,7 +1268,6 @@ Fri Sep 20 16:10:58 1996  Stan Shebs  <shebs@andros.cygnus.com>
 	Rearrange to match REGISTER_NAMES.
 	* sh3-rom.c (sh3_regnames, sh3e_regnames): Ditto.
 
-start-sanitize-d10v
 Thu Sep 19 16:19:01 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-tdep.c:  Stack chain should work now. 
@@ -1298,7 +1276,6 @@ Tue Sep 17 18:46:57 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-tdep.c, config/d10v/tm-d10v.h: Snapshot. 
 
-end-sanitize-d10v	
 Tue Sep 17 12:20:50 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.in: Add cases for MIPS 5000 like MIPS 4300.
@@ -1498,7 +1475,6 @@ Tue Aug 27 04:25:08 1996  Geoffrey Noer  <noer@cygnus.com>
         to before the first.
 	* configure: regenerated
 
-start-sanitize-d10v
 Mon Aug 26 18:36:54 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* config/d10v/d10v.mt: New file.
@@ -1506,7 +1482,6 @@ Mon Aug 26 18:36:54 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* configure.in: New target D10V.	 
 	* d10v-tdep.c: New file. 
 
-end-sanitize-d10v	
 Sun Aug 25 00:09:47 1996  Fred Fish  <fnf@rtl.cygnus.com>
 
 	* rs6000-tdep.c: Fix typo in comment.
@@ -5552,7 +5527,7 @@ Tue Jan  2 13:41:14 1996  Stan Shebs  <shebs@andros.cygnus.com>
 For older changes see ChangeLog-95
 
 Local Variables:
-mode: indented-text
+mode: change-log
 left-margin: 8
 fill-column: 74
 version-control: never
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index f596678..6bdffbe 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -54,9 +54,7 @@ arm-*-*)		gdb_target=arm ;;
 c1-*-*)			gdb_target=convex ;;
 c2-*-*)			gdb_target=convex ;;
 
-# start-sanitize-d10v
 d10v-*-*)		gdb_target=d10v ;;
-# end-sanitize-d10v
 
 h8300-*-*)		gdb_target=h8300 ;;
 h8500-*-*)		gdb_target=h8500 ;;
diff --git a/gdb/valops.c b/gdb/valops.c
index fc98c95..f902304 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -45,7 +45,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 static int typecmp PARAMS ((int staticp, struct type *t1[], value_ptr t2[]));
 
+#ifdef CALL_DUMMY
 static CORE_ADDR find_function_addr PARAMS ((value_ptr, struct type **));
+static value_ptr value_arg_coerce PARAMS ((value_ptr, struct type *));
+#endif
+
 
 #ifndef PUSH_ARGUMENTS
 static CORE_ADDR value_push PARAMS ((CORE_ADDR, value_ptr));
@@ -64,8 +68,6 @@ static CORE_ADDR allocate_space_in_inferior PARAMS ((int));
 
 static value_ptr cast_into_complex PARAMS ((struct type *, value_ptr));
 
-static value_ptr value_arg_coerce PARAMS ((value_ptr, struct type *));
-
 #define VALUE_SUBSTRING_START(VAL) VALUE_FRAME(VAL)
 
 /* Flag for whether we want to abandon failed expression evals by default.  */
@@ -178,7 +180,7 @@ value_cast (type, arg2)
 	    low_bound = 0, high_bound = 0;
 	  new_length = val_length / element_length;
 	  if (val_length % element_length != 0)
-       warning("array element type size does not divide object size in cast");
+	    warning("array element type size does not divide object size in cast");
 	  /* FIXME-type-allocation: need a way to free this type when we are
 	     done with it.  */
 	  range_type = create_range_type ((struct type *) NULL,
@@ -303,7 +305,8 @@ value_cast (type, arg2)
     }
   else if (VALUE_LVAL (arg2) == lval_memory)
     {
-      return value_at_lazy (type, VALUE_ADDRESS (arg2) + VALUE_OFFSET (arg2));
+      return value_at_lazy (type, VALUE_ADDRESS (arg2) + VALUE_OFFSET (arg2),
+			    VALUE_BFD_SECTION (arg2));
     }
   else if (code1 == TYPE_CODE_VOID)
     {
@@ -341,9 +344,10 @@ value_zero (type, lv)
    the contents are actually required.  */
 
 value_ptr
-value_at (type, addr)
+value_at (type, addr, sect)
      struct type *type;
      CORE_ADDR addr;
+     asection *sect;
 {
   register value_ptr val;
 
@@ -352,7 +356,6 @@ value_at (type, addr)
 
   val = allocate_value (type);
 
-/* start-sanitize-d10v */
 #ifdef GDB_TARGET_IS_D10V
   if (TYPE_TARGET_TYPE(type) && TYPE_CODE(TYPE_TARGET_TYPE(type)) == TYPE_CODE_FUNC)
     {
@@ -364,12 +367,12 @@ value_at (type, addr)
     }
   else
 #endif
-/* end-sanitize-d10v */
 
-  read_memory (addr, VALUE_CONTENTS_RAW (val), TYPE_LENGTH (type));
+  read_memory_section (addr, VALUE_CONTENTS_RAW (val), TYPE_LENGTH (type), sect);
 
   VALUE_LVAL (val) = lval_memory;
   VALUE_ADDRESS (val) = addr;
+  VALUE_BFD_SECTION (val) = sect;
 
   return val;
 }
@@ -377,9 +380,10 @@ value_at (type, addr)
 /* Return a lazy value with type TYPE located at ADDR (cf. value_at).  */
 
 value_ptr
-value_at_lazy (type, addr)
+value_at_lazy (type, addr, sect)
      struct type *type;
      CORE_ADDR addr;
+     asection *sect;
 {
   register value_ptr val;
 
@@ -391,6 +395,7 @@ value_at_lazy (type, addr)
   VALUE_LVAL (val) = lval_memory;
   VALUE_ADDRESS (val) = addr;
   VALUE_LAZY (val) = 1;
+  VALUE_BFD_SECTION (val) = sect;
 
   return val;
 }
@@ -414,7 +419,6 @@ value_fetch_lazy (val)
   CORE_ADDR addr = VALUE_ADDRESS (val) + VALUE_OFFSET (val);
   int length = TYPE_LENGTH (VALUE_TYPE (val));
 
-/* start-sanitize-d10v */
 #ifdef GDB_TARGET_IS_D10V
   struct type *type = VALUE_TYPE(val);
   if (TYPE_TARGET_TYPE(type) && TYPE_CODE(TYPE_TARGET_TYPE(type)) == TYPE_CODE_FUNC)
@@ -427,10 +431,10 @@ value_fetch_lazy (val)
     }
   else
 #endif
-/* end-sanitize-d10v */
 
   if (length)
-    read_memory (addr, VALUE_CONTENTS_RAW (val), length);
+    read_memory_section (addr, VALUE_CONTENTS_RAW (val), length,
+			 VALUE_BFD_SECTION (val));
   VALUE_LAZY (val) = 0;
   return 0;
 }
@@ -710,7 +714,7 @@ value_of_variable (var, b)
      struct block *b;
 {
   value_ptr val;
-  struct frame_info *frame;
+  struct frame_info *frame = NULL;
 
   if (!b)
     frame = NULL;		/* Use selected frame.  */
@@ -776,12 +780,15 @@ value_ptr
 value_coerce_function (arg1)
      value_ptr arg1;
 {
+  value_ptr retval;
 
   if (VALUE_LVAL (arg1) != lval_memory)
     error ("Attempt to take address of value not located in memory.");
 
-  return value_from_longest (lookup_pointer_type (VALUE_TYPE (arg1)),
-		(LONGEST) (VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1)));
+  retval = value_from_longest (lookup_pointer_type (VALUE_TYPE (arg1)),
+			       (LONGEST) (VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1)));
+  VALUE_BFD_SECTION (retval) = VALUE_BFD_SECTION (arg1);
+  return retval;
 }  
 
 /* Return a pointer value for the object for which ARG1 is the contents.  */
@@ -790,6 +797,8 @@ value_ptr
 value_addr (arg1)
      value_ptr arg1;
 {
+  value_ptr retval;
+
   struct type *type = check_typedef (VALUE_TYPE (arg1));
   if (TYPE_CODE (type) == TYPE_CODE_REF)
     {
@@ -806,8 +815,10 @@ value_addr (arg1)
   if (VALUE_LVAL (arg1) != lval_memory)
     error ("Attempt to take address of value not located in memory.");
 
-  return value_from_longest (lookup_pointer_type (VALUE_TYPE (arg1)),
-		(LONGEST) (VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1)));
+  retval = value_from_longest (lookup_pointer_type (VALUE_TYPE (arg1)),
+			       (LONGEST) (VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1)));
+  VALUE_BFD_SECTION (retval) = VALUE_BFD_SECTION (arg1);
+  return retval;
 }
 
 /* Given a value of a pointer type, apply the C unary * operator to it.  */
@@ -829,9 +840,11 @@ value_ind (arg1)
      BUILTIN_TYPE_LONGEST would seem to be a mistake.  */
   if (TYPE_CODE (type1) == TYPE_CODE_INT)
     return value_at (builtin_type_int,
-		     (CORE_ADDR) value_as_long (arg1));
+		     (CORE_ADDR) value_as_long (arg1),
+		     VALUE_BFD_SECTION (arg1));
   else if (TYPE_CODE (type1) == TYPE_CODE_PTR)
-    return value_at_lazy (TYPE_TARGET_TYPE (type1), value_as_pointer (arg1));
+    return value_at_lazy (TYPE_TARGET_TYPE (type1), value_as_pointer (arg1),
+			  VALUE_BFD_SECTION (arg1));
   error ("Attempt to take contents of a non-pointer value.");
   return 0;  /* For lint -- never reached */
 }
@@ -903,6 +916,7 @@ value_push (sp, arg)
 
 #endif	/* !PUSH_ARGUMENTS */
 
+#ifdef CALL_DUMMY
 /* Perform the standard coercions that are specified
    for arguments to be passed to C functions.
 
@@ -1030,7 +1044,6 @@ find_function_addr (function, retval_type)
   return funaddr;
 }
 
-#if defined (CALL_DUMMY)
 /* All this stuff with a dummy frame may seem unnecessarily complicated
    (why not just save registers in GDB?).  The purpose of pushing a dummy
    frame which looks just like a real frame is so that if you call a
@@ -1466,6 +1479,7 @@ value_array (lowbound, highbound, elemvec)
 		  VALUE_CONTENTS (elemvec[idx]),
 		  typelength);
 	}
+      VALUE_BFD_SECTION (val) = VALUE_BFD_SECTION (elemvec[0]);
       return val;
     }
 
@@ -1483,7 +1497,7 @@ value_array (lowbound, highbound, elemvec)
 
   /* Create the array type and set up an array value to be evaluated lazily. */
 
-  val = value_at_lazy (arraytype, addr);
+  val = value_at_lazy (arraytype, addr, VALUE_BFD_SECTION (elemvec[0]));
   return (val);
 }
 
@@ -1523,7 +1537,7 @@ value_string (ptr, len)
   addr = allocate_space_in_inferior (len);
   write_memory (addr, ptr, len);
 
-  val = value_at_lazy (stringtype, addr);
+  val = value_at_lazy (stringtype, addr, NULL);
   return (val);
 }
 
@@ -1648,7 +1662,7 @@ search_struct_field (name, arg1, offset, type, looking_for_baseclass)
 		    error ("Internal error: could not find physical static variable named %s",
 			   phys_name);
 		v = value_at (TYPE_FIELD_TYPE (type, i),
-			      SYMBOL_VALUE_ADDRESS (sym));
+			      SYMBOL_VALUE_ADDRESS (sym), SYMBOL_BFD_SECTION (sym));
 	      }
 	    else
 	      v = value_primitive_field (arg1, offset, i, type);
@@ -2104,7 +2118,8 @@ value_struct_elt_for_reference (domain, offset, curtype, name, intype)
 		error ("Internal error: could not find physical static variable named %s",
 		       phys_name);
 	      return value_at (SYMBOL_TYPE (sym),
-			       SYMBOL_VALUE_ADDRESS (sym));
+			       SYMBOL_VALUE_ADDRESS (sym),
+			       SYMBOL_BFD_SECTION (sym));
 	    }
 	  if (TYPE_FIELD_PACKED (t, i))
 	    error ("pointers to bitfield members not allowed");
diff --git a/include/.Sanitize b/include/.Sanitize
index 0894d17..b58d8d3 100644
--- a/include/.Sanitize
+++ b/include/.Sanitize
@@ -88,34 +88,6 @@ else
 fi
 
 
-d10v_files="ChangeLog dis-asm.h"
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 m32r_files="ChangeLog dis-asm.h"
 if ( echo $* | grep keep\-m32r > /dev/null ) ; then
 	for i in $m32r_files ; do
diff --git a/include/ChangeLog b/include/ChangeLog
index 4ac59aeb..4cfbbb7 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,22 @@
+Thu Feb  6 14:20:01 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* dis-asm.h: (disassemble_info):  Add new fields
+	bytes_per_chunk and display_endian to control the
+	display of raw instructions.
+
+start-sanitize-tic80
+Fri Dec 27 22:17:37 1996  Fred Fish  <fnf@cygnus.com>
+
+	* dis-asm.h (print_insn_tic80): Declare.
+
+end-sanitize-tic80
+Sun Dec  8 17:11:12 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* callback.h (host_callback): New member `error'.
+
+Wed Nov 20 00:40:23 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* callback.h: New file, moved here from gdb.
 
 Mon Nov 18 16:34:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
 
@@ -90,12 +109,10 @@ Mon Jul 22 13:16:13 1996  Richard Henderson  <rth@tamu.edu>
 	* dis-asm.h (print_insn_alpha): Don't declare.
 	(print_insn_alpha_osf, print_insn_alpha_vms): Declare.
 
-start-sanitize-d10v
 Wed Jul 17 14:45:12 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* dis-asm.h: (print_insn_d10v): Declare.
 
-end-sanitize-d10v
 Mon Jul 15 16:55:38 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* dis-asm.h:  Get rid of decls for print_insn_i8086,
@@ -1127,7 +1144,7 @@ Wed Aug 21 20:32:13 1991  John Gilmore  (gnu at cygint.cygnus.com)
 
 
 Local Variables:
-mode: indented-text
+mode: change-log
 left-margin: 8
 fill-column: 74
 version-control: never
diff --git a/include/elf/.Sanitize b/include/elf/.Sanitize
index 1144aec..f7e408a 100644
--- a/include/elf/.Sanitize
+++ b/include/elf/.Sanitize
@@ -93,34 +93,6 @@ else
 	done
 fi
 
-d10v_files="ChangeLog common.h"
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 d30v_files="ChangeLog common.h"
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	for i in $d30v_files ; do
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 4b9d54e..8d27aae 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -44,12 +44,10 @@ Tue Nov 26 10:44:47 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mips.h (STO_MIPS16): Define.
 
-start-sanitize-d10v 
 Tue Nov 12 15:45:42 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v.h: Remove empty file.
 
-end-sanitize-d10v 	
 Tue Oct  8 11:31:24 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mips.h (EF_MIPS_ABI2): Define.
@@ -95,13 +93,11 @@ Thu Jul 18 19:12:15 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* dwarf2.h: New file.
 
-start-sanitize-d10v 
 Jul 18 13:20:39 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* common.h (EM_CYGNUS_D10V): Define. 
 	* d10v.h: New file.
 
-end-sanitize-d10v
 Fri Jun 21 12:33:24 1996  Richard Henderson  <rth@tamu.edu>
 
 	* alpha.h: New file.
diff --git a/include/elf/common.h b/include/elf/common.h
index d659f91..26f75f2 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -119,10 +119,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Alpha backend magic number.  Written in the absence of an ABI.  */
 #define EM_ALPHA	0x9026
 
-/* start-sanitize-d10v */
 /* D10V backend magic number.  Written in the absence of an ABI.  */
 #define EM_CYGNUS_D10V	0x7650
-/* end-sanitize-d10v */
 
 /* start-sanitize-d30v */
 /* D30V backend magic number.  Written in the absence of an ABI.  */
diff --git a/include/opcode/.Sanitize b/include/opcode/.Sanitize
index d7fed47..7a2bd9d 100644
--- a/include/opcode/.Sanitize
+++ b/include/opcode/.Sanitize
@@ -121,34 +121,6 @@ else
 fi
 
 
-d10v_files="ChangeLog"
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 d30v_files="ChangeLog"
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	for i in $d30v_files ; do
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 0c12c6e..403d2f0 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -249,13 +249,11 @@ Fri Aug 16 00:15:15 1996  Jeffrey A Law  (law@cygnus.com)
 	* hppa.h (pitlb, pitlbe, iitlba, iitlbp, fic, fice): Accept
 	a 3 bit space id instead of a 2 bit space id.
 
-start-sanitize-d10v
 Thu Aug 15 13:11:46 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v.h: Add some additional defines to support the
  	assembler in determining which operations can be done in parallel.
 
-end-sanitize-d10v	
 Tue Aug  6 11:13:22 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* h8300.h (SN): Define.
@@ -263,7 +261,6 @@ Tue Aug  6 11:13:22 1996  Jeffrey A Law  (law@cygnus.com)
 	(nop, bpt, rte, rts, sleep, clrmac): These have no size associated
 	with them.
 
-start-sanitize-d10v
 Fri Jul 26 11:47:10 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v.h (OPERAND_SHIFT): New operand flag.
@@ -278,18 +275,15 @@ Mon Jul 22 11:21:15 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* d10v.h (pd_reg): Define. Putting the definition here allows
 	the assembler and disassembler to share the same struct.
 
-end-sanitize-d10v
 Mon Jul 22 12:15:25 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* i960.h (i960_opcodes): "halt" takes an argument.  From Stephen
 	Williams <steve@icarus.com>.
 
-start-sanitize-d10v
 Wed Jul 17 14:46:38 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v.h: New file. 
 
-end-sanitize-d10v
 Thu Jul 11 12:09:15 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* h8300.h (band, bclr): Force high bit of immediate nibble to zero.
diff --git a/ld/.Sanitize b/ld/.Sanitize
index 5ca2c7d..a603074 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -115,35 +115,6 @@ else
 	done
 fi
 
-d10v_files="ChangeLog configure.in configure.tgt Makefile.in"
-
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 m32r_files="ChangeLog configure.tgt Makefile.in"
 
 if ( echo $* | grep keep\-m32r > /dev/null ) ; then
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9ba140f..33c3fce 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,17 @@
+Fri Feb 14 18:28:31 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ld.texinfo (Option Commands): Document the INCLUDE command.
+
+Thu Feb 13 20:31:37 1997  Philippe De Muyter  <phdm@info.ucl.ac.be>
+
+	* configure.in: Call BFD_NEED_DECLARATION on getenv.
+	* acconfig.h (NEED_DECLARATION_GETENV): New macro.
+	* sysdep.h (getenv): Declare if NEED_DECLARATION_GETENV.
+	* ldemul.c (ld_emul_default_target): Do not cast getenv return
+	value.
+	* ldmain.c (get_emulation): Likewise.
+	* configure, config.in: Rebuild.
+
 Tue Feb 11 15:34:26 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* scripttempl/elfmips.sc: When relocating, put .mips16.fn.* and
@@ -183,9 +197,7 @@ Wed Nov 27 03:22:05 1996  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* scripttempl/elf{,mips,ppc}.sc: Add the remaining DWARF sections.
 
-start-sanitize-d10v
 	* scripttempl/elfd10v.sc: Likewise.
-end-sanitize-d10v
 start-sanitize-v850
 	* scripttempl/v850.sc: Likewise.
 end-sanitize-v850
@@ -210,13 +222,11 @@ Fri Nov 15 13:00:18 1996  Jeffrey A Law  (law@cygnus.com)
 	* configure.tgt: Handle mn10300.
 	* emulparms/mn10300.sh: New file.
 
-start-sanitize-d10v
 Tue Nov  5 10:57:50 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* emulparams/d10velf.sh (READONLY_START_ADDR): Changed to 0x2000004.
 	(EMBEDDED): Define.
 	
-end-sanitize-d10v	
 Fri Nov  1 10:01:27 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ld.texinfo: Add section on reporting bugs.
@@ -231,7 +241,6 @@ Thu Oct 31 09:28:59 1996  Jeffrey A Law  (law@cygnus.com)
 	romzbss too.
 
 end-sanitize-v850
-start-sanitize-d10v
 Tue Oct 29 12:33:05 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* emulparams/d10velf.sh: Changes needed for D10V-EVA board. 
@@ -241,7 +250,6 @@ Tue Oct 29 12:33:05 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* scripttempl/elfd10v.sc:  Fix calculation of .text.  Change
 	.stack to start at 0x2007ffe.
 
-end-sanitize-d10v	
 Mon Oct 28 15:37:00 1996  Doug Evans  <dje@canuck.cygnus.com>
 
 	* configure.tgt (sparclet*-*-aout*): Delete, use sparc*-*-aout*.
@@ -263,7 +271,6 @@ Tue Oct 22 11:36:47 1996  Jeffrey A Law  (law@cygnus.com)
 	the external memory region (0x100000 - 0x200000).
 
 end-sanitize-v850
-start-sanitize-d10v
 Mon Oct 21 17:16:59 1996  Michael Meissner  <meissner@wogglebug.tiac.net>
 
 	* scripttempl/elfd10v.sc: Clone from elf.sc, move .text to
@@ -275,7 +282,6 @@ Mon Oct 21 17:16:59 1996  Michael Meissner  <meissner@wogglebug.tiac.net>
 
 	* Makefile.in (ed10velf.c): Depend on elfd10v.sc, not elf.sc.
 
-end-sanitize-d10v
 start-sanitize-m32r
 Fri Oct 18 22:12:49 1996  Doug Evans  <dje@canuck.cygnus.com>
 
@@ -448,13 +454,11 @@ Sun Sep 15 22:09:56 1996  Jeffrey A Law  (law@cygnus.com)
 	* emulparms/v850.sh: Fix OTHER_RELOCATING_SECTIONS.
 
 end-sanitize-v850
-start-sanitize-d10v
 Sun Sep 15 10:38:16 1996  Mark Alexander  <marka@cygnus.com>
 
 	* emulparms/d10v.sh: Set OTHER_RELOCATING_SECTIONS to put
 	stack at top of simulator memory.
 
-end-sanitize-d10v
 Fri Sep 13 15:49:45 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ldlex.l (SYMBOLCHARN): Add $, _, and ~.
@@ -555,10 +559,8 @@ Mon Aug 19 11:28:29 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* genscripts.sh: Undo 8/16 change.
 
-start-sanitize-d10v
 	* emulparams/d10velf.sh (MACHINE): Explicitly set to nothing.
 
-end-sanitize-d10v
 Fri Aug 16 19:18:08 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* genscripts.sh: Explicitly reset any shell variables set or used
@@ -566,10 +568,8 @@ Fri Aug 16 19:18:08 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 	names as normal environment variables by the person running
 	configure.
 
-start-sanitize-d10v
 	* Makefile.in (ed10velf.c): Use tdir_d10v, not tdir_arcelf.
 
-end-sanitize-d10v
 Fri Aug 16 14:15:41 1996  James G. Smith  <jsmith@cygnus.co.uk>
 
 	* scripttempl/armcoff.sc (__bss_start__, __bss_end__,
@@ -676,7 +676,6 @@ Thu Aug  1 12:52:19 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* emultempl/sunos.em (gld${EMULATION_NAME}_after_open): Move
 	definition of lib_path inside condition where it is used.
 
-start-sanitize-d10v
 Wed Jul 31 13:17:10 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
  	* emulparams/d10velf.sh: Now works with elf.sc.
@@ -685,7 +684,6 @@ Wed Jul 31 11:52:03 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* emulparams/d10velf.sh (SCRIPT_NAME): Change to vanilla.
 
-end-sanitize-d10v	
 Tue Jul 30 14:46:42 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ldlang.c (lang_size_sections): Add the section VMA to the result
@@ -727,7 +725,6 @@ Mon Jul 29 17:23:33 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* ldlang.c (lang_place_orphans): Correct condition: place a common
 	section if not relocateable or if common definitions are forced.
 
-start-sanitize-d10v
 Wed Jul 24 12:16:38 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* emulparams/d10velf.sh (SCRIPT_NAME): Change to elf.
@@ -742,7 +739,6 @@ Tue Jul 23 10:36:19 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 	* configure.tgt (d10v-*-elf*): New target.
 	* emulparams/d10velf.sh: New file.
 
-end-sanitize-d10v
 Thu Jul 18 16:25:39 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.tgt (sparc*-*-sysv4*): New target.  From Andrew Gierth
@@ -6950,7 +6946,7 @@ Fri Oct  4 21:51:58 1991  John Gilmore  (gnu at cygnus.com)
 
 
 Local Variables:
-mode: indented-text
+mode: change-log
 left-margin: 8
 fill-column: 74
 version-control: never
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 5f0e0ae..87f8cd0 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -384,11 +384,9 @@ earmpe.c: $(srcdir)/emulparams/armpe.sh \
 ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparccoff.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} coff_sparc "$(tdir_coff_sparc)"
-# start-sanitize-d10v
 ed10velf.c: $(srcdir)/emulparams/d10velf.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} d10velf "$(tdir_d10v)"
-# end-sanitize-d10v
 edelta68.c: $(srcdir)/emulparams/delta68.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} delta68 "$(tdir_delta68)"
@@ -622,6 +620,11 @@ esun3.c: $(srcdir)/emulparams/sun3.sh \
 esun4.c: $(srcdir)/emulparams/sun4.sh \
   $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} sun4 "$(tdir_sun4)"
+# start-sanitize-tic80
+etic80coff.c: $(srcdir)/emulparams/tic80coff.sh \
+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic80coff.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} tic80coff "$(tdir_tic80coff)"
+# end-sanitize-tic80
 evanilla.c: $(srcdir)/emulparams/vanilla.sh \
   $(srcdir)/emultempl/vanilla.em $(srcdir)/scripttempl/vanilla.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} vanilla "$(tdir_vanilla)"
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 4b72bb9..dd3c76e 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -15,9 +15,7 @@ arm-*-pe)		targ_emul=armpe ;;
 # start-sanitize-arc
 arc-*-elf*)		targ_emul=arcelf ;;
 # end-sanitize-arc
-# start-sanitize-d10v
 d10v-*-*)		targ_emul=d10velf ;;
-# end-sanitize-d10v
 sparc64-*-aout*)	targ_emul=sparcaout ;;
 sparc64-*-elf*)		targ_emul=elf64_sparc ;;
 sparc-sun-sunos4*) 	targ_emul=sun4 ;;
@@ -138,6 +136,10 @@ mips*vr4100el-*-elf*)	targ_emul=elf32l4300 ;;
 mips*vr4100-*-elf*)	targ_emul=elf32b4300 ;;
 mips*vr5000el-*-elf*)	targ_emul=elf32l4300 ;;
 mips*vr5000-*-elf*)	targ_emul=elf32b4300 ;;
+# start-sanitize-r5900 
+mips*vr5900el-*-elf*)	targ_emul=elf32l4300 ;;
+mips*vr5900-*-elf*)	targ_emul=elf32b4300 ;;
+# end-sanitize-r5900 
 mips*el-*-elf*)		targ_emul=elf32elmip ;;
 mips*-*-elf*)		targ_emul=elf32ebmip ;;
 mips*-*-rtems*)		targ_emul=elf32ebmip ;;
diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index 4858844..51c166a 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -143,34 +143,6 @@ else
 	done
 fi
 
-d10v_files="ChangeLog Makefile.in configure.in configure disassemble.c"
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 d30v_files="ChangeLog Makefile.in configure.in configure disassemble.c"
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	for i in $d30v_files ; do
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 6d02ad9..75e62a2 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -124,13 +124,11 @@ Thu Jan 30 14:09:03 1997  Fred Fish  <fnf@cygnus.com>
 	Remove private tables and use tic80_value_to_symbol function.
 
 end-sanitize-tic80
-start-sanitize-d10v
 Thu Jan 30 11:30:45 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-dis.c (print_operand): Change address printing
 	to correctly handle PC wrapping.  Fixes PR11490.
 
-end-sanitize-d10v	
 Wed Jan 29 09:39:17 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10200-opc.c (mn10200_operands): Make 8 and 16 bit pc-relative
@@ -365,12 +363,10 @@ Fri Dec 27 22:30:57 1996  Fred Fish  <fnf@cygnus.com>
 	* tic80-opc.c: Add file.
 	
 end-sanitize-tic80
-start-sanitize-d10v
 Fri Dec 20 14:30:19 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c (pre_defined_registers):  Add cr[0-15], dpc, dpsw, link.
 
-end-sanitize-d10v	
 Mon Dec 16 13:00:15 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10200-opc.c (mn10200_operands): Add SIMM16N.
@@ -535,12 +531,10 @@ Tue Nov 19 13:33:01 1996  Jeffrey A Law  (law@cygnus.com)
 	list.
 	(mn10300_opcodes): Use REGS for register list in "movm" instructions.
 	
-start-sanitize-d10v
 Mon Nov 18 15:20:35 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* d10v-opc.c (d10v_opcodes): Add3 sets the carry.
 
-end-sanitize-d10v
 Fri Nov 15 13:43:19 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10300-opc.c (mn10300_opcodes): Demand parens around
@@ -578,14 +572,12 @@ Tue Nov  5 13:26:58 1996  Jeffrey A Law  (law@cygnus.com)
 	the extended part of an instruction.
 	(mn10300_operands): Use new opcodes as appropriate.
 
-start-sanitize-d10v
 Tue Nov  5 10:30:51 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c (d10v_opcodes): Declare the trap instruction
  	sequential so the assembler never parallelizes it with
 	other instructions.
 
-end-sanitize-d10v
 Mon Nov  4 12:50:40 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10300-opc.c (mn10300_operands): Add DN01 and AN01 for
@@ -864,13 +856,11 @@ Wed Aug 28 15:55:43 1996  Jeffrey A Law  (law@cygnus.com)
 	end of the opcode table.
 
 end-sanitize-v850
-start-sanitize-d10v
 Mon Aug 26 13:35:53 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c (pre_defined_registers): Added register pairs,
 	"r0-r1", "r2-r3", etc.
 
-end-sanitize-d10v	
 start-sanitize-v850
 Fri Aug 23 00:27:01 1996  Jeffrey A Law  (law@cygnus.com)
 
@@ -959,14 +949,12 @@ Mon Aug 19 15:21:38 1996  Doug Evans  <dje@canuck.cygnus.com>
 
 	* sparc-dis.c (print_insn_sparc): Handle little endian sparcs.
 
-start-sanitize-d10v
 Thu Aug 15 13:14:43 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c: Add additional information to the opcode
 	table to help determinine which instructions can be done
 	in parallel.
 
-end-sanitize-d10v
 Thu Aug 15 13:11:13 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-make.sed: Update editing of include pathnames to be
@@ -980,7 +968,6 @@ Wed Aug 14 17:00:04 1996  Richard Henderson  <rth@tamu.edu>
 
 	* alpha-opc.c (EV4EXTHWINDEX): Field width should be 8 not 5.
 
-start-sanitize-d10v
 Mon Aug 12 14:30:37 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c (d10v_opcodes): Minor fixes to addi and bl.l.
@@ -989,7 +976,6 @@ Fri Aug  9 13:21:59 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c (d10v_opcodes): Correct 'mv' unit entry to EITHER.
 
-end-sanitize-d10v	
 Thu Aug  8 12:43:52 1996  Klaus Kaempf  <kkaempf@progis.de>
 
 	* makefile.vms: Update for alpha-opc changes.
@@ -999,13 +985,11 @@ Wed Aug  7 11:55:10 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* i386-dis.c (print_insn_i386): Actually return the correct value.
  	(ONE, OP_ONE): #ifdef out; not used.
 
-start-sanitize-d10v
 Fri Aug  2 17:47:03 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c (d10v_opcodes): Added 2 accumulator sub instructions.
 	Changed subi operand type to treat 0 as 16.
 
-end-sanitize-d10v
 Wed Jul 31 16:21:41 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* m68k-opc.c: Add cpushl for the mcf5200.  From Ken Rose
@@ -1018,13 +1002,11 @@ Wed Jul 31 14:39:27 1996  James G. Smith  <jsmith@cygnus.co.uk>
 	* arm-dis.c: (print_insn_arm): Provide decoding of the new
 	formats %h and %s.
 
-start-sanitize-d10v
 Fri Jul 26 11:45:04 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c (d10v_operands): Added UNUM4S; a 4-bit accumulator shift.
  	(d10v_opcodes): Modified accumulator shift instructions to use UNUM4S.
 
-end-sanitize-d10v	
 Fri Jul 26 14:01:43 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* alpha-dis.c (print_insn_alpha_osf): Remove.
@@ -1033,7 +1015,6 @@ Fri Jul 26 14:01:43 1996  Ian Lance Taylor  <ian@cygnus.com>
 	names based on info->flavour.
 	* disassemble.c: Always return print_insn_alpha for the alpha.
 
-start-sanitize-d10v
 Thu Jul 25 15:24:17 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-dis.c (dis_long): Handle unknown opcodes.
@@ -1049,20 +1030,17 @@ Tue Jul 23 11:02:53 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-dis.c: Change all functions to use info->print_address_func.
 
-end-sanitize-d10v	
 Mon Jul 22 15:38:53 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
 	* m68k-opc.c (m68k_opcodes): Make opcode masks for the ColdFire
  	move ccr/sr insns more strict so that the disassembler only
  	selects them when the addressing mode is data register.
 
-start-sanitize-d10v
 Mon Jul 22 11:25:24 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
         * d10v-opc.c (pre_defined_registers):  Declare.
         * d10v-dis.c (print_operand): Now uses pre_defined_registers
         to pick a better name for the registers.
 
-end-sanitize-d10v	
 Mon Jul 22 13:47:23 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* sparc-opc.c: Fix opcode values for fpack16, and fpackfix.  Fix
@@ -1085,8 +1063,7 @@ Thu Jul 18 17:19:34 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* configure: Rebuild.
 	* Makefile.in (install): Use @INSTALL_SHLIB@.
 
-start-sanitize-d10v
-	Wed Jul 17 14:39:05 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+Wed Jul 17 14:39:05 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* configure: (bfd_d10v_arch) Add new case.
 	* configure.in: (bfd_d10v_arch) Add new case.
@@ -1094,7 +1071,6 @@ start-sanitize-d10v
 	* d10v-opc.c: New file.
 	* disassemble.c (disassembler) Add entry for d10v.
 
-end-sanitize-d10v
 Wed Jul 17 10:12:05 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
 
 	* m68k-opc.c (m68k_opcodes): Fix bugs in coldfire insns relating
diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c
index 67aa6f9..cadaad4 100644
--- a/opcodes/disassemble.c
+++ b/opcodes/disassemble.c
@@ -25,9 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ARCH_arc
 /* end-sanitize-arc */
 #define ARCH_arm
-/* start-sanitize-d10v */
 #define ARCH_d10v
-/* end-sanitize-d10v */
 /* start-sanitize-d30v */
 #define ARCH_d30v
 /* end-sanitize-d30v */
diff --git a/sim/.Sanitize b/sim/.Sanitize
index a72eec7..47b4fd5 100644
--- a/sim/.Sanitize
+++ b/sim/.Sanitize
@@ -66,34 +66,6 @@ Things-to-lose:
 
 Do-last:
 
-d10v_files="configure configure.in ChangeLog"
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-        for i in $d10v_files ; do
-                if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-                        if [ -n "${verbose}" ] ; then
-                                echo Keeping d10v stuff in $i
-                        fi
-                fi
-        done
-else
-        for i in $d10v_files ; do
-                if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
-                        if [ -n "${verbose}" ] ; then
-                                echo Removing traces of \"d10v\" from $i...
-                        fi
-                        cp $i new
-                        sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/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
-
 m32r_files="configure configure.in ChangeLog"
 if ( echo $* | grep keep\-m32r > /dev/null ) ; then
         for i in $m32r_files ; do
diff --git a/sim/configure.in b/sim/configure.in
index 9eb3187..05a3bcb 100644
--- a/sim/configure.in
+++ b/sim/configure.in
@@ -46,9 +46,7 @@ only_if_gcc=no
 
 case "${target}" in
   arm*-*-*)		sim_target=arm ;;
-# start-sanitize-d10v
   d10v-*-*)		sim_target=d10v ;;
-# end-sanitize-d10v
   h8300*-*-*)		sim_target=h8300 ;;
   h8500-*-*)		sim_target=h8500 ;;
   mips*-*-*)