Remove arm-aout and arm-coff support

This also removes arm-netbsd (not arm-netbsdelf!), arm-openbsd, and
arm-riscix.  Those targets weren't on the obsolete list but they are
all aout, and it doesn't make all that much sense to remove arm-aout
without removing them too.

bfd/
	* Makefile.am: Remove arm-aout and arm-coff support.
	* config.bfd: Likewise.
	* configure.ac: Likewise.
	* targets.c: Likewise.
	* aout-arm.c: Delete.
	* armnetbsd.c: Delete.
	* riscix.c: Delete.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
	* po/SRC-POTFILES.in: Regenerate.
binutils/
	* testsuite/binutils-all/arm/objdump.exp: Remove arm-aout and
	arm-coff support.
	* testsuite/binutils-all/objcopy.exp: Likewise.
	* testsuite/lib/binutils-common.exp: Likewise.
gas/
	* Makefile.am: Remove arm-aout and arm-coff support.
	* config/tc-arm.c: Likewise.
	* config/tc-arm.h: Likewise.
	* configure.tgt: Likewise.
	* testsuite/gas/aarch64/codealign.d: Likewise.
	* testsuite/gas/aarch64/mapping.d: Likewise.
	* testsuite/gas/aarch64/mapping2.d: Likewise.
	* testsuite/gas/arm/adds-thumb1-reloc-local-armv7-m.d: Likewise.
	* testsuite/gas/arm/adds-thumb1-reloc-local.d: Likewise.
	* testsuite/gas/arm/addsw-bad.d: Likewise.
	* testsuite/gas/arm/align.d: Likewise.
	* testsuite/gas/arm/align64.d: Likewise.
	* testsuite/gas/arm/arch7.d: Likewise.
	* testsuite/gas/arm/arch7a-mp.d: Likewise.
	* testsuite/gas/arm/arch7em.d: Likewise.
	* testsuite/gas/arm/archv8m-main-dsp-5.d: Likewise.
	* testsuite/gas/arm/arm-it-auto-2.d: Likewise.
	* testsuite/gas/arm/arm-it-auto-3.d: Likewise.
	* testsuite/gas/arm/arm-it-auto.d: Likewise.
	* testsuite/gas/arm/arm-it-bad-2.d: Likewise.
	* testsuite/gas/arm/arm-it.d: Likewise.
	* testsuite/gas/arm/armv7e-m+fpv5-d16.d: Likewise.
	* testsuite/gas/arm/armv7e-m+fpv5-sp-d16.d: Likewise.
	* testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d: Likewise.
	* testsuite/gas/arm/armv8-2-fp16-scalar.d: Likewise.
	* testsuite/gas/arm/armv8-2-fp16-simd-thumb.d: Likewise.
	* testsuite/gas/arm/armv8-2-fp16-simd.d: Likewise.
	* testsuite/gas/arm/armv8-a+crypto.d: Likewise.
	* testsuite/gas/arm/armv8-a+fp.d: Likewise.
	* testsuite/gas/arm/armv8-a+ras.d: Likewise.
	* testsuite/gas/arm/armv8-a+rdma-warning.d: Likewise.
	* testsuite/gas/arm/armv8-a+rdma.d: Likewise.
	* testsuite/gas/arm/armv8-a+simd.d: Likewise.
	* testsuite/gas/arm/armv8-a-barrier-thumb.d: Likewise.
	* testsuite/gas/arm/armv8-r+fp.d: Likewise.
	* testsuite/gas/arm/armv8-r+simd.d: Likewise.
	* testsuite/gas/arm/armv8-r-barrier-thumb.d: Likewise.
	* testsuite/gas/arm/armv8_1-a+simd.d: Likewise.
	* testsuite/gas/arm/armv8_2+rdma.d: Likewise.
	* testsuite/gas/arm/armv8_2-a.d: Likewise.
	* testsuite/gas/arm/armv8_3-a-fp.d: Likewise.
	* testsuite/gas/arm/armv8_3-a-simd.d: Likewise.
	* testsuite/gas/arm/armv8a-automatic-hlt.d: Likewise.
	* testsuite/gas/arm/armv8a-automatic-lda.d: Likewise.
	* testsuite/gas/arm/attr-syntax.d: Likewise.
	* testsuite/gas/arm/automatic-bw.d: Likewise.
	* testsuite/gas/arm/automatic-cbz.d: Likewise.
	* testsuite/gas/arm/automatic-clrex.d: Likewise.
	* testsuite/gas/arm/automatic-lda.d: Likewise.
	* testsuite/gas/arm/automatic-ldaex.d: Likewise.
	* testsuite/gas/arm/automatic-ldaexb.d: Likewise.
	* testsuite/gas/arm/automatic-ldrex.d: Likewise.
	* testsuite/gas/arm/automatic-ldrexd.d: Likewise.
	* testsuite/gas/arm/automatic-movw.d: Likewise.
	* testsuite/gas/arm/automatic-sdiv.d: Likewise.
	* testsuite/gas/arm/automatic-strexb.d: Likewise.
	* testsuite/gas/arm/barrier-bad-thumb.d: Likewise.
	* testsuite/gas/arm/barrier-bad.d: Likewise.
	* testsuite/gas/arm/barrier-thumb.d: Likewise.
	* testsuite/gas/arm/barrier.d: Likewise.
	* testsuite/gas/arm/bignum1.d: Likewise.
	* testsuite/gas/arm/blx-bad.d: Likewise.
	* testsuite/gas/arm/blx-bl-convert.d: Likewise.
	* testsuite/gas/arm/blx-local.s: Likewise.
	* testsuite/gas/arm/crc32-armv8-a-bad.d: Likewise.
	* testsuite/gas/arm/crc32-armv8-a.d: Likewise.
	* testsuite/gas/arm/crc32-armv8-r-bad.d: Likewise.
	* testsuite/gas/arm/crc32-armv8-r.d: Likewise.
	* testsuite/gas/arm/dis-data.d: Likewise.
	* testsuite/gas/arm/dis-data2.d: Likewise.
	* testsuite/gas/arm/dis-data3.d: Likewise.
	* testsuite/gas/arm/eabi_attr_1.d: Likewise.
	* testsuite/gas/arm/fp-save.d: Likewise.
	* testsuite/gas/arm/group-reloc-alu-encoding-bad.d: Likewise.
	* testsuite/gas/arm/group-reloc-alu-parsing-bad.d: Likewise.
	* testsuite/gas/arm/group-reloc-alu.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldc-encoding-bad.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldc-parsing-bad.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldc.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldr-encoding-bad.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldr-parsing-bad.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldr.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d: Likewise.
	* testsuite/gas/arm/group-reloc-ldrs.d: Likewise.
	* testsuite/gas/arm/insn-error-a.d: Likewise.
	* testsuite/gas/arm/insn-error-t.d: Likewise.
	* testsuite/gas/arm/inst-po-2.d: Likewise.
	* testsuite/gas/arm/inst-po-3.d: Likewise.
	* testsuite/gas/arm/inst-po-be.d: Likewise.
	* testsuite/gas/arm/inst-po.d: Likewise.
	* testsuite/gas/arm/ldconst.d: Likewise.
	* testsuite/gas/arm/ldgesb-bad.d: Likewise.
	* testsuite/gas/arm/ldgesh-bad.d: Likewise.
	* testsuite/gas/arm/ldst-offset0.d: Likewise.
	* testsuite/gas/arm/local_function.d: Likewise.
	* testsuite/gas/arm/local_label_coff.d: Likewise.
	* testsuite/gas/arm/local_label_elf.d: Likewise.
	* testsuite/gas/arm/mapping.d: Likewise.
	* testsuite/gas/arm/mapping2.d: Likewise.
	* testsuite/gas/arm/mapping3.d: Likewise.
	* testsuite/gas/arm/mapping4.d: Likewise.
	* testsuite/gas/arm/mapshort-elf.d: Likewise.
	* testsuite/gas/arm/mask_1-armv8-a.d: Likewise.
	* testsuite/gas/arm/mask_1-armv8-r.d: Likewise.
	* testsuite/gas/arm/movs-thumb1-reloc-local-armv7-m.d: Likewise.
	* testsuite/gas/arm/movs-thumb1-reloc-local.d: Likewise.
	* testsuite/gas/arm/movw-local.d: Likewise.
	* testsuite/gas/arm/mrs-msr-thumb-v6t2.d: Likewise.
	* testsuite/gas/arm/mrs-msr-thumb-v7-m.d: Likewise.
	* testsuite/gas/arm/mrs-msr-thumb-v7e-m.d: Likewise.
	* testsuite/gas/arm/msr-imm-bad.d: Likewise.
	* testsuite/gas/arm/msr-reg-bad.d: Likewise.
	* testsuite/gas/arm/msr-reg-thumb.d: Likewise.
	* testsuite/gas/arm/nomapping.d: Likewise.
	* testsuite/gas/arm/nops.d: Likewise.
	* testsuite/gas/arm/pic.d: Likewise.
	* testsuite/gas/arm/pinsn.d: Likewise.
	* testsuite/gas/arm/plt-1.d: Likewise.
	* testsuite/gas/arm/pr21458.d: Likewise.
	* testsuite/gas/arm/pr9722.d: Likewise.
	* testsuite/gas/arm/strex-t.d: Likewise.
	* testsuite/gas/arm/t2-branch-global.d: Likewise.
	* testsuite/gas/arm/target-reloc-1.d: Likewise.
	* testsuite/gas/arm/thumb-b-bad.d: Likewise.
	* testsuite/gas/arm/thumb-w-bad.d: Likewise.
	* testsuite/gas/arm/thumb-w-good.d: Likewise.
	* testsuite/gas/arm/thumb.d: Likewise.
	* testsuite/gas/arm/thumb2_it.d: Likewise.
	* testsuite/gas/arm/thumb2_it_auto.d: Likewise.
	* testsuite/gas/arm/thumb2_it_search.d: Likewise.
	* testsuite/gas/arm/thumb2_ldmstm.d: Likewise.
	* testsuite/gas/arm/thumb2_ldr_immediate_armv6.d: Likewise.
	* testsuite/gas/arm/thumb2_ldr_immediate_armv6t2.d: Likewise.
	* testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d: Likewise.
	* testsuite/gas/arm/thumb2_pool.d: Likewise.
	* testsuite/gas/arm/thumb2_vpool.d: Likewise.
	* testsuite/gas/arm/thumb2_vpool_be.d: Likewise.
	* testsuite/gas/arm/thumb32.d: Likewise.
	* testsuite/gas/arm/thumbver.d: Likewise.
	* testsuite/gas/arm/tls.d: Likewise.
	* testsuite/gas/arm/tls_vxworks.d: Likewise.
	* testsuite/gas/arm/undefined.d: Likewise.
	* testsuite/gas/arm/undefined_coff.d: Likewise.
	* testsuite/gas/arm/unwind.d: Likewise.
	* testsuite/gas/arm/v4bx.d: Likewise.
	* testsuite/gas/arm/vcmp-noprefix-imm.d: Likewise.
	* testsuite/gas/arm/vcvt-bad.d: Likewise.
	* testsuite/gas/arm/vfma1.d: Likewise.
	* testsuite/gas/arm/vldconst.d: Likewise.
	* testsuite/gas/arm/vldconst_be.d: Likewise.
	* testsuite/gas/arm/vldm-arm.d: Likewise.
	* testsuite/gas/arm/vldr.d: Likewise.
	* testsuite/gas/arm/weakdef-1.d: Likewise.
	* testsuite/gas/arm/weakdef-2.d: Likewise.
	* config/te-riscix.h: Delete.
	* Makefile.in: Regenerate.
	* po/POTFILES.in: Regenerate.
