Remove ARC sanitization.

10 files changed, 72 insertions, 175 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 4ea272d..c857054 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -15,14 +15,6 @@
 
 Do-first:
 
-arc_files="cpu-arc.c elf32-arc.c"
-
-if ( echo $* | grep keep\-arc > /dev/null ) ; then
-	keep_these_too="${arc_files} ${keep_these_too}"
-else
-	lose_these_too="${arc_files} ${lose_these_too}"
-fi
-
 d30v_files="cpu-d30v.c elf32-d30v.c"
 
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
@@ -130,6 +122,7 @@ configure.in
 corefile.c
 cpu-a29k.c
 cpu-alpha.c
+cpu-arc.c
 cpu-arm.c
 cpu-d10v.c
 cpu-h8300.c
@@ -161,6 +154,7 @@ ecofflink.c
 ecoffswap.h
 elf-bfd.h
 elf.c
+elf32-arc.c
 elf32-d10v.c
 elf32-gen.c
 elf32-hppa.c
@@ -301,34 +295,6 @@ Things-to-lose:
 
 Do-last:
 
-arc_files="ChangeLog ChangeLog.2 Makefile.in Makefile.am archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h"
-if ( echo $* | grep keep\-arc > /dev/null ) ; then
-	for i in $arc_files ; do
-		if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping arc stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $arc_files ; do
-		if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"arc\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-arc/,/end-\sanitize\-arc/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 Makefile.am 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 dbbe603..b6dfb95 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,27 @@
+Fri Aug 15 04:58:02 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.bfd (arc-*-elf*): Add.
+	* configure.in (bfd_elf32_{little,big}arc_vec): Add.
+	* configure: Rebuild.
+	* Makefile.am (ALL_MACHINES): Add cpu-arc.lo.
+	(BFD32_BACKENDS): Add elf32-arc.lo.
+	(cpu-arc.lo,elf32-arc.lo): Add rules for.
+	* Makefile.in: Rebuild.
+	* archures.c (architecture list): Add bfd_arch_arc.
+	(bfd_archures_list): Add bfd_arc_arch.
+	(bfd_mach_arc_base): Define.
+	* reloc.c (BFD_RELOC_ARC_B22_PCREL,BFD_RELOC_ARC_B26): Add.
+	* targets.c (bfd_elf32_{little,big}arc_vec): Declare.
+	(bfd_target_vect): Add them.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* cpu-arc.c, elf32-arc.c: New files.
+	* elf.c (pre_headers): Recognize bfd_arch_arc.
+
+Tue Aug 12 11:45:18 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,final_link)): If no symbols, make sure the
+	data section is correctly rounded to a page in the file.
+
 Mon Aug 11 12:45:43 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* aoutx.h (NAME(aout,final_link)): Don't emit the string table if
diff --git a/bfd/ChangeLog.2 b/bfd/ChangeLog.2
index abee39f..93de4d5 100644
--- a/bfd/ChangeLog.2
+++ b/bfd/ChangeLog.2
@@ -783,11 +783,6 @@ Mon Jul  3 11:30:45 1995  Ian Lance Taylor  <ian@cygnus.com>
 	* Makefile.in: Rebuild dependencies.
 	(BFD32_BACKENDS): Add versados.o.
 	(CFILES): Add pe-i386.c, pei-i386.c, and versados.c.
-start-sanitize-arc
-	(elf32-arc.o): New target.  This target should be removed when
-	elf32-arc.c can be added to CFILES, after which the automatic
-	dependency building will handle it.
-end-sanitize-arc
 
 Sun Jul  2 17:49:32 1995  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -1378,13 +1373,6 @@ Mon Mar 13 13:48:49 1995  Ian Lance Taylor  <ian@cygnus.com>
 	* archive.c (bsd_write_armap): Cast getuid and getgid results to
 	long, and print with %ld.
 
-start-sanitize-arc
-Sun Mar 12 05:22:10 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* elf32-arc.c (elf_arc_howto_table): Relocs with implicit addends
-	don't work too well with zero src_masks.  Correct values.
-end-sanitize-arc
-
 Fri Mar 10 16:41:05 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* aoutx.h (translate_to_native_sym_flags): Always use the output
@@ -1476,17 +1464,6 @@ Wed Mar  8 00:53:54 1995  Ian Lance Taylor  <ian@cygnus.com>
 	* elfcode.h (swap_out_syms): Mark an undefined BSF_WEAK symbol as
 	STB_WEAK rather than STB_GLOBAL.
 
-start-sanitize-arc
-Tue Mar  7 20:34:43 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* configure.in (SELECT_VECS): Split bfd_elf32_arc_vec into big/little.
-	* targets.c (bfd_target_vector): Likewise.
-	* elf32-arc.c (TARGET_BIG_SYM): Define.
-	(TARGET_BIG_NAME): Define.
-	* config/arc-elf.mt (DEFAULT_VECTOR): Set to bfd_elf32_littlearc_vec.
-	(SELECT_VECS): Add bfd_elf32_bigarc_vec.
-end-sanitize-arc
-
 Tue Mar  7 12:23:47 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* coffcode.h (bfd_coff_backend_data): Add new field
@@ -1707,28 +1684,6 @@ Mon Feb 13 23:25:38 1995  Ian Lance Taylor  <ian@cygnus.com>
 	to garbage if the symbol index is out of range.
 	(NAME(aout,swap_std_reloc_in)): Likewise.
 
-start-sanitize-arc
-Mon Feb 13 09:35:30 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf32-arc.c (reloc_type): New type R_ARC_B26.
-	(elf_arc_howto_table): Likewise.
-	* reloc.c (BFD_RELOC_ARC_B26): Likewise.
-
-Thu Feb  9 17:31:40 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* archures (bfd_mach_arc_base): #define.
-	(bfd_mach_arc_host, bfd_mach_arc_graphics, bfd_mach_arc_audio): Ditto.
-	* cpu-arc.c (arch_info_struct): Define entries for each cpu variant.
-	(bfd_arc_arch): Link each one in.
-	(arc_get_mach): New function.
-	* elf32-arc.c (arc_info_to_howto_rel): Renamed from arc_info_to_howto.
-	(elf_info_to_howto_rel): Update.
-	(arc_elf_object_p, arc_elf_final_write_processing): New functions.
-	(elf_backend_object_p): Define.
-	(elf_backend_final_write_processing): Define.
-	(USE_REL): Define.
-end-sanitize-arc
-
 Thu Feb  9 18:36:52 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* Makefile.in (BFD32_BACKENDS): Add i386msdos.o.
@@ -2066,11 +2021,6 @@ Thu Jan 12 16:30:47 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* archures.c (archures_init_table): Now const.
 	(bfd_arch_init): Adjusted type of local var `ptable'.
-start-sanitize-arc
-
-	* Makefile.in (ALL_MACHINES): Include cpu-arc.o.
-	(BFD32_BACKENDS): Include elf32-arc.o.
-end-sanitize-arc
 
 Thu Jan 12 09:33:24 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
@@ -2088,9 +2038,6 @@ Wed Jan 11 21:31:41 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
 	elfcode.h, libbfd-in.h, linker.c, mipsbsd.c, nlm32-ppc.c, oasys.c,
 	reloc.c, som.c: Don't use `const' in combination with
 	`reloc_howto_type'.
-start-sanitize-arc
-	* elf32-arc.c: Ditto.
-end-sanitize-arc
 	* bfd-in2.h, libbfd.h: Regenerated.
 
 	* ecoff.c (ecoff_type_to_string): Local variable `buffer1' doesn't
@@ -2167,13 +2114,6 @@ Tue Dec 20 13:58:01 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
 	list of cases for which relocation need not be computed.
 	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
 