ld/
	* Makefile.am: Remove arm-aout and arm-coff support.
	* configure.tgt: Likewise.
	* testsuite/ld-arm/attr-merge-div-00.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-01-m3.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-01.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-02.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-10-m3.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-10.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-11.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-12.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-120.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-20.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-21.d: Likewise.
	* testsuite/ld-arm/attr-merge-div-22.d: Likewise.
	* testsuite/ld-arm/attr-merge-hardfp-use-1.d: Likewise.
	* testsuite/ld-arm/attr-merge-hardfp-use-2.d: Likewise.
	* testsuite/ld-arm/attr-merge-nosection-1.d: Likewise.
	* testsuite/ld-arm/attr-merge-unknown-2.d: Likewise.
	* testsuite/ld-arm/attr-merge-unknown-2r.d: Likewise.
	* testsuite/ld-arm/attr-merge-unknown-3.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-1.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-10.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-10r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-11.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-11r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-12.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-12r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-13.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-13r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-14.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-14r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-1r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-2.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-2r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-3.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-3r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-4.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-4r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-5.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-5r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-6.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-6r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-7.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-7r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-8.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-8r.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-9.d: Likewise.
	* testsuite/ld-arm/attr-merge-vfp-9r.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-00-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-00.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-02-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-02.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-04-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-04.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-20-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-20.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-22-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-22.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-24-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-40-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-40.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-42-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-44-nowarn.d: Likewise.
	* testsuite/ld-arm/attr-merge-wchar-44.d: Likewise.
	* testsuite/ld-arm/eabi-hard-float.d: Likewise.
	* testsuite/ld-arm/eabi-soft-float-ABI4.d: Likewise.
	* testsuite/ld-arm/eabi-soft-float-r.d: Likewise.
	* testsuite/ld-arm/eabi-soft-float.d: Likewise.
	* testsuite/ld-arm/gc-hidden-1.d: Likewise.
	* emulparams/armaoutb.sh: Delete.
	* emulparams/armaoutl.sh: Delete.
	* emulparams/armcoff.sh: Delete.
	* emulparams/armnbsd.sh: Delete.
	* emulparams/riscix.sh: Delete.
	* scripttempl/armaout.sc: Delete.
	* scripttempl/armcoff.sc: Delete.
	* scripttempl/riscix.sc: Delete.
	* Makefile.in: Regenerate.
	* po/BLD-POTFILES.in: Regenerate.

80 files changed, 151 insertions, 348 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 366e59e..23843c1 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,85 @@
+2018-04-25  Alan Modra  <amodra@gmail.com>
+
+	* Makefile.am: Remove arm-aout and arm-coff support.
+	* configure.tgt: Likewise.
+	* testsuite/ld-arm/attr-merge-div-00.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-01-m3.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-01.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-02.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-10-m3.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-10.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-11.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-12.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-120.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-20.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-21.d: Likewise.
+	* testsuite/ld-arm/attr-merge-div-22.d: Likewise.
+	* testsuite/ld-arm/attr-merge-hardfp-use-1.d: Likewise.
+	* testsuite/ld-arm/attr-merge-hardfp-use-2.d: Likewise.
+	* testsuite/ld-arm/attr-merge-nosection-1.d: Likewise.
+	* testsuite/ld-arm/attr-merge-unknown-2.d: Likewise.
+	* testsuite/ld-arm/attr-merge-unknown-2r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-unknown-3.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-1.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-10.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-10r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-11.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-11r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-12.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-12r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-13.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-13r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-14.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-14r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-1r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-2.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-2r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-3.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-3r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-4.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-4r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-5.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-5r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-6.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-6r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-7.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-7r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-8.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-8r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-9.d: Likewise.
+	* testsuite/ld-arm/attr-merge-vfp-9r.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-00-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-00.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-02-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-02.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-04-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-04.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-20-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-20.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-22-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-22.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-24-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-40-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-40.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-42-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-44-nowarn.d: Likewise.
+	* testsuite/ld-arm/attr-merge-wchar-44.d: Likewise.
+	* testsuite/ld-arm/eabi-hard-float.d: Likewise.
+	* testsuite/ld-arm/eabi-soft-float-ABI4.d: Likewise.
+	* testsuite/ld-arm/eabi-soft-float-r.d: Likewise.
+	* testsuite/ld-arm/eabi-soft-float.d: Likewise.
+	* testsuite/ld-arm/gc-hidden-1.d: Likewise.
+	* emulparams/armaoutb.sh: Delete.
+	* emulparams/armaoutl.sh: Delete.
+	* emulparams/armcoff.sh: Delete.
+	* emulparams/armnbsd.sh: Delete.
+	* emulparams/riscix.sh: Delete.
+	* scripttempl/armaout.sc: Delete.
+	* scripttempl/armcoff.sc: Delete.
+	* scripttempl/riscix.sc: Delete.
+	* Makefile.in: Regenerate.
+	* po/BLD-POTFILES.in: Regenerate.
+
 2018-04-21  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/lib/ld-lib.exp (run_host_cmd): Check that gcc -B
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 9a4a49f..a905b15 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -167,9 +167,6 @@ ALL_EMULATION_SOURCES = \
 	earclinux_nps.c \
 	earclinux_prof.c \
 	earm_wince_pe.c \