-start-sanitize-arc
-Tue Dec 20 09:01:01 1994  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf32-arc.c (elf_arc_howto_table, R_ARC_B22_PCREL): Value is
-	right-shifted 2 bits.  Fix dst_mask.
-end-sanitize-arc
-
 Mon Dec 19 23:09:16 1994  Jeff Law  (law@snake.cs.utah.edu)
 
 	* elf32-hppa.c (elf32_hppa_read_symext_info): Delete do_locals and
@@ -2234,16 +2174,6 @@ Wed Nov 30 14:12:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* coff-sh.c: Use _bfd_dummy_target instead of no_archive.
 
-start-sanitize-arc
-Tue Nov 29 17:14:21 1994  Doug Evans  <dje@canuck.cygnus.com>
-
-	* archures.c: Initial support for the ARC.
-	* reloc.c, targets.c, config.bfd, configure.in, elfcode.h: Likewise.
-	* bfd-in2.h: Regenerated.
-	* libbfd.h: Likewise.
-	* config/arc-elf.mt: New file.
-end-sanitize-arc
-
 Tue Nov 29 14:00:19 1994  J.T. Conklin  <jtc@.rtl.cygnus.com>
 
 	* config.bfd (i[345]86-*-freebsd*): Use i386-bsd as bfd_name.
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 28475b3..211356b 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -124,9 +124,7 @@ BFD_LIBS_CFILES = \
 ALL_MACHINES = \
 	cpu-a29k.lo \
 	cpu-alpha.lo \
-	$(start-sanitize-arc) \
 	cpu-arc.lo \
-	$(end-sanitize-arc) \
 	cpu-arm.lo \
 	cpu-d10v.lo \
 	$(start-sanitize-d30v) \
@@ -216,7 +214,7 @@ BFD32_BACKENDS = \
 	coff-rs6000.lo \
 	coff-sh.lo \
 	coff-sparc.lo \
-	coff-stubgo32.lo \
+	coff-stgo32.lo \
 	coff-svm68k.lo \
 	$(start-sanitize-tic80) \
 	coff-tic80.lo \
@@ -228,9 +226,7 @@ BFD32_BACKENDS = \
 	cofflink.lo \
 	ecoff.lo \
 	ecofflink.lo \
-	$(start-sanitize-arc) \
 	elf32-arc.lo \
-	$(end-sanitize-arc) \
 	elf32-d10v.lo \
 	$(start-sanitize-d30v) \
 	elf32-d30v.lo \
@@ -327,7 +323,7 @@ BFD32_BACKENDS_CFILES = \
 	coff-rs6000.c \
 	coff-sh.c \
 	coff-sparc.c \
-	coff-stubgo32.c \
+	coff-stgo32.c \
 	coff-svm68k.c \
 	coff-u68k.c \
 	coff-we32k.c \
@@ -336,6 +332,7 @@ BFD32_BACKENDS_CFILES = \
 	cofflink.c \
 	ecoff.c \
 	ecofflink.c \
+	elf32-d10v.c \
 	elf32-gen.c \
 	elf32-hppa.c \
 	elf32-i386.c \
@@ -557,7 +554,7 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-config.h: stamp-h
+config.h: stamp-h ; @:
 stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
@@ -997,15 +994,9 @@ $(srcdir)/libcoff.h:
 	cp $(docdir)/libcoff.h libcoff.h-new
 	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
 
-start-sanitize-arc:
 elf32-arc.lo: elf32-arc.c elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/arc.h elf32-target.h
-end-sanitize-arc:
-
-elf32-d10v.lo: elf32-d10v.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
 
 start-sanitize-d30v:
 elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \
@@ -1156,7 +1147,7 @@ coff-sh.lo: coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \
 coff-sparc.lo: coff-sparc.c $(INCDIR)/coff/sparc.h \
   $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
   coffcode.h coffswap.h
-coff-stubgo32.lo: coff-stubgo32.c coff-i386.c $(INCDIR)/coff/i386.h \
+coff-stgo32.lo: coff-stgo32.c coff-i386.c $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h $(INCDIR)/coff/go32exe.h \
   libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h \
   go32stub.h
@@ -1184,6 +1175,9 @@ ecofflink.lo: ecofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/objalloc.h \
   $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
   libcoff.h libecoff.h
+elf32-d10v.lo: elf32-d10v.c elf-bfd.h $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
+  elf32-target.h
 elf32-gen.lo: elf32-gen.c elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
   elf32-target.h
diff --git a/bfd/archures.c b/bfd/archures.c
index b8388f4..0582a23 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -121,9 +121,7 @@ DESCRIPTION
 .  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 *}
@@ -134,6 +132,12 @@ DESCRIPTION
 .  bfd_arch_sh,        {* Hitachi SH *}
 .  bfd_arch_alpha,     {* Dec Alpha *}
 .  bfd_arch_arm,       {* Advanced Risc Machines ARM *}
+.#define bfd_mach_arm_2		1
+.#define bfd_mach_arm_2a		2
+.#define bfd_mach_arm_3		3
+.#define bfd_mach_arm_3M 	4
+.#define bfd_mach_arm_4 		5
+.#define bfd_mach_arm_4T 	6
 .  bfd_arch_ns32k,     {* National Semiconductors ns32000 *}
 .  bfd_arch_w65,       {* WDC 65816 *}
 . {* start-sanitize-tic80 *}
@@ -142,16 +146,9 @@ DESCRIPTION
 . {* start-sanitize-v850 *}
 .  bfd_arch_v850,      {* NEC V850 *}
 . {* end-sanitize-v850 *}
-. {* start-sanitize-arc *}
 .  bfd_arch_arc,       {* Argonaut RISC Core *}
 .#define bfd_mach_arc_base 0
-.#define bfd_mach_arc_host 1
-.#define bfd_mach_arc_graphics 2
-.#define bfd_mach_arc_audio 3
-. {* end-sanitize-arc *}
-. {* start-sanitize-m32r *}
-.  bfd_arch_m32r,      {* Mitsubishi M32R *}
-. {* end-sanitize-m32r *}
+.  bfd_arch_m32r,      {* Mitsubishi M32R/D *}
 .  bfd_arch_mn10200,   {* Matsushita MN10200 *}
 .  bfd_arch_mn10300,   {* Matsushita MN10300 *}
 .  bfd_arch_last
@@ -194,13 +191,9 @@ DESCRIPTION
 
 extern const bfd_arch_info_type bfd_a29k_arch;
 extern const bfd_arch_info_type bfd_alpha_arch;
-/* start-sanitize-arc */
 extern const bfd_arch_info_type bfd_arc_arch;
-/* end-sanitize-arc */
 extern const bfd_arch_info_type bfd_arm_arch;
-/* start-sanitize-d10v */
 extern const bfd_arch_info_type bfd_d10v_arch;
-/* end-sanitize-d10v */
 /* start-sanitize-d30v */
 extern const bfd_arch_info_type bfd_d30v_arch;
 /* end-sanitize-d30v */
@@ -210,9 +203,7 @@ extern const bfd_arch_info_type bfd_hppa_arch;
 extern const bfd_arch_info_type bfd_i386_arch;
 extern const bfd_arch_info_type bfd_i860_arch;
 extern const bfd_arch_info_type bfd_i960_arch;
-/* start-sanitize-m32r */
 extern const bfd_arch_info_type bfd_m32r_arch;
-/* end-sanitize-m32r */
 extern const bfd_arch_info_type bfd_m68k_arch;
 extern const bfd_arch_info_type bfd_m88k_arch;
 extern const bfd_arch_info_type bfd_mips_arch;
@@ -241,13 +232,9 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
 #else
   &bfd_a29k_arch,
   &bfd_alpha_arch,
-/* start-sanitize-arc */
   &bfd_arc_arch,
-/* end-sanitize-arc */
   &bfd_arm_arch,
-/* start-sanitize-d10v */
   &bfd_d10v_arch,