-	earmaoutb.c \
-	earmaoutl.c \
-	earmcoff.c \
 	earmelf.c \
 	earmelf_fbsd.c \
 	earmelf_fuchsia.c \
@@ -186,7 +183,6 @@ ALL_EMULATION_SOURCES = \
 	earmelfb_linux_eabi.c \
 	earmelfb_nacl.c \
 	earmelfb_nbsd.c \
-	earmnbsd.c \
 	earmnto.c \
 	earmpe.c \
 	earmsymbian.c \
@@ -346,7 +342,6 @@ ALL_EMULATION_SOURCES = \
 	eppcmacos.c \
 	eppcpe.c \
 	epruelf.c \
-	eriscix.c \
 	escore3_elf.c \
 	escore7_elf.c \
 	esh.c \
@@ -686,15 +681,6 @@ earclinux_prof.c: $(srcdir)/emulparams/arclinux_prof.sh \
 earm_wince_pe.c: $(srcdir)/emulparams/arm_wince_pe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
 
-earmaoutb.c:	$(srcdir)/emulparams/armaoutb.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
-
-earmaoutl.c:	$(srcdir)/emulparams/armaoutl.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
-
-earmcoff.c:	$(srcdir)/emulparams/armcoff.sh \
-  $(srcdir)/emultempl/armcoff.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS}
-
 earmelf.c: $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -777,9 +763,6 @@ earmelfb_nbsd.c: $(srcdir)/emulparams/armelfb_nbsd.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-earmnbsd.c:	$(srcdir)/emulparams/armnbsd.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
 earmnto.c: $(srcdir)/emulparams/armnto.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1550,9 +1533,6 @@ epruelf.c: $(srcdir)/emulparams/pruelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/pru.sc \
   $(srcdir)/emultempl/pruelf.em ${GEN_DEPENDS}
 
-eriscix.c: $(srcdir)/emulparams/riscix.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
 escore3_elf.c: $(srcdir)/emulparams/score3_elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 53353cb..d2201ac 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -536,9 +536,6 @@ ALL_EMULATION_SOURCES = \
 	earclinux_nps.c \
 	earclinux_prof.c \
 	earm_wince_pe.c \
-	earmaoutb.c \
-	earmaoutl.c \
-	earmcoff.c \
 	earmelf.c \
 	earmelf_fbsd.c \
 	earmelf_fuchsia.c \
@@ -555,7 +552,6 @@ ALL_EMULATION_SOURCES = \
 	earmelfb_linux_eabi.c \
 	earmelfb_nacl.c \
 	earmelfb_nbsd.c \
-	earmnbsd.c \
 	earmnto.c \
 	earmpe.c \
 	earmsymbian.c \
@@ -715,7 +711,6 @@ ALL_EMULATION_SOURCES = \
 	eppcmacos.c \
 	eppcpe.c \
 	epruelf.c \
-	eriscix.c \
 	escore3_elf.c \
 	escore7_elf.c \
 	esh.c \
@@ -1086,9 +1081,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earcv2elf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earcv2elfx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earm_wince_pe.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmaoutb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmaoutl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmcoff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_fbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_fuchsia.Po@am__quote@
@@ -1105,7 +1097,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux_eabi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nacl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nbsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmnbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmnto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmpe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmsymbian.Po@am__quote@
@@ -1326,7 +1317,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppcmacos.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppcpe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epruelf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eriscix.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escore3_elf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escore7_elf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/esh.Po@am__quote@
@@ -2190,15 +2180,6 @@ earclinux_prof.c: $(srcdir)/emulparams/arclinux_prof.sh \
 earm_wince_pe.c: $(srcdir)/emulparams/arm_wince_pe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
 
-earmaoutb.c:	$(srcdir)/emulparams/armaoutb.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
-
-earmaoutl.c:	$(srcdir)/emulparams/armaoutl.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
-
-earmcoff.c:	$(srcdir)/emulparams/armcoff.sh \
-  $(srcdir)/emultempl/armcoff.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS}
-
 earmelf.c: $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -2281,9 +2262,6 @@ earmelfb_nbsd.c: $(srcdir)/emulparams/armelfb_nbsd.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-earmnbsd.c:	$(srcdir)/emulparams/armnbsd.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
 earmnto.c: $(srcdir)/emulparams/armnto.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -3054,9 +3032,6 @@ epruelf.c: $(srcdir)/emulparams/pruelf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/pru.sc \
   $(srcdir)/emultempl/pruelf.em ${GEN_DEPENDS}
 
-eriscix.c: $(srcdir)/emulparams/riscix.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
 escore3_elf.c: $(srcdir)/emulparams/score3_elf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 0dde29e..1b45611 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -102,22 +102,16 @@ arm*-*-cegcc*)		targ_emul=arm_wince_pe ; targ_extra_ofiles="deffilep.o pe-dll.o"
 arm-wince-pe | arm-*-wince | arm*-*-mingw32ce*)
 			targ_emul=arm_wince_pe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 arm-*-pe)		targ_emul=armpe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;;
-arm-*-aout | armel-*-aout) targ_emul=armaoutl ;;
-armeb-*-aout)		targ_emul=armaoutb ;;
-arm-*-coff)		targ_emul=armcoff ;;
 arm*b-*-freebsd*)	targ_emul=armelfb_fbsd
 			targ_extra_emuls="armelf_fbsd armelf" ;;
 arm*-*-freebsd* | arm-*-kfreebsd*-gnu)
 			targ_emul=armelf_fbsd
 			targ_extra_emuls="armelfb_fbsd armelf" ;;
 armeb-*-netbsdelf*)	targ_emul=armelfb_nbsd;
-			targ_extra_emuls="armelf_nbsd armelf armnbsd" ;;
+			targ_extra_emuls="armelf_nbsd armelf" ;;
 arm-*-netbsdelf*)	targ_emul=armelf_nbsd;
-			targ_extra_emuls="armelfb_nbsd armelf armnbsd" ;;
-arm-*-netbsd*)		targ_emul=armnbsd;
-			targ_extra_emuls="armelf armelf_nbsd armelfb_nbsd" ;;
+			targ_extra_emuls="armelfb_nbsd armelf" ;;
 arm-*-nto*)		targ_emul=armnto ;;
-arm-*-openbsd*)		targ_emul=armnbsd ;;
 arm-*-phoenix*)		targ_emul=armelf ;;
 armeb-*-elf | armeb-*-eabi*)
 			targ_emul=armelfb ;;
diff --git a/ld/emulparams/armaoutb.sh b/ld/emulparams/armaoutb.sh
deleted file mode 100644
index efef2c3..0000000
--- a/ld/emulparams/armaoutb.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_NAME=armaout
-OUTPUT_FORMAT="a.out-arm-big"
-HEADER_START_ADDR=0x8000
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=32768
-ARCH=arm
diff --git a/ld/emulparams/armaoutl.sh b/ld/emulparams/armaoutl.sh
deleted file mode 100644
index 5eccc4c..0000000
--- a/ld/emulparams/armaoutl.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-SCRIPT_NAME=armaout
-OUTPUT_FORMAT="a.out-arm-little"
-HEADER_START_ADDR=0x8000
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=32768
-ARCH=arm
diff --git a/ld/emulparams/armcoff.sh b/ld/emulparams/armcoff.sh
deleted file mode 100644
index 91df7d3..0000000
--- a/ld/emulparams/armcoff.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH=arm
-SCRIPT_NAME=armcoff
-OUTPUT_FORMAT="coff-arm-little"
-LITTLE_OUTPUT_FORMAT="coff-arm-little"
-BIG_OUTPUT_FORMAT="coff-arm-big"
-TEMPLATE_NAME=armcoff
diff --git a/ld/emulparams/armnbsd.sh b/ld/emulparams/armnbsd.sh
deleted file mode 100644
index dd4768d..0000000
--- a/ld/emulparams/armnbsd.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_NAME=aout
-TEXT_START_ADDR=0x1020
-case ${LD_FLAG} in
-    n|N)	TEXT_START_ADDR=0x1000 ;;
-esac
-OUTPUT_FORMAT="a.out-arm-netbsd"
-TARGET_PAGE_SIZE=0x1000
-ARCH=arm
-EXECUTABLE_SYMBOLS='__DYNAMIC = 0;'
diff --git a/ld/emulparams/riscix.sh b/ld/emulparams/riscix.sh
deleted file mode 100644
index e7f6d92..0000000
--- a/ld/emulparams/riscix.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=riscix
-OUTPUT_FORMAT="a.out-riscix"
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=0x8000
-ARCH=arm
diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in
index 5de4e8d..1350bea9 100644
--- a/ld/po/BLD-POTFILES.in
+++ b/ld/po/BLD-POTFILES.in
@@ -24,9 +24,6 @@ earclinux_prof.c
 earcv2elf.c
 earcv2elfx.c
 earm_wince_pe.c
-earmaoutb.c
-earmaoutl.c
-earmcoff.c
 earmelf.c
 earmelf_fbsd.c
 earmelf_fuchsia.c
@@ -43,7 +40,6 @@ earmelfb_linux.c
 earmelfb_linux_eabi.c
 earmelfb_nacl.c
 earmelfb_nbsd.c
-earmnbsd.c
 earmnto.c
 earmpe.c
 earmsymbian.c
@@ -264,7 +260,6 @@ eppclynx.c
 eppcmacos.c
 eppcpe.c
 epruelf.c
-eriscix.c
 escore3_elf.c
 escore7_elf.c
 esh.c