-/* end-sanitize-d10v */
 /* start-sanitize-d30v */
   &bfd_d30v_arch,
 /* end-sanitize-d30v */
@@ -257,9 +244,7 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
   &bfd_i386_arch,
   &bfd_i860_arch,
   &bfd_i960_arch,
-/* start-sanitize-m32r */
   &bfd_m32r_arch,
-/* end-sanitize-m32r */
   &bfd_m68k_arch,
   &bfd_m88k_arch,
   &bfd_mips_arch,
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index f9b5bce..33d6aef 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1238,13 +1238,8 @@ enum bfd_architecture
   /* start-sanitize-v850 */
   bfd_arch_v850,       /* NEC V850 */
   /* end-sanitize-v850 */
-  /* start-sanitize-arc */
   bfd_arch_arc,        /* Argonaut RISC Core */
 #define bfd_mach_arc_base 0
-#define bfd_mach_arc_host 1
-#define bfd_mach_arc_graphics 2
-#define bfd_mach_arc_audio 3
-  /* end-sanitize-arc */
   bfd_arch_m32r,       /* Mitsubishi M32R/D */
   bfd_arch_mn10200,    /* Matsushita MN10200 */
   bfd_arch_mn10300,    /* Matsushita MN10300 */
@@ -1832,7 +1827,12 @@ not stored in the instruction. */
   BFD_RELOC_SH_CODE,
   BFD_RELOC_SH_DATA,
   BFD_RELOC_SH_LABEL,
-/* start-sanitize-arc */
+
+/* Thumb 23-, 12- and 9-bit pc-relative branches.  The lowest bit must
+be zero and is not stored in the instruction. */
+  BFD_RELOC_THUMB_PCREL_BRANCH9,
+  BFD_RELOC_THUMB_PCREL_BRANCH12,
+  BFD_RELOC_THUMB_PCREL_BRANCH23,
 
 /* Argonaut RISC Core (ARC) relocs.
 ARC 22 bit pc-relative branch.  The lowest two bits must be zero and are
@@ -1844,13 +1844,6 @@ through 7 of the instruction. */
 stored in the instruction.  The high 24 bits are installed in bits 23
 through 0. */
   BFD_RELOC_ARC_B26,
-/* end-sanitize-arc */
-
-/* Thumb 23-, 12- and 9-bit pc-relative branches.  The lowest bit must
-   be zero and is not stored in the instruction. */
-  BFD_RELOC_THUMB_PCREL_BRANCH9,
-  BFD_RELOC_THUMB_PCREL_BRANCH12,
-  BFD_RELOC_THUMB_PCREL_BRANCH23,
 
 /* Mitsubishi D10V relocs.
 This is a 10-bit reloc with the right 2 bits
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 7f0af66..8e7ecc5 100755
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -69,12 +69,11 @@ case "${targ}" in
     ;;
 #endif /* BFD64 */
 
-# start-sanitize-arc
   arc-*-elf*)
     targ_defvec=bfd_elf32_littlearc_vec
     targ_selvecs=bfd_elf32_bigarc_vec
     ;;
-# end-sanitize-arc
+
   arm-*-riscix*)
     targ_defvec=riscix_vec
     ;;
@@ -151,8 +150,12 @@ case "${targ}" in
     targ_defvec=bfd_elf32_i386_vec
     targ_selvecs=i386coff_vec
     ;;
+  i[3456]86-*-msdosdjgpp* | i[3456]*-*-go32*)
+    targ_defvec=go32coff_vec
+    targ_selvecs="go32stubbedcoff_vec i386aout_vec"
+    ;;
   i[3456]86-*-sysv* | i[3456]86-*-isc* | i[3456]86-*-sco* | i[3456]86-*-coff | \
-  i[3456]86-*-aix* | i[3456]86-*-go32* | i[3456]86*-*-rtems*)
+  i[3456]86-*-aix* | i[3456]86*-*-rtems*)
     targ_defvec=i386coff_vec
     ;;
   i[3456]86-sequent-bsd*)