diff --git a/ld/scripttempl/armaout.sc b/ld/scripttempl/armaout.sc
deleted file mode 100644
index 43e5d29..0000000
--- a/ld/scripttempl/armaout.sc
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-
-${RELOCATING+${LIB_SEARCH_DIRS}}
-${STACKZERO+${RELOCATING+${STACKZERO}}}
-SECTIONS
-{
-  .text   ${RELOCATING+${TEXT_START_ADDR}} :
-  {
-    CREATE_OBJECT_SYMBOLS
-    ${RELOCATING+__stext_ = .;}
-    *(.text)
-    ${PAD_TEXT+${RELOCATING+. = ${DATA_ALIGNMENT};}}
-    ${RELOCATING+_etext = ${DATA_ALIGNMENT};}
-    ${RELOCATING+__etext = ${DATA_ALIGNMENT};}
-  }
-  .data ${RELOCATING+${DATA_ALIGNMENT}} :
-  {
-    ${RELOCATING+__sdata_ = .;}
-    *(.data)
-    ${CONSTRUCTING+CONSTRUCTORS}
-    ${RELOCATING+_edata  =  ${DATA_ALIGNMENT};}
-    ${RELOCATING+__edata  =  ${DATA_ALIGNMENT};}
-  }
-  .bss ${RELOCATING+${DATA_ALIGNMENT}} :
-  {
-   ${RELOCATING+ __bss_start = .};
-   *(.bss)
-   *(COMMON)
-   ${RELOCATING+_end = ALIGN(4) };
-   ${RELOCATING+__end = ALIGN(4) };
-  }
-}
-EOF
diff --git a/ld/scripttempl/armcoff.sc b/ld/scripttempl/armcoff.sc
deleted file mode 100644
index b2d9517..0000000
--- a/ld/scripttempl/armcoff.sc
+++ /dev/null
@@ -1,97 +0,0 @@
-# Linker script for ARM COFF.
-# Based on i386coff.sc by Ian Taylor <ian@cygnus.com>.
-#
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-test -z "$ENTRY" && ENTRY=_start
-if test -z "${DATA_ADDR}"; then
-  if test "$LD_FLAG" = "N" || test "$LD_FLAG" = "n"; then
-    DATA_ADDR=.
-  fi
-fi
-
-# These are substituted in as variables in order to get '}' in a shell
-# conditional expansion.
-CTOR='.ctor : {
-    *(SORT(.ctors.*))
-    *(.ctor)
-  }'
-DTOR='.dtor : {
-    *(SORT(.dtors.*))
-    *(.dtor)
-  }'
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", "${LITTLE_OUTPUT_FORMAT}")
-${LIB_SEARCH_DIRS}
-
-${RELOCATING+ENTRY (${ENTRY})}
-
-SECTIONS
-{
-  /* We start at 0x8000 because gdb assumes it (see FRAME_CHAIN).
-     This is an artifact of the ARM Demon monitor using the bottom 32k
-     as workspace (shared with the FP instruction emulator if
-     present): */
-  .text ${RELOCATING+ 0x8000} : {
-    *(.init)
-    *(.text*)
-    *(.glue_7t)
-    *(.glue_7)
-    *(.rdata)
-    ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ;
-			LONG (-1); *(.ctors); *(.ctor); LONG (0); }
-    ${CONSTRUCTING+ ___DTOR_LIST__ = .; __DTOR_LIST__ = . ;
-			LONG (-1); *(.dtors); *(.dtor);  LONG (0); }
-    *(.fini)
-    ${RELOCATING+ etext  =  .;}
-    ${RELOCATING+ _etext =  .;}
-  }
-  .data ${RELOCATING+${DATA_ADDR-0x40000 + (ALIGN(0x8) & 0xfffc0fff)}} : {
-    ${RELOCATING+  __data_start__ = . ;}
-    *(.data*)
-
-    ${RELOCATING+*(.gcc_exc*)}
-    ${RELOCATING+___EH_FRAME_BEGIN__ = . ;}
-    ${RELOCATING+*(.eh_fram*)}
-    ${RELOCATING+___EH_FRAME_END__ = . ;}
-    ${RELOCATING+LONG(0);}
-
-    ${RELOCATING+ __data_end__ = . ;}
-    ${RELOCATING+ edata  =  .;}
-    ${RELOCATING+ _edata  =  .;}
-  }
-  ${CONSTRUCTING+${RELOCATING-$CTOR}}
-  ${CONSTRUCTING+${RELOCATING-$DTOR}}
-  .bss ${RELOCATING+ ALIGN(0x8)} :
-  {
-    ${RELOCATING+ __bss_start__ = . ;}
-    *(.bss)
-    *(COMMON)
-    ${RELOCATING+ __bss_end__ = . ;}
-  }
-
-  ${RELOCATING+ end = .;}
-  ${RELOCATING+ _end = .;}
-  ${RELOCATING+ __end__ = .;}
-
-  .stab  0 ${RELOCATING+(NOLOAD)} :
-  {
-    [ .stab ]
-  }
-  .stabstr  0 ${RELOCATING+(NOLOAD)} :
-  {
-    [ .stabstr ]
-  }
-}
-EOF
diff --git a/ld/scripttempl/riscix.sc b/ld/scripttempl/riscix.sc
deleted file mode 100644
index 66bdf3f..0000000
--- a/ld/scripttempl/riscix.sc
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-
-${RELOCATING+${LIB_SEARCH_DIRS}}
-${RELOCATING+__DYNAMIC  =  0;}
-${STACKZERO+${RELOCATING+${STACKZERO}}}
-${SHLIB_PATH+${RELOCATING+${SHLIB_PATH}}}
-SECTIONS
-{
-  .text ${RELOCATING+${TEXT_START_ADDR}}:
-  {
-    CREATE_OBJECT_SYMBOLS
-    *(.text)
-    ${PAD_TEXT+${RELOCATING+. = ${DATA_ALIGNMENT};}}
-    ${RELOCATING+_etext = ${DATA_ALIGNMENT};}
-    ${RELOCATING+__etext = ${DATA_ALIGNMENT};}
-  }
-  .data  ${RELOCATING+${DATA_ALIGNMENT}} :
-  {
-    *(.data)
-    ${CONSTRUCTING+CONSTRUCTORS}
-    ${RELOCATING+_edata  =  .;}
-    ${RELOCATING+__edata =  .;}
-  }
-  .bss ${RELOCATING+SIZEOF(.data) + ADDR(.data)} :
-  {
-   ${RELOCATING+ __bss_start = .};
-   *(.bss)
-   *(COMMON)
-   ${RELOCATING+_end = ALIGN(4) };
-   ${RELOCATING+__end = ALIGN(4) };
-  }
-}
-EOF
diff --git a/ld/testsuite/ld-arm/attr-merge-div-00.d b/ld/testsuite/ld-arm/attr-merge-div-00.d
index 942662e..61b17ba 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-00.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-00.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-01-m3.d b/ld/testsuite/ld-arm/attr-merge-div-01-m3.d
index c0cdd49..c28acc0 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-01-m3.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-01-m3.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-01.d b/ld/testsuite/ld-arm/attr-merge-div-01.d
index f81a81e..085a8da 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-01.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-01.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-02.d b/ld/testsuite/ld-arm/attr-merge-div-02.d
index 3684950..4e8387a 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-02.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-02.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-10-m3.d b/ld/testsuite/ld-arm/attr-merge-div-10-m3.d
index 3736e59..2b6cfe2 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-10-m3.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-10-m3.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-10.d b/ld/testsuite/ld-arm/attr-merge-div-10.d
index 32614ee..9e03f8e 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-10.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-10.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-11.d b/ld/testsuite/ld-arm/attr-merge-div-11.d
index 95dc8db..bca47f0 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-11.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-11.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-12.d b/ld/testsuite/ld-arm/attr-merge-div-12.d
index 73d70ff..fa4aa87 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-12.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-12.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-120.d b/ld/testsuite/ld-arm/attr-merge-div-120.d
index 8891e4b..5dea876 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-120.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-120.d
@@ -5,7 +5,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-20.d b/ld/testsuite/ld-arm/attr-merge-div-20.d
index fd494bb..1412eb4 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-20.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-20.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-21.d b/ld/testsuite/ld-arm/attr-merge-div-21.d
index afd0f8d..8396620 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-21.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-21.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-div-22.d b/ld/testsuite/ld-arm/attr-merge-div-22.d
index c70da03..c19ccae 100644
--- a/ld/testsuite/ld-arm/attr-merge-div-22.d
+++ b/ld/testsuite/ld-arm/attr-merge-div-22.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-hardfp-use-1.d b/ld/testsuite/ld-arm/attr-merge-hardfp-use-1.d
index 136ff41..8252314 100644
--- a/ld/testsuite/ld-arm/attr-merge-hardfp-use-1.d
+++ b/ld/testsuite/ld-arm/attr-merge-hardfp-use-1.d
@@ -4,7 +4,7 @@
 #ld: -e main
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-hardfp-use-2.d b/ld/testsuite/ld-arm/attr-merge-hardfp-use-2.d
index b7975de..c6b70ba 100644
--- a/ld/testsuite/ld-arm/attr-merge-hardfp-use-2.d
+++ b/ld/testsuite/ld-arm/attr-merge-hardfp-use-2.d
@@ -4,7 +4,7 @@
 #ld: -e main
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-nosection-1.d b/ld/testsuite/ld-arm/attr-merge-nosection-1.d
index a2b8d73..32cf689 100644
--- a/ld/testsuite/ld-arm/attr-merge-nosection-1.d
+++ b/ld/testsuite/ld-arm/attr-merge-nosection-1.d
@@ -5,7 +5,7 @@
 #ld:
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-unknown-2.d b/ld/testsuite/ld-arm/attr-merge-unknown-2.d
index 45bb023..54a1d35 100644
--- a/ld/testsuite/ld-arm/attr-merge-unknown-2.d
+++ b/ld/testsuite/ld-arm/attr-merge-unknown-2.d
@@ -5,7 +5,7 @@
 #warning: unknown EABI object attribute 82
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-unknown-2r.d b/ld/testsuite/ld-arm/attr-merge-unknown-2r.d
index cfbc5db..fd6447a 100644
--- a/ld/testsuite/ld-arm/attr-merge-unknown-2r.d
+++ b/ld/testsuite/ld-arm/attr-merge-unknown-2r.d
@@ -5,7 +5,7 @@
 #warning: unknown EABI object attribute 82
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-unknown-3.d b/ld/testsuite/ld-arm/attr-merge-unknown-3.d
index ca2016c..f2afa66 100644
--- a/ld/testsuite/ld-arm/attr-merge-unknown-3.d
+++ b/ld/testsuite/ld-arm/attr-merge-unknown-3.d
@@ -5,7 +5,7 @@
 #warning: unknown EABI object attribute 82
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-1.d b/ld/testsuite/ld-arm/attr-merge-vfp-1.d
index 8625735..53a325e 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-1.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-1.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-10.d b/ld/testsuite/ld-arm/attr-merge-vfp-10.d
index a7e2fff..db3a7a6 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-10.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-10.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-10r.d b/ld/testsuite/ld-arm/attr-merge-vfp-10r.d
index 581d1b0..7480a92 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-10r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-10r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-11.d b/ld/testsuite/ld-arm/attr-merge-vfp-11.d
index 428410b..f0452b6 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-11.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-11.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-11r.d b/ld/testsuite/ld-arm/attr-merge-vfp-11r.d
index fec7983..e3c92a2 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-11r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-11r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-12.d b/ld/testsuite/ld-arm/attr-merge-vfp-12.d
index c97b9cd..bb34416 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-12.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-12.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-12r.d b/ld/testsuite/ld-arm/attr-merge-vfp-12r.d
index 139c608..2c2bb2d 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-12r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-12r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-13.d b/ld/testsuite/ld-arm/attr-merge-vfp-13.d
index 4724cf4..f8d3cce 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-13.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-13.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-13r.d b/ld/testsuite/ld-arm/attr-merge-vfp-13r.d
index cc192bb..8328102 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-13r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-13r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-14.d b/ld/testsuite/ld-arm/attr-merge-vfp-14.d
index 865351a..d047c71 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-14.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-14.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-14r.d b/ld/testsuite/ld-arm/attr-merge-vfp-14r.d
index c9e1354..c956ee2 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-14r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-14r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-1r.d b/ld/testsuite/ld-arm/attr-merge-vfp-1r.d
index d7a15d7..00e4081 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-1r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-1r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-2.d b/ld/testsuite/ld-arm/attr-merge-vfp-2.d
index 6444bd0..04ddea1 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-2.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-2.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-2r.d b/ld/testsuite/ld-arm/attr-merge-vfp-2r.d
index 1d36983..8438f4d 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-2r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-2r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-3.d b/ld/testsuite/ld-arm/attr-merge-vfp-3.d
index 8f9d2e7..d119ded 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-3.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-3.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-3r.d b/ld/testsuite/ld-arm/attr-merge-vfp-3r.d
index ab0ff33..1a30439 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-3r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-3r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-4.d b/ld/testsuite/ld-arm/attr-merge-vfp-4.d
index e51a41b..1223850 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-4.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-4.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-4r.d b/ld/testsuite/ld-arm/attr-merge-vfp-4r.d
index 6d19a60..a9f2eeb 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-4r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-4r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-5.d b/ld/testsuite/ld-arm/attr-merge-vfp-5.d
index 650b264..2a5dee9 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-5.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-5.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-5r.d b/ld/testsuite/ld-arm/attr-merge-vfp-5r.d
index f5fb7d7..3d04776 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-5r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-5r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-6.d b/ld/testsuite/ld-arm/attr-merge-vfp-6.d
index 2e37b47..26d90fe 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-6.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-6.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-6r.d b/ld/testsuite/ld-arm/attr-merge-vfp-6r.d
index 8c68442..3802b87 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-6r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-6r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-7.d b/ld/testsuite/ld-arm/attr-merge-vfp-7.d
index 760a82f..6877425 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-7.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-7.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-7r.d b/ld/testsuite/ld-arm/attr-merge-vfp-7r.d
index 760a82f..6877425 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-7r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-7r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-8.d b/ld/testsuite/ld-arm/attr-merge-vfp-8.d
index 22dee2a..cf18747 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-8.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-8.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-8r.d b/ld/testsuite/ld-arm/attr-merge-vfp-8r.d
index 7a21318..ba16004 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-8r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-8r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-9.d b/ld/testsuite/ld-arm/attr-merge-vfp-9.d
index bdf3bc1..fb26941 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-9.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-9.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-9r.d b/ld/testsuite/ld-arm/attr-merge-vfp-9r.d
index 78ead24..d198e57 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-9r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-9r.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
index 8a01f2d..397c310 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-00.d b/ld/testsuite/ld-arm/attr-merge-wchar-00.d
index 4242822..10a9173 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-00.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-00.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
index f393516..6a16c05 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-02.d b/ld/testsuite/ld-arm/attr-merge-wchar-02.d
index f662120..2ffa4e6 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-02.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-02.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
index 16cc469..98160f8 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-04.d b/ld/testsuite/ld-arm/attr-merge-wchar-04.d
index 41413b9..d2c74be 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-04.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-04.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
index c0b1248..d2dc49e 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-20.d b/ld/testsuite/ld-arm/attr-merge-wchar-20.d
index b81fb15..ae7124c 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-20.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-20.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
index e9a1e94..134822c 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-22.d b/ld/testsuite/ld-arm/attr-merge-wchar-22.d
index bf75660..8cc825e 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-22.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-22.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
index 0c9b33e..fac3fd9 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
index 54f0c54..0198735 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-40.d b/ld/testsuite/ld-arm/attr-merge-wchar-40.d
index 46be48c..01e64a9 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-40.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-40.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
index cc72d3e..89b5782 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
index 35eb756..b5a59b1 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
@@ -4,7 +4,7 @@
 #ld: -r --no-wchar-size-warning
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-44.d b/ld/testsuite/ld-arm/attr-merge-wchar-44.d
index c0fba85..191f2a7 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-44.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-44.d
@@ -4,7 +4,7 @@
 #ld: -r
 #readelf: -A
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 Attribute Section: aeabi
 File Attributes
diff --git a/ld/testsuite/ld-arm/eabi-hard-float.d b/ld/testsuite/ld-arm/eabi-hard-float.d
index bc8cc3f..5d54131 100644
--- a/ld/testsuite/ld-arm/eabi-hard-float.d
+++ b/ld/testsuite/ld-arm/eabi-hard-float.d
@@ -3,7 +3,7 @@
 #ld: -r
 #readelf: -h
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 # Check that we set the hard-float ABI flag directly
 
 ELF Header:
diff --git a/ld/testsuite/ld-arm/eabi-soft-float-ABI4.d b/ld/testsuite/ld-arm/eabi-soft-float-ABI4.d
index 1804826..16d2b3d 100644
--- a/ld/testsuite/ld-arm/eabi-soft-float-ABI4.d
+++ b/ld/testsuite/ld-arm/eabi-soft-float-ABI4.d
@@ -3,7 +3,7 @@
 #ld: -r
 #readelf: -h
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 # if we compile for EABI ver4, ld should *not* set either of the float ABI flags
 
 ELF Header:
diff --git a/ld/testsuite/ld-arm/eabi-soft-float-r.d b/ld/testsuite/ld-arm/eabi-soft-float-r.d
index 262d482..04462d6 100644
--- a/ld/testsuite/ld-arm/eabi-soft-float-r.d
+++ b/ld/testsuite/ld-arm/eabi-soft-float-r.d
@@ -3,7 +3,7 @@
 #ld: -r
 #readelf: -h
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 # if we call "ld -r", it should *not* set either of the float ABI flags
 
 ELF Header:
diff --git a/ld/testsuite/ld-arm/eabi-soft-float.d b/ld/testsuite/ld-arm/eabi-soft-float.d
index 6cc7086..ceeebeb 100644
--- a/ld/testsuite/ld-arm/eabi-soft-float.d
+++ b/ld/testsuite/ld-arm/eabi-soft-float.d
@@ -3,7 +3,7 @@
 #ld: -r
 #readelf: -h
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 # Check that we set the soft-float ABI flag directly
 
 ELF Header:
diff --git a/ld/testsuite/ld-arm/gc-hidden-1.d b/ld/testsuite/ld-arm/gc-hidden-1.d
index f0f1fd4..330cc73 100644
--- a/ld/testsuite/ld-arm/gc-hidden-1.d
+++ b/ld/testsuite/ld-arm/gc-hidden-1.d
@@ -4,7 +4,7 @@
 #ld: --gc-sections --shared --version-script hideall.ld
 #objdump: -dRT
 # This test is only valid on ELF based ports.
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 # See PR ld/13990: a forced-local PLT reference to a
 # forced-local symbol is GC'ed, trigging a BFD_ASSERT.