@@ -538,6 +541,7 @@ case "${targ}" in
 # start-sanitize-tic80
   tic80*-*-*)
     targ_defvec=tic80coff_vec
+    targ_underscore=yes
     ;;
 
 # end-sanitize-tic80
diff --git a/bfd/elf.c b/bfd/elf.c
index 6c29ca7..48ab443 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2118,7 +2118,7 @@ map_sections_to_segments (abfd)
 	  new_segment = true;
 	}
       else if (BFD_ALIGN (last_hdr->lma + last_hdr->_raw_size, maxpagesize)
-	       < hdr->lma)
+	       < BFD_ALIGN (hdr->lma, maxpagesize))
 	{
 	  /* If putting this section in this segment would force us to
              skip a page in the segment, then we need a new segment.  */
@@ -2875,11 +2875,9 @@ prep_headers (abfd)
       i_ehdrp->e_machine = EM_CYGNUS_V850;
       break;
 /* end-sanitize-v850 */
-/* start-sanitize-arc */
     case bfd_arch_arc:
       i_ehdrp->e_machine = EM_CYGNUS_ARC;
       break;
-/* end-sanitize-arc */
     case bfd_arch_m32r:
       i_ehdrp->e_machine = EM_CYGNUS_M32R;
       break;
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 0904293..752797e 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -740,15 +740,11 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_SH_CODE",
   "BFD_RELOC_SH_DATA",
   "BFD_RELOC_SH_LABEL",
-/* start-sanitize-arc */
-  "BFD_RELOC_ARC_B22_PCREL",
-  "BFD_RELOC_ARC_B26",
-/* end-sanitize-arc */
-
   "BFD_RELOC_THUMB_PCREL_BRANCH9",
   "BFD_RELOC_THUMB_PCREL_BRANCH12",
   "BFD_RELOC_THUMB_PCREL_BRANCH23",
-							 
+  "BFD_RELOC_ARC_B22_PCREL",
+  "BFD_RELOC_ARC_B26",
   "BFD_RELOC_D10V_10_PCREL_R",
   "BFD_RELOC_D10V_10_PCREL_L",
   "BFD_RELOC_D10V_18",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index f499fd7..d6e792e 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -2221,8 +2221,16 @@ ENUMX
 ENUMDOC
   Hitachi SH relocs.  Not all of these appear in object files.
 
-COMMENT
-{* start-sanitize-arc *}
+ENUM
+  BFD_RELOC_THUMB_PCREL_BRANCH9
+ENUMX
+  BFD_RELOC_THUMB_PCREL_BRANCH12
+ENUMX
+  BFD_RELOC_THUMB_PCREL_BRANCH23
+ENUMDOC
+  Thumb 23-, 12- and 9-bit pc-relative branches.  The lowest bit must
+  be zero and is not stored in the instruction.
+
 ENUM
   BFD_RELOC_ARC_B22_PCREL
 ENUMDOC
@@ -2236,8 +2244,6 @@ ENUMDOC
   ARC 26 bit absolute branch.  The lowest two bits must be zero and are not
   stored in the instruction.  The high 24 bits are installed in bits 23
   through 0.
-COMMENT
-{* end-sanitize-arc *}
 
 COMMENT
 ENUM
@@ -2306,8 +2312,6 @@ ENUMDOC
 COMMENT
 {* end-sanitize-d30v *}
 
-COMMENT
-{* start-sanitize-m32r *}
 ENUM
   BFD_RELOC_M32R_24
 ENUMDOC
@@ -2339,8 +2343,11 @@ ENUM
   BFD_RELOC_M32R_LO16
 ENUMDOC
   This is a 16-bit reloc containing the lower 16 bits of an address.
-COMMENT
-{* end-sanitize-m32r *}
+ENUM
+  BFD_RELOC_M32R_SDA16
+ENUMDOC
+  This is a 16-bit reloc containing the small data area offset for use in
+  add3, load, and store instructions.
 
 COMMENT
 {* start-sanitize-v850 *}