From 2ac93be706418f3b2aebeb22159a328023faed52 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Mon, 16 Apr 2018 20:33:36 +0930
Subject: [PATCH] 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.
---
 bfd/ChangeLog                                 |  13 +
 bfd/Makefile.am                               |   8 -
 bfd/Makefile.in                               |  12 -
 bfd/aout-arm.c                                | 574 ----------------
 bfd/armnetbsd.c                               |  39 --
 bfd/config.bfd                                |  32 +-
 bfd/configure                                 |   6 -
 bfd/configure.ac                              |   6 -
 bfd/po/SRC-POTFILES.in                        |   4 -
 bfd/riscix.c                                  | 649 ------------------
 bfd/targets.c                                 |  18 -
 binutils/ChangeLog                            |   7 +
 .../testsuite/binutils-all/arm/objdump.exp    |   4 -
 binutils/testsuite/binutils-all/objcopy.exp   |   1 -
 binutils/testsuite/lib/binutils-common.exp    |   2 -
 gas/ChangeLog                                 | 161 +++++
 gas/Makefile.am                               |   1 -
 gas/Makefile.in                               |   1 -
 gas/config/tc-arm.c                           |  34 +-
 gas/config/tc-arm.h                           |  16 +-
 gas/config/te-riscix.h                        |  25 -
 gas/configure.tgt                             |   5 -
 gas/po/POTFILES.in                            |   1 -
 gas/testsuite/gas/aarch64/codealign.d         |   2 +-
 gas/testsuite/gas/aarch64/mapping.d           |   2 +-
 gas/testsuite/gas/aarch64/mapping2.d          |   2 +-
 .../gas/arm/adds-thumb1-reloc-local-armv7-m.d |   2 +-
 .../gas/arm/adds-thumb1-reloc-local.d         |   2 +-
 gas/testsuite/gas/arm/addsw-bad.d             |   2 +-
 gas/testsuite/gas/arm/align.d                 |   2 +-
 gas/testsuite/gas/arm/align64.d               |   2 +-
 gas/testsuite/gas/arm/arch7.d                 |   2 +-
 gas/testsuite/gas/arm/arch7a-mp.d             |   2 +-
 gas/testsuite/gas/arm/arch7em.d               |   2 +-
 gas/testsuite/gas/arm/archv8m-main-dsp-5.d    |   2 +-
 gas/testsuite/gas/arm/arm-it-auto-2.d         |   2 +-
 gas/testsuite/gas/arm/arm-it-auto-3.d         |   2 +-
 gas/testsuite/gas/arm/arm-it-auto.d           |   2 +-
 gas/testsuite/gas/arm/arm-it-bad-2.d          |   2 +-
 gas/testsuite/gas/arm/arm-it.d                |   2 +-
 gas/testsuite/gas/arm/armv7e-m+fpv5-d16.d     |   2 +-
 gas/testsuite/gas/arm/armv7e-m+fpv5-sp-d16.d  |   2 +-
 .../gas/arm/armv8-2-fp16-scalar-thumb.d       |   2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-scalar.d   |   2 +-
 .../gas/arm/armv8-2-fp16-simd-thumb.d         |   2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-simd.d     |   2 +-
 gas/testsuite/gas/arm/armv8-a+crypto.d        |   2 +-
 gas/testsuite/gas/arm/armv8-a+fp.d            |   2 +-
 gas/testsuite/gas/arm/armv8-a+ras.d           |   2 +-
 gas/testsuite/gas/arm/armv8-a+rdma-warning.d  |   2 +-
 gas/testsuite/gas/arm/armv8-a+rdma.d          |   2 +-
 gas/testsuite/gas/arm/armv8-a+simd.d          |   2 +-
 gas/testsuite/gas/arm/armv8-a-barrier-thumb.d |   2 +-
 gas/testsuite/gas/arm/armv8-r+fp.d            |   2 +-
 gas/testsuite/gas/arm/armv8-r+simd.d          |   2 +-
 gas/testsuite/gas/arm/armv8-r-barrier-thumb.d |   2 +-
 gas/testsuite/gas/arm/armv8_1-a+simd.d        |   2 +-
 gas/testsuite/gas/arm/armv8_2+rdma.d          |   2 +-
 gas/testsuite/gas/arm/armv8_2-a.d             |   2 +-
 gas/testsuite/gas/arm/armv8_3-a-fp.d          |   2 +-
 gas/testsuite/gas/arm/armv8_3-a-simd.d        |   2 +-
 gas/testsuite/gas/arm/armv8a-automatic-hlt.d  |   2 +-
 gas/testsuite/gas/arm/armv8a-automatic-lda.d  |   2 +-
 gas/testsuite/gas/arm/attr-syntax.d           |   2 +-
 gas/testsuite/gas/arm/automatic-bw.d          |   2 +-
 gas/testsuite/gas/arm/automatic-cbz.d         |   2 +-
 gas/testsuite/gas/arm/automatic-clrex.d       |   2 +-
 gas/testsuite/gas/arm/automatic-lda.d         |   2 +-
 gas/testsuite/gas/arm/automatic-ldaex.d       |   2 +-
 gas/testsuite/gas/arm/automatic-ldaexb.d      |   2 +-
 gas/testsuite/gas/arm/automatic-ldrex.d       |   2 +-
 gas/testsuite/gas/arm/automatic-ldrexd.d      |   2 +-
 gas/testsuite/gas/arm/automatic-movw.d        |   2 +-
 gas/testsuite/gas/arm/automatic-sdiv.d        |   2 +-
 gas/testsuite/gas/arm/automatic-strexb.d      |   2 +-
 gas/testsuite/gas/arm/barrier-bad-thumb.d     |   2 +-
 gas/testsuite/gas/arm/barrier-bad.d           |   2 +-
 gas/testsuite/gas/arm/barrier-thumb.d         |   2 +-
 gas/testsuite/gas/arm/barrier.d               |   2 +-
 gas/testsuite/gas/arm/bignum1.d               |   2 +-
 gas/testsuite/gas/arm/blx-bad.d               |   2 +-
 gas/testsuite/gas/arm/blx-bl-convert.d        |   2 +-
 gas/testsuite/gas/arm/blx-local.s             |   2 +-
 gas/testsuite/gas/arm/crc32-armv8-a-bad.d     |   2 +-
 gas/testsuite/gas/arm/crc32-armv8-a.d         |   2 +-
 gas/testsuite/gas/arm/crc32-armv8-r-bad.d     |   2 +-
 gas/testsuite/gas/arm/crc32-armv8-r.d         |   2 +-
 gas/testsuite/gas/arm/dis-data.d              |   2 +-
 gas/testsuite/gas/arm/dis-data2.d             |   2 +-
 gas/testsuite/gas/arm/dis-data3.d             |   2 +-
 gas/testsuite/gas/arm/eabi_attr_1.d           |   2 +-
 gas/testsuite/gas/arm/fp-save.d               |   2 +-
 .../gas/arm/group-reloc-alu-encoding-bad.d    |   2 +-
 .../gas/arm/group-reloc-alu-parsing-bad.d     |   2 +-
 gas/testsuite/gas/arm/group-reloc-alu.d       |   2 +-
 .../gas/arm/group-reloc-ldc-encoding-bad.d    |   2 +-
 .../gas/arm/group-reloc-ldc-parsing-bad.d     |   2 +-
 gas/testsuite/gas/arm/group-reloc-ldc.d       |   2 +-
 .../gas/arm/group-reloc-ldr-encoding-bad.d    |   2 +-
 .../gas/arm/group-reloc-ldr-parsing-bad.d     |   2 +-
 gas/testsuite/gas/arm/group-reloc-ldr.d       |   2 +-
 .../gas/arm/group-reloc-ldrs-encoding-bad.d   |   2 +-
 .../gas/arm/group-reloc-ldrs-parsing-bad.d    |   2 +-
 gas/testsuite/gas/arm/group-reloc-ldrs.d      |   2 +-
 gas/testsuite/gas/arm/insn-error-a.d          |   2 +-
 gas/testsuite/gas/arm/insn-error-t.d          |   2 +-
 gas/testsuite/gas/arm/inst-po-2.d             |   2 +-
 gas/testsuite/gas/arm/inst-po-3.d             |   2 +-
 gas/testsuite/gas/arm/inst-po-be.d            |   2 +-
 gas/testsuite/gas/arm/inst-po.d               |   2 +-
 gas/testsuite/gas/arm/ldconst.d               |   2 +-
 gas/testsuite/gas/arm/ldgesb-bad.d            |   2 +-
 gas/testsuite/gas/arm/ldgesh-bad.d            |   2 +-
 gas/testsuite/gas/arm/ldst-offset0.d          |   2 +-
 gas/testsuite/gas/arm/local_function.d        |   2 +-
 gas/testsuite/gas/arm/local_label_coff.d      |   2 +-
 gas/testsuite/gas/arm/local_label_elf.d       |   2 +-
 gas/testsuite/gas/arm/mapping.d               |   2 +-
 gas/testsuite/gas/arm/mapping2.d              |   2 +-
 gas/testsuite/gas/arm/mapping3.d              |   2 +-
 gas/testsuite/gas/arm/mapping4.d              |   2 +-
 gas/testsuite/gas/arm/mapshort-elf.d          |   2 +-
 gas/testsuite/gas/arm/mask_1-armv8-a.d        |   2 +-
 gas/testsuite/gas/arm/mask_1-armv8-r.d        |   2 +-
 .../gas/arm/movs-thumb1-reloc-local-armv7-m.d |   2 +-
 .../gas/arm/movs-thumb1-reloc-local.d         |   2 +-
 gas/testsuite/gas/arm/movw-local.d            |   2 +-
 gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d    |   2 +-
 gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d    |   2 +-
 gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d   |   2 +-
 gas/testsuite/gas/arm/msr-imm-bad.d           |   2 +-
 gas/testsuite/gas/arm/msr-reg-bad.d           |   2 +-
 gas/testsuite/gas/arm/msr-reg-thumb.d         |   2 +-
 gas/testsuite/gas/arm/nomapping.d             |   2 +-
 gas/testsuite/gas/arm/nops.d                  |   2 +-
 gas/testsuite/gas/arm/pic.d                   |   2 +-
 gas/testsuite/gas/arm/pinsn.d                 |   2 +-
 gas/testsuite/gas/arm/plt-1.d                 |   2 +-
 gas/testsuite/gas/arm/pr21458.d               |   2 +-
 gas/testsuite/gas/arm/pr9722.d                |   2 +-
 gas/testsuite/gas/arm/strex-t.d               |   2 +-
 gas/testsuite/gas/arm/t2-branch-global.d      |   2 +-
 gas/testsuite/gas/arm/target-reloc-1.d        |   2 +-
 gas/testsuite/gas/arm/thumb-b-bad.d           |   2 +-
 gas/testsuite/gas/arm/thumb-w-bad.d           |   2 +-
 gas/testsuite/gas/arm/thumb-w-good.d          |   2 +-
 gas/testsuite/gas/arm/thumb.d                 |   2 +-
 gas/testsuite/gas/arm/thumb2_it.d             |   1 -
 gas/testsuite/gas/arm/thumb2_it_auto.d        |   1 -
 gas/testsuite/gas/arm/thumb2_it_search.d      |   2 +-
 gas/testsuite/gas/arm/thumb2_ldmstm.d         |   2 -
 .../gas/arm/thumb2_ldr_immediate_armv6.d      |   2 +-
 .../gas/arm/thumb2_ldr_immediate_armv6t2.d    |   2 +-
 .../thumb2_ldr_immediate_highregs_armv6t2.d   |   2 +-
 gas/testsuite/gas/arm/thumb2_pool.d           |   2 +-
 gas/testsuite/gas/arm/thumb2_vpool.d          |   2 +-
 gas/testsuite/gas/arm/thumb2_vpool_be.d       |   2 +-
 gas/testsuite/gas/arm/thumb32.d               |   2 +-
 gas/testsuite/gas/arm/thumbver.d              |   2 +-
 gas/testsuite/gas/arm/tls.d                   |   2 +-
 gas/testsuite/gas/arm/tls_vxworks.d           |   2 +-
 gas/testsuite/gas/arm/undefined.d             |   2 +-
 gas/testsuite/gas/arm/undefined_coff.d        |   2 +-
 gas/testsuite/gas/arm/unwind.d                |   2 +-
 gas/testsuite/gas/arm/v4bx.d                  |   2 +-
 gas/testsuite/gas/arm/vcmp-noprefix-imm.d     |   2 +-
 gas/testsuite/gas/arm/vcvt-bad.d              |   2 +-
 gas/testsuite/gas/arm/vfma1.d                 |   2 +-
 gas/testsuite/gas/arm/vldconst.d              |   2 +-
 gas/testsuite/gas/arm/vldconst_be.d           |   2 +-
 gas/testsuite/gas/arm/vldm-arm.d              |   2 +-
 gas/testsuite/gas/arm/vldr.d                  |   2 +-
 gas/testsuite/gas/arm/weakdef-1.d             |   2 +-
 gas/testsuite/gas/arm/weakdef-2.d             |   2 +-
 ld/ChangeLog                                  |  82 +++
 ld/Makefile.am                                |  20 -
 ld/Makefile.in                                |  25 -
 ld/configure.tgt                              |  10 +-
 ld/emulparams/armaoutb.sh                     |   6 -
 ld/emulparams/armaoutl.sh                     |   6 -
 ld/emulparams/armcoff.sh                      |   6 -
 ld/emulparams/armnbsd.sh                      |   9 -
 ld/emulparams/riscix.sh                       |   5 -
 ld/po/BLD-POTFILES.in                         |   5 -
 ld/scripttempl/armaout.sc                     |  47 --
 ld/scripttempl/armcoff.sc                     |  97 ---
 ld/scripttempl/riscix.sc                      |  47 --
 ld/testsuite/ld-arm/attr-merge-div-00.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-01-m3.d    |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-01.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-02.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-10-m3.d    |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-10.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-11.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-12.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-120.d      |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-20.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-21.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-div-22.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-hardfp-use-1.d |   2 +-
 ld/testsuite/ld-arm/attr-merge-hardfp-use-2.d |   2 +-
 ld/testsuite/ld-arm/attr-merge-nosection-1.d  |   2 +-
 ld/testsuite/ld-arm/attr-merge-unknown-2.d    |   2 +-
 ld/testsuite/ld-arm/attr-merge-unknown-2r.d   |   2 +-
 ld/testsuite/ld-arm/attr-merge-unknown-3.d    |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-1.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-10.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-10r.d      |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-11.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-11r.d      |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-12.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-12r.d      |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-13.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-13r.d      |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-14.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-14r.d      |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-1r.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-2.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-2r.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-3.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-3r.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-4.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-4r.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-5.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-5r.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-6.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-6r.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-7.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-7r.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-8.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-8r.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-9.d        |   2 +-
 ld/testsuite/ld-arm/attr-merge-vfp-9r.d       |   2 +-
 .../ld-arm/attr-merge-wchar-00-nowarn.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-wchar-00.d     |   2 +-
 .../ld-arm/attr-merge-wchar-02-nowarn.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-wchar-02.d     |   2 +-
 .../ld-arm/attr-merge-wchar-04-nowarn.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-wchar-04.d     |   2 +-
 .../ld-arm/attr-merge-wchar-20-nowarn.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-wchar-20.d     |   2 +-
 .../ld-arm/attr-merge-wchar-22-nowarn.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-wchar-22.d     |   2 +-
 .../ld-arm/attr-merge-wchar-24-nowarn.d       |   2 +-
 .../ld-arm/attr-merge-wchar-40-nowarn.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-wchar-40.d     |   2 +-
 .../ld-arm/attr-merge-wchar-42-nowarn.d       |   2 +-
 .../ld-arm/attr-merge-wchar-44-nowarn.d       |   2 +-
 ld/testsuite/ld-arm/attr-merge-wchar-44.d     |   2 +-
 ld/testsuite/ld-arm/eabi-hard-float.d         |   2 +-
 ld/testsuite/ld-arm/eabi-soft-float-ABI4.d    |   2 +-
 ld/testsuite/ld-arm/eabi-soft-float-r.d       |   2 +-
 ld/testsuite/ld-arm/eabi-soft-float.d         |   2 +-
 ld/testsuite/ld-arm/gc-hidden-1.d             |   2 +-
 254 files changed, 489 insertions(+), 1929 deletions(-)
 delete mode 100644 bfd/aout-arm.c
 delete mode 100644 bfd/armnetbsd.c
 delete mode 100644 bfd/riscix.c
 delete mode 100644 gas/config/te-riscix.h
 delete mode 100644 ld/emulparams/armaoutb.sh
 delete mode 100644 ld/emulparams/armaoutl.sh
 delete mode 100644 ld/emulparams/armcoff.sh
 delete mode 100644 ld/emulparams/armnbsd.sh
 delete mode 100644 ld/emulparams/riscix.sh
 delete mode 100644 ld/scripttempl/armaout.sc
 delete mode 100644 ld/scripttempl/armcoff.sc
 delete mode 100644 ld/scripttempl/riscix.sc

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index edd822fefa4..c48036fdedc 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,16 @@
+2018-04-35  Alan Modra  <amodra@gmail.com>
+
+	* 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.
+
 2018-04-24  Nick Clifton  <nickc@redhat.com>
 
 	PR 23113
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 73427cb39f3..4f5610defe8 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -257,14 +257,11 @@ ALL_MACHINES_CFILES = \
 # The .o files needed by all of the 32 bit vectors that are configured into
 # target_vector in targets.c if configured with --enable-targets=all.
 BFD32_BACKENDS = \
-	aout-arm.lo \
 	aout-cris.lo \
 	aout-ns32k.lo \
 	aout-tic30.lo \
 	aout32.lo \
-	armnetbsd.lo \
 	cf-i386lynx.lo \
-	coff-arm.lo \
 	coff-go32.lo \
 	coff-i386.lo \
 	coff-mips.lo \
@@ -384,7 +381,6 @@ BFD32_BACKENDS = \
 	plugin.lo \
 	ppcboot.lo \
 	reloc16.lo \
-	riscix.lo \
 	som.lo \
 	vax1knetbsd.lo \
 	vaxnetbsd.lo \
@@ -397,14 +393,11 @@ BFD32_BACKENDS = \
 	xtensa-modules.lo
 
 BFD32_BACKENDS_CFILES = \
-	aout-arm.c \
 	aout-cris.c \
 	aout-ns32k.c \
 	aout-tic30.c \
 	aout32.c \
-	armnetbsd.c \
 	cf-i386lynx.c \
-	coff-arm.c \
 	coff-go32.c \
 	coff-i386.c \
 	coff-mips.c \
@@ -523,7 +516,6 @@ BFD32_BACKENDS_CFILES = \
 	plugin.c \
 	ppcboot.c \
 	reloc16.c \
-	riscix.c \
 	som.c \
 	vax1knetbsd.c \
 	vaxnetbsd.c \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 05015c42367..3acbdaa2166 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -591,14 +591,11 @@ ALL_MACHINES_CFILES = \
 # The .o files needed by all of the 32 bit vectors that are configured into
 # target_vector in targets.c if configured with --enable-targets=all.
 BFD32_BACKENDS = \
-	aout-arm.lo \
 	aout-cris.lo \
 	aout-ns32k.lo \
 	aout-tic30.lo \
 	aout32.lo \
-	armnetbsd.lo \
 	cf-i386lynx.lo \
-	coff-arm.lo \
 	coff-go32.lo \
 	coff-i386.lo \
 	coff-mips.lo \
@@ -718,7 +715,6 @@ BFD32_BACKENDS = \
 	plugin.lo \
 	ppcboot.lo \
 	reloc16.lo \
-	riscix.lo \
 	som.lo \
 	vax1knetbsd.lo \
 	vaxnetbsd.lo \
@@ -731,14 +727,11 @@ BFD32_BACKENDS = \
 	xtensa-modules.lo
 
 BFD32_BACKENDS_CFILES = \
-	aout-arm.c \
 	aout-cris.c \
 	aout-ns32k.c \
 	aout-tic30.c \
 	aout32.c \
-	armnetbsd.c \
 	cf-i386lynx.c \
-	coff-arm.c \
 	coff-go32.c \
 	coff-i386.c \
 	coff-mips.c \
@@ -857,7 +850,6 @@ BFD32_BACKENDS_CFILES = \
 	plugin.c \
 	ppcboot.c \
 	reloc16.c \
-	riscix.c \
 	som.c \
 	vax1knetbsd.c \
 	vaxnetbsd.c \
@@ -1186,7 +1178,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix386-core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix5ppc-core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-arm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-cris.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-ns32k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-tic30.Plo@am__quote@
@@ -1195,7 +1186,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archive.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archive64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archures.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/armnetbsd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfdio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfdwin.Plo@am__quote@
@@ -1204,7 +1194,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cf-i386lynx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cisco-core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-alpha.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-arm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-bfd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-go32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-i386.Plo@am__quote@
@@ -1458,7 +1447,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppcboot.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc16.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/riscix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rs6000-core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sco5-core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/section.Plo@am__quote@
diff --git a/bfd/aout-arm.c b/bfd/aout-arm.c
deleted file mode 100644
index 211f51f8f3b..00000000000
--- a/bfd/aout-arm.c
+++ /dev/null
@@ -1,574 +0,0 @@
-/* BFD back-end for raw ARM a.out binaries.
-   Copyright (C) 1994-2018 Free Software Foundation, Inc.
-   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-
-/* Avoid multiple definitions from aoutx if supporting standard a.out
-   as well as our own.  */
-/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
-   remove whitespace added here, and thus will fail to concatenate
-   the tokens.  */
-#define NAME(x,y) CONCAT3 (aoutarm,_32_,y)
-
-#define N_TXTADDR(x)						\
-  ((N_MAGIC (x) == NMAGIC)					\
-   ? (bfd_vma) 0x8000						\
-   : ((N_MAGIC (x) != ZMAGIC)					\
-      ? (bfd_vma) 0						\
-      : ((N_SHARED_LIB (x))					\
-	 ? ((x)->a_entry & ~(bfd_vma) (TARGET_PAGE_SIZE - 1))	\
-	 : (bfd_vma) TEXT_START_ADDR)))
-
-#define TEXT_START_ADDR 0x8000
-#define TARGET_PAGE_SIZE 0x8000
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_arm
-
-#define MY(OP) CONCAT2 (arm_aout_,OP)
-#define N_BADMAG(x) ((((x)->a_info & ~007200) != ZMAGIC) && \
-		     (((x)->a_info & ~006000) != OMAGIC) && \
-		     ((x)->a_info != NMAGIC))
-#define N_MAGIC(x) ((x)->a_info & ~07200)
-
-#define MY_bfd_reloc_type_lookup arm_aout_bfd_reloc_type_lookup
-#define MY_bfd_reloc_name_lookup arm_aout_bfd_reloc_name_lookup
-
-#include "libaout.h"
-#include "aout/aout64.h"
-
-
-static bfd_reloc_status_type
-  MY (fix_pcrel_26) (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
-static bfd_reloc_status_type
-  MY (fix_pcrel_26_done) (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
-
-reloc_howto_type MY (howto_table)[] =
-{
-  /* Type rs size bsz pcrel bitpos ovrf sf name part_inpl
-     readmask setmask pcdone.  */
-  HOWTO (0, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, 0, "8", TRUE,
-	 0x000000ff, 0x000000ff, FALSE),
-  HOWTO (1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, 0, "16", TRUE,
-	 0x0000ffff, 0x0000ffff, FALSE),
-  HOWTO (2, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "32", TRUE,
-	 0xffffffff, 0xffffffff, FALSE),
-  HOWTO (3, 2, 2, 26, TRUE, 0, complain_overflow_signed, MY (fix_pcrel_26),
-	 "ARM26", TRUE, 0x00ffffff, 0x00ffffff, TRUE),
-  HOWTO (4, 0, 0, 8, TRUE, 0, complain_overflow_signed, 0, "DISP8", TRUE,
-	 0x000000ff, 0x000000ff, TRUE),
-  HOWTO (5, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "DISP16", TRUE,
-	 0x0000ffff, 0x0000ffff, TRUE),
-  HOWTO (6, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0, "DISP32", TRUE,
-	 0xffffffff, 0xffffffff, TRUE),
-  HOWTO (7, 2, 2, 26, FALSE, 0, complain_overflow_signed,
-	 MY (fix_pcrel_26_done), "ARM26D", TRUE, 0x0, 0x0,
-	 FALSE),
-  EMPTY_HOWTO (-1),
-  HOWTO (9, 0, -1, 16, FALSE, 0, complain_overflow_bitfield, 0, "NEG16", TRUE,
-	 0x0000ffff, 0x0000ffff, FALSE),
-  HOWTO (10, 0, -2, 32, FALSE, 0, complain_overflow_bitfield, 0, "NEG32", TRUE,
-	 0xffffffff, 0xffffffff, FALSE)
-};
-
-#define RELOC_ARM_BITS_NEG_BIG      ((unsigned int) 0x08)
-#define RELOC_ARM_BITS_NEG_LITTLE   ((unsigned int) 0x10)
-
-static reloc_howto_type *
-MY (reloc_howto) (bfd *abfd,
-		  struct reloc_std_external *rel,
-		  int *r_index,
-		  int *r_extern,
-		  int *r_pcrel)
-{
-  unsigned int r_length;
-  unsigned int r_pcrel_done;
-  unsigned int r_neg;
-  int howto_index;
-
-  *r_pcrel = 0;
-  if (bfd_header_big_endian (abfd))
-    {
-      *r_index     =  ((rel->r_index[0] << 16)
-		       | (rel->r_index[1] << 8)
-		       | rel->r_index[2]);
-      *r_extern    = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
-      r_pcrel_done = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
-      r_neg	   = (0 != (rel->r_type[0] & RELOC_ARM_BITS_NEG_BIG));
-      r_length     = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_BIG)
-		      >> RELOC_STD_BITS_LENGTH_SH_BIG);
-    }
-  else
-    {
-      *r_index     = ((rel->r_index[2] << 16)
-		      | (rel->r_index[1] << 8)
-		      | rel->r_index[0]);
-      *r_extern    = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
-      r_pcrel_done = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
-      r_neg	   = (0 != (rel->r_type[0] & RELOC_ARM_BITS_NEG_LITTLE));
-      r_length     = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
-		      >> RELOC_STD_BITS_LENGTH_SH_LITTLE);
-    }
-  howto_index = r_length + 4 * r_pcrel_done + 8 * r_neg;
-  if (howto_index == 3)
-    *r_pcrel = 1;
-
-  return MY (howto_table) + howto_index;
-}
-
-#define MY_reloc_howto(BFD, REL, IN, EX, PC) \
-	MY (reloc_howto) (BFD, REL, &IN, &EX, &PC)
-
-static void
-MY (put_reloc) (bfd *abfd,
-		int r_extern,
-		int r_index,
-		bfd_vma value,
-		reloc_howto_type *howto,
-		struct reloc_std_external *reloc)
-{
-  unsigned int r_length;
-  int r_pcrel;
-  int r_neg;
-
-  PUT_WORD (abfd, value, reloc->r_address);
-  /* Size as a power of two.  */
-  r_length = howto->size;
-
-  /* Special case for branch relocations.  */
-  if (howto->type == 3 || howto->type == 7)
-    r_length = 3;
-
-  r_pcrel  = howto->type & 4;	/* PC Relative done?  */
-  r_neg = howto->type & 8;	/* Negative relocation.  */
-
-  if (bfd_header_big_endian (abfd))
-    {
-      reloc->r_index[0] = r_index >> 16;
-      reloc->r_index[1] = r_index >> 8;
-      reloc->r_index[2] = r_index;
-      reloc->r_type[0] =
-	((r_extern ?     RELOC_STD_BITS_EXTERN_BIG : 0)
-	 | (r_pcrel ?    RELOC_STD_BITS_PCREL_BIG : 0)
-	 | (r_neg ?	 RELOC_ARM_BITS_NEG_BIG : 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
-    }
-  else
-    {
-      reloc->r_index[2] = r_index >> 16;
-      reloc->r_index[1] = r_index >> 8;
-      reloc->r_index[0] = r_index;
-      reloc->r_type[0] =
-	((r_extern ?     RELOC_STD_BITS_EXTERN_LITTLE : 0)
-	 | (r_pcrel ?    RELOC_STD_BITS_PCREL_LITTLE : 0)
-	 | (r_neg ?	 RELOC_ARM_BITS_NEG_LITTLE : 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
-    }
-}
-
-#define MY_put_reloc(BFD, EXT, IDX, VAL, HOWTO, RELOC) \
-  MY (put_reloc) (BFD, EXT, IDX, VAL, HOWTO, RELOC)
-
-static void
-MY (relocatable_reloc) (reloc_howto_type *howto,
-			bfd *abfd,
-			struct reloc_std_external *reloc,
-			bfd_vma *amount,
-			bfd_vma r_addr)
-{
-  if (howto->type == 3)
-    {
-      if (reloc->r_type[0]
-	  & (bfd_header_big_endian (abfd)
-	     ? RELOC_STD_BITS_EXTERN_BIG : RELOC_STD_BITS_EXTERN_LITTLE))
-	/* The reloc is still external, so don't modify anything.  */
-	*amount = 0;
-      else
-	{
-	  *amount -= r_addr;
-	  /* Change the r_pcrel value -- on the ARM, this bit is set once the
-	     relocation is done.  */
-	  if (bfd_header_big_endian (abfd))
-	    reloc->r_type[0] |= RELOC_STD_BITS_PCREL_BIG;
-	  else
-	    reloc->r_type[0] |= RELOC_STD_BITS_PCREL_LITTLE;
-	}
-    }
-  else if (howto->type == 7)
-    *amount = 0;
-}
-
-#define MY_relocatable_reloc(HOW, BFD, REL, AMOUNT, ADDR) \
-  MY (relocatable_reloc) (HOW, BFD, REL, &(AMOUNT), ADDR)
-
-static bfd_reloc_status_type
-MY (fix_pcrel_26_done) (bfd *abfd ATTRIBUTE_UNUSED,
-			arelent *reloc_entry ATTRIBUTE_UNUSED,
-			asymbol *symbol ATTRIBUTE_UNUSED,
-			void * data ATTRIBUTE_UNUSED,
-			asection *input_section ATTRIBUTE_UNUSED,
-			bfd *output_bfd ATTRIBUTE_UNUSED,
-			char **error_message ATTRIBUTE_UNUSED)
-{
-  /* This is dead simple at present.  */
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-MY (fix_pcrel_26) (bfd *abfd,
-		   arelent *reloc_entry,
-		   asymbol *symbol,
-		   void * data,
-		   asection *input_section,
-		   bfd *output_bfd,
-		   char **error_message ATTRIBUTE_UNUSED)
-{
-  bfd_vma relocation;
-  bfd_size_type addr = reloc_entry->address;
-  bfd_vma target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-
-  /* If this is an undefined symbol, return error.  */
-  if (bfd_is_und_section (symbol->section)
-      && (symbol->flags & BSF_WEAK) == 0)
-    return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined;
-
-  /* If the sections are different, and we are doing a partial relocation,
-     just ignore it for now.  */
-  if (symbol->section->name != input_section->name
-      && output_bfd != NULL)
-    return bfd_reloc_ok;
-
-  relocation = (target & 0x00ffffff) << 2;
-  relocation = (relocation ^ 0x02000000) - 0x02000000; /* Sign extend.  */
-  relocation += symbol->value;
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-  relocation -= input_section->output_section->vma;
-  relocation -= input_section->output_offset;
-  relocation -= addr;
-  if (relocation & 3)
-    return bfd_reloc_overflow;
-
-  /* Check for overflow.  */
-  if (relocation & 0x02000000)
-    {
-      if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
-	flag = bfd_reloc_overflow;
-    }
-  else if (relocation & ~ (bfd_vma) 0x03ffffff)
-    flag = bfd_reloc_overflow;
-
-  target &= ~ (bfd_vma) 0x00ffffff;
-  target |= (relocation >> 2) & 0x00ffffff;
-  bfd_put_32 (abfd, target, (bfd_byte *) data + addr);
-
-  /* Now the ARM magic... Change the reloc type so that it is marked as done.
-     Strictly this is only necessary if we are doing a partial relocation.  */
-  reloc_entry->howto = &MY (howto_table)[7];
-
-  return flag;
-}
-
-static reloc_howto_type *
-MY (bfd_reloc_type_lookup) (bfd *abfd,
-			    bfd_reloc_code_real_type code)
-{
-#define ASTD(i,j)       case i: return & MY (howto_table)[j]
-
-  if (code == BFD_RELOC_CTOR)
-    switch (bfd_arch_bits_per_address (abfd))
-      {
-      case 32:
-	code = BFD_RELOC_32;
-	break;
-      default:
-	return NULL;
-      }
-
-  switch (code)
-    {
-      ASTD (BFD_RELOC_16, 1);
-      ASTD (BFD_RELOC_32, 2);
-      ASTD (BFD_RELOC_ARM_PCREL_BRANCH, 3);
-      ASTD (BFD_RELOC_8_PCREL, 4);
-      ASTD (BFD_RELOC_16_PCREL, 5);
-      ASTD (BFD_RELOC_32_PCREL, 6);
-    default:
-      return NULL;
-    }
-}
-
-static reloc_howto_type *
-MY (bfd_reloc_name_lookup) (bfd *abfd ATTRIBUTE_UNUSED,
-			    const char *r_name)
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (MY (howto_table)) / sizeof (MY (howto_table)[0]);
-       i++)
-    if (MY (howto_table)[i].name != NULL
-	&& strcasecmp (MY (howto_table)[i].name, r_name) == 0)
-      return &MY (howto_table)[i];
-
-  return NULL;
-}
-
-#define MY_swap_std_reloc_in     MY (swap_std_reloc_in)
-#define MY_swap_std_reloc_out    MY (swap_std_reloc_out)
-#define MY_get_section_contents  _bfd_generic_get_section_contents
-
-void MY_swap_std_reloc_in (bfd *, struct reloc_std_external *, arelent *, asymbol **, bfd_size_type);
-void MY_swap_std_reloc_out (bfd *, arelent *, struct reloc_std_external *);
-
-#include "aoutx.h"
-
-void
-MY_swap_std_reloc_in (bfd *abfd,
-		      struct reloc_std_external *bytes,
-		      arelent *cache_ptr,
-		      asymbol **symbols,
-		      bfd_size_type symcount ATTRIBUTE_UNUSED)
-{
-  int r_index;
-  int r_extern;
-  int r_pcrel;
-  struct aoutdata *su = &(abfd->tdata.aout_data->a);
-
-  cache_ptr->address = H_GET_32 (abfd, bytes->r_address);
-
-  cache_ptr->howto = MY_reloc_howto (abfd, bytes, r_index, r_extern, r_pcrel);
-
-  MOVE_ADDRESS (0);
-}
-
-void
-MY_swap_std_reloc_out (bfd *abfd,
-		       arelent *g,
-		       struct reloc_std_external *natptr)
-{
-  int r_index;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  int r_extern;
-  int r_length;
-  int r_pcrel;
-  int r_neg = 0;	/* Negative relocs use the BASEREL bit.  */
-  asection *output_section = sym->section->output_section;
-
-  PUT_WORD (abfd, g->address, natptr->r_address);
-
-  r_length = g->howto->size ;   /* Size as a power of two.  */
-  if (r_length < 0)
-    {
-      r_length = -r_length;
-      r_neg = 1;
-    }
-
-  r_pcrel  = (int) g->howto->pc_relative; /* Relative to PC?  */
-
-  /* For RISC iX, in pc-relative relocs the r_pcrel bit means that the
-     relocation has been done already (Only for the 26-bit one I think).  */
-  if (g->howto->type == 3)
-    {
-      r_length = 3;
-      r_pcrel = 0;
-    }
-  else if (g->howto->type == 7)
-    {
-      r_length = 3;
-      r_pcrel = 1;
-    }
-
-  /* Name was clobbered by aout_write_syms to be symbol index.  */
-
-  /* If this relocation is relative to a symbol then set the
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     check for that here.  */
-
-  if (bfd_is_com_section (output_section)
-      || bfd_is_abs_section (output_section)
-      || bfd_is_und_section (output_section))
-    {
-      if (bfd_abs_section_ptr->symbol == sym)
-	{
-	  /* Whoops, looked like an abs symbol, but is really an offset
-	     from the abs section.  */
-	  r_index = 0;
-	  r_extern = 0;
-	}
-      else
-	{
-	  /* Fill in symbol.  */
-	  r_extern = 1;
-	  r_index = (*(g->sym_ptr_ptr))->KEEPIT;
-	}
-    }
-  else
-    {
-      /* Just an ordinary section.  */
-      r_extern = 0;
-      r_index  = output_section->target_index;
-    }
-
-  /* Now the fun stuff.  */
-  if (bfd_header_big_endian (abfd))
-    {
-      natptr->r_index[0] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[2] = r_index;
-      natptr->r_type[0] =
-	(  (r_extern ?   RELOC_STD_BITS_EXTERN_BIG: 0)
-	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_BIG: 0)
-	 | (r_neg    ?   RELOC_ARM_BITS_NEG_BIG: 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
-    }
-  else
-    {
-      natptr->r_index[2] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[0] = r_index;
-      natptr->r_type[0] =
-	(  (r_extern ?   RELOC_STD_BITS_EXTERN_LITTLE: 0)
-	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_LITTLE: 0)
-	 | (r_neg    ?   RELOC_ARM_BITS_NEG_LITTLE: 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
-    }
-}
-
-#define MY_BFD_TARGET
-
-#include "aout-target.h"
-
-extern const bfd_target arm_aout_be_vec;
-
-const bfd_target arm_aout_le_vec =
-{
-  "a.out-arm-little",		/* Name.  */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_LITTLE,		/* Target byte order (little).  */
-  BFD_ENDIAN_LITTLE,		/* Target headers byte order (little).  */
-  (HAS_RELOC | EXEC_P |		/* Object flags.  */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  MY_symbol_leading_char,
-  AR_PAD_CHAR,			/* AR_pad_char.  */
-  15,				/* AR_max_namelen.  */
-  0,				/* match priority.  */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* Data.  */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* Headers.  */
-
-  {				/* bfd_check_format.  */
-    _bfd_dummy_target,
-    MY_object_p,
-    bfd_generic_archive_p,
-    MY_core_file_p
-  },
-  {				/* bfd_set_format.  */
-    _bfd_bool_bfd_false_error,
-    MY_mkobject,
-    _bfd_generic_mkarchive,
-    _bfd_bool_bfd_false_error
-  },
-  {				/* bfd_write_contents.  */
-    _bfd_bool_bfd_false_error,
-    MY_write_object_contents,
-    _bfd_write_archive_contents,
-    _bfd_bool_bfd_false_error
-  },
-
-  BFD_JUMP_TABLE_GENERIC (MY),
-  BFD_JUMP_TABLE_COPY (MY),
-  BFD_JUMP_TABLE_CORE (MY),
-  BFD_JUMP_TABLE_ARCHIVE (MY),
-  BFD_JUMP_TABLE_SYMBOLS (MY),
-  BFD_JUMP_TABLE_RELOCS (MY),
-  BFD_JUMP_TABLE_WRITE (MY),
-  BFD_JUMP_TABLE_LINK (MY),
-  BFD_JUMP_TABLE_DYNAMIC (MY),
-
-  & arm_aout_be_vec,
-
-  (void *) MY_backend_data,
-};
-
-const bfd_target arm_aout_be_vec =
-{
-  "a.out-arm-big",		/* Name.  */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_BIG,		/* Target byte order (big).  */
-  BFD_ENDIAN_BIG,		/* Target headers byte order (big).  */
-  (HAS_RELOC | EXEC_P |		/* Object flags.  */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  MY_symbol_leading_char,
-  AR_PAD_CHAR,			/* AR_pad_char.  */
-  15,				/* AR_max_namelen.  */
-  0,				/* match priority.  */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
-
-  {				/* bfd_check_format.  */
-    _bfd_dummy_target,
-    MY_object_p,
-    bfd_generic_archive_p,
-    MY_core_file_p
-  },
-  {				/* bfd_set_format.  */
-    _bfd_bool_bfd_false_error,
-    MY_mkobject,
-    _bfd_generic_mkarchive,
-    _bfd_bool_bfd_false_error
-  },
-  {				/* bfd_write_contents.  */
-    _bfd_bool_bfd_false_error,
-    MY_write_object_contents,
-    _bfd_write_archive_contents,
-    _bfd_bool_bfd_false_error
-  },
-
-  BFD_JUMP_TABLE_GENERIC (MY),
-  BFD_JUMP_TABLE_COPY (MY),
-  BFD_JUMP_TABLE_CORE (MY),
-  BFD_JUMP_TABLE_ARCHIVE (MY),
-  BFD_JUMP_TABLE_SYMBOLS (MY),
-  BFD_JUMP_TABLE_RELOCS (MY),
-  BFD_JUMP_TABLE_WRITE (MY),
-  BFD_JUMP_TABLE_LINK (MY),
-  BFD_JUMP_TABLE_DYNAMIC (MY),
-
-  & arm_aout_le_vec,
-
-  (void *) MY_backend_data,
-};
diff --git a/bfd/armnetbsd.c b/bfd/armnetbsd.c
deleted file mode 100644
index f5560e7eea6..00000000000
--- a/bfd/armnetbsd.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* BFD back-end for NetBSD/ARM a.out-ish binaries.
-   Copyright (C) 1999-2018 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-#define	BYTES_IN_WORD		4
-#undef TARGET_IS_BIG_ENDIAN_P
-
-#define	TARGET_PAGE_SIZE	4096
-#define	SEGMENT_SIZE		TARGET_PAGE_SIZE
-
-#define	DEFAULT_ARCH		bfd_arch_arm
-#define	DEFAULT_MID		M_ARM6_NETBSD
-/*#define MACHTYPE_OK(mtype) ((mtype) == M_ARM6_NETBSD)*/
-
-/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
-   remove whitespace added here, and thus will fail to concatenate
-   the tokens.  */
-#define MY(OP)			CONCAT2 (arm_aout_nbsd_, OP)
-
-/* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME		"a.out-arm-netbsd"
-
-#include "netbsd.h"
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 0c037fc07b9..24f6573af24 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -53,8 +53,6 @@ case $targ in
     echo "*** Use or1k-*-elf or or1k-*-linux as the target instead" >&2
     exit 1
     ;;
- arm*-*-aout | \
- arm*-*-coff | \
  powerpc-*-lynxos* | powerpc-*-windiss* | \
  null)
     if test "x$enable_obsolete" != xyes; then
@@ -80,7 +78,12 @@ case $targ in
  *-*-rtemsaout* | \
  *-*-rtemscoff* | \
  a29k-* | \
+ arm*-*-aout | \
+ arm-*-coff | \
+ arm-*-netbsd* | \
+ arm-*-openbsd* | \
  arm-*-oabi | \
+ arm-*-riscix* | \
  arm-epoc-pe* | \
  h8300*-*-coff | \
  h8500*-*-coff | \
@@ -347,25 +350,17 @@ case "${targ}" in
     ;;
   armeb-*-netbsdelf*)
     targ_defvec=arm_elf32_be_vec
-    targ_selvecs="arm_elf32_le_vec arm_aout_nbsd_vec"
+    targ_selvecs="arm_elf32_le_vec"
     ;;
   arm-*-netbsdelf*)
     targ_defvec=arm_elf32_le_vec
-    targ_selvecs="arm_elf32_be_vec arm_aout_nbsd_vec"
-    ;;
-  arm-*-netbsd* | arm-*-openbsd*)
-    targ_defvec=arm_aout_nbsd_vec
-    targ_selvecs="arm_elf32_le_vec arm_elf32_be_vec"
-    targ_underscore=yes
+    targ_selvecs="arm_elf32_be_vec"
     ;;
   arm-*-nto* | nto*arm*)
     targ_defvec=arm_elf32_le_vec
     targ_selvecs=arm_elf32_be_vec
     targ_cflags=-D__QNXTARGET__
     ;;
-  arm-*-riscix*)
-    targ_defvec=arm_aout_riscix_vec
-    ;;
   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
     targ_defvec=arm_pe_wince_le_vec
     targ_selvecs="arm_pe_wince_le_vec arm_pe_wince_be_vec arm_pei_wince_le_vec arm_pei_wince_be_vec"
@@ -377,19 +372,6 @@ case "${targ}" in
     targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
     targ_underscore=yes
     ;;
-  arm-*-aout | armel-*-aout)
-    targ_defvec=arm_aout_le_vec
-    targ_selvecs=arm_aout_be_vec
-    ;;
-  armeb-*-aout)
-    targ_defvec=arm_aout_be_vec
-    targ_selvecs=arm_aout_le_vec
-    ;;
-  arm-*-coff)
-    targ_defvec=arm_coff_le_vec
-    targ_selvecs=arm_coff_be_vec
-    targ_underscore=yes
-    ;;
   arm-*-phoenix*)
     targ_defvec=arm_elf32_le_vec
     targ_selvecs=arm_elf32_be_vec
diff --git a/bfd/configure b/bfd/configure
index f7356457f91..c23dd195437 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14345,12 +14345,6 @@ do
     aout_vec)			 tb="$tb host-aout.lo aout32.lo" ;;
     arc_elf32_be_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
     arc_elf32_le_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    arm_aout_be_vec)		 tb="$tb aout-arm.lo aout32.lo" ;;
-    arm_aout_le_vec)		 tb="$tb aout-arm.lo aout32.lo" ;;
-    arm_aout_nbsd_vec)		 tb="$tb armnetbsd.lo aout32.lo" ;;
-    arm_aout_riscix_vec)	 tb="$tb aout32.lo riscix.lo" ;;
-    arm_coff_be_vec)		 tb="$tb coff-arm.lo $coff" ;;
-    arm_coff_le_vec)		 tb="$tb coff-arm.lo $coff" ;;
     arm_elf32_be_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
     arm_elf32_le_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
     arm_elf32_nacl_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
diff --git a/bfd/configure.ac b/bfd/configure.ac
index 3b32d693d79..7bcbb167a49 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -422,12 +422,6 @@ do
     aout_vec)			 tb="$tb host-aout.lo aout32.lo" ;;
     arc_elf32_be_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
     arc_elf32_le_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    arm_aout_be_vec)		 tb="$tb aout-arm.lo aout32.lo" ;;
-    arm_aout_le_vec)		 tb="$tb aout-arm.lo aout32.lo" ;;
-    arm_aout_nbsd_vec)		 tb="$tb armnetbsd.lo aout32.lo" ;;
-    arm_aout_riscix_vec)	 tb="$tb aout32.lo riscix.lo" ;;
-    arm_coff_be_vec)		 tb="$tb coff-arm.lo $coff" ;;
-    arm_coff_le_vec)		 tb="$tb coff-arm.lo $coff" ;;
     arm_elf32_be_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
     arm_elf32_le_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
     arm_elf32_nacl_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index 493a787b1fd..27139e5562f 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -1,6 +1,5 @@
 aix386-core.c
 aix5ppc-core.c
-aout-arm.c
 aout-cris.c
 aout-ns32k.c
 aout-target.h
@@ -11,7 +10,6 @@ aoutx.h
 archive.c
 archive64.c
 archures.c
-armnetbsd.c
 bfd.c
 bfdio.c
 bfdwin.c
@@ -20,7 +18,6 @@ cache.c
 cf-i386lynx.c
 cisco-core.c
 coff-alpha.c
-coff-arm.c
 coff-bfd.c
 coff-go32.c
 coff-i386.c
@@ -291,7 +288,6 @@ plugin.c
 ppcboot.c
 reloc.c
 reloc16.c
-riscix.c
 rs6000-core.c
 sco5-core.c
 section.c
diff --git a/bfd/riscix.c b/bfd/riscix.c
deleted file mode 100644
index 16e61aca065..00000000000
--- a/bfd/riscix.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/* BFD back-end for RISC iX (Acorn, arm) binaries.
-   Copyright (C) 1994-2018 Free Software Foundation, Inc.
-   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-
-/* RISC iX overloads the MAGIC field to indicate more than just the usual
-   [ZNO]MAGIC values.  Also included are squeezing information and
-   shared library usage.  */
-
-/* The following come from the man page.  */
-#define SHLIBLEN 60
-
-#define MF_IMPURE	00200
-#define MF_SQUEEZED	01000
-#define MF_USES_SL	02000
-#define MF_IS_SL	04000
-
-/* Common combinations.  */
-
-/* Demand load (impure text).  */
-#define IMAGIC		(MF_IMPURE | ZMAGIC)
-
-/* OMAGIC with large header.
-   May contain a ref to a shared lib required by the object.  */
-#define SPOMAGIC	(MF_USES_SL | OMAGIC)
-
-/* A reference to a shared library.
-   The text portion of the object contains "overflow text" from
-   the shared library to be linked in with an object.  */
-#define SLOMAGIC	(MF_IS_SL | OMAGIC)
-
-/* Sqeezed demand paged.
-   NOTE: This interpretation of QMAGIC seems to be at variance
-   with that used on other architectures.  */
-#define QMAGIC		(MF_SQUEEZED | ZMAGIC)
-
-/* Program which uses sl.  */
-#define SPZMAGIC	(MF_USES_SL | ZMAGIC)
-
-/* Sqeezed ditto.  */
-#define SPQMAGIC	(MF_USES_SL | QMAGIC)
-
-/* Shared lib part of prog.  */
-#define SLZMAGIC	(MF_IS_SL | ZMAGIC)
-
-/* Sl which uses another.  */
-#define SLPZMAGIC	(MF_USES_SL | SLZMAGIC)
-
-#define N_SHARED_LIB(x) ((x)->a_info & MF_USES_SL)
-
-/* Only a pure OMAGIC file has the minimal header.  */
-#define N_TXTOFF(x)		\
- ((x)->a_info == OMAGIC		\
-  ? 32				\
-  : (N_MAGIC(x) == ZMAGIC	\
-     ? TARGET_PAGE_SIZE		\
-     : 999))
-
-#define N_TXTADDR(x)							     \
-  (N_MAGIC(x) != ZMAGIC							     \
-   ? (bfd_vma) 0 /* object file or NMAGIC */				     \
-   /* Programs with shared libs are loaded at the first page after all the   \
-      text segments of the shared library programs.  Without looking this    \
-      up we can't know exactly what the address will be.  A reasonable guess \
-      is that a_entry will be in the first page of the executable.  */	     \
-   : (N_SHARED_LIB(x)							     \
-      ? ((x)->a_entry & ~(bfd_vma) (TARGET_PAGE_SIZE - 1))		     \
-      : (bfd_vma) TEXT_START_ADDR))
-
-#define N_SYMOFF(x) \
-  (N_TXTOFF (x) + (x)->a_text + (x)->a_data + (x)->a_trsize + (x)->a_drsize)
-
-#define N_STROFF(x) (N_SYMOFF (x) + (x)->a_syms)
-
-#define TEXT_START_ADDR   32768
-#define TARGET_PAGE_SIZE  32768
-#define SEGMENT_SIZE      TARGET_PAGE_SIZE
-#define DEFAULT_ARCH      bfd_arch_arm
-
-/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
-   remove whitespace added here, and thus will fail to concatenate
-   the tokens.  */
-#define MY(OP) CONCAT2 (arm_aout_riscix_,OP)
-#define TARGETNAME "a.out-riscix"
-#define N_BADMAG(x) ((((x)->a_info & ~007200) != ZMAGIC) \
-		  && (((x)->a_info & ~006000) != OMAGIC) \
-		  && ((x)->a_info != NMAGIC))
-#define N_MAGIC(x) ((x)->a_info & ~07200)
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-
-#define WRITE_HEADERS(abfd, execp)					    \
-  {									    \
-    if (adata (abfd).magic == undecided_magic)				    \
-      NAME (aout, adjust_sizes_and_vmas) (abfd);			    \
-									    \
-    execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	    \
-    execp->a_entry = bfd_get_start_address (abfd);			    \
-									    \
-    execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		    \
-		       obj_reloc_entry_size (abfd));			    \
-    execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		    \
-		       obj_reloc_entry_size (abfd));			    \
-    NAME (aout, swap_exec_header_out) (abfd, execp, & exec_bytes);	    \
-									    \
-    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0			    \
-	|| bfd_bwrite ((void *) & exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,  \
-		      abfd) != EXEC_BYTES_SIZE)				    \
-      return FALSE;							    \
-    /* Now write out reloc info, followed by syms and strings.  */	    \
-									    \
-    if (bfd_get_outsymbols (abfd) != NULL				    \
-	&& bfd_get_symcount (abfd) != 0)				    \
-      {									    \
-	if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (execp)), SEEK_SET) != 0)  \
-	  return FALSE;							    \
-									    \
-	if (! NAME (aout, write_syms) (abfd))				    \
-	  return FALSE;							    \
-									    \
-	if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (execp)), SEEK_SET) != 0) \
-	  return FALSE;							    \
-									    \
-	if (! riscix_squirt_out_relocs (abfd, obj_textsec (abfd)))	    \
-	  return FALSE;							    \
-	if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (execp)), SEEK_SET) != 0) \
-	  return FALSE;							    \
-									    \
-	if (!NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd)))	    \
-	  return FALSE;							    \
-      }									    \
-  }
-
-#include "libaout.h"
-#include "aout/aout64.h"
-
-static bfd_reloc_status_type
-riscix_fix_pcrel_26_done (bfd *abfd ATTRIBUTE_UNUSED,
-			  arelent *reloc_entry ATTRIBUTE_UNUSED,
-			  asymbol *symbol ATTRIBUTE_UNUSED,
-			  void * data ATTRIBUTE_UNUSED,
-			  asection *input_section ATTRIBUTE_UNUSED,
-			  bfd *output_bfd ATTRIBUTE_UNUSED,
-			  char **error_message ATTRIBUTE_UNUSED)
-{
-  /* This is dead simple at present.  */
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type riscix_fix_pcrel_26 (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
-static const bfd_target *arm_aout_riscix_callback (bfd *);
-
-static reloc_howto_type riscix_std_reloc_howto[] =
-{
-  /* Type	       rs size bsz  pcrel bitpos ovrf			  sf name     part_inpl readmask  setmask    pcdone */
-  HOWTO( 0,		 0,  0,	  8,  FALSE, 0, complain_overflow_bitfield,0,"8",	  TRUE, 0x000000ff,0x000000ff, FALSE),
-  HOWTO( 1,		 0,  1,	  16, FALSE, 0, complain_overflow_bitfield,0,"16",	  TRUE, 0x0000ffff,0x0000ffff, FALSE),
-  HOWTO( 2,		 0,  2,	  32, FALSE, 0, complain_overflow_bitfield,0,"32",	  TRUE, 0xffffffff,0xffffffff, FALSE),
-  HOWTO( 3,		 2,  3,	  26, TRUE,  0, complain_overflow_signed,  riscix_fix_pcrel_26 , "ARM26",      TRUE, 0x00ffffff,0x00ffffff, FALSE),
-  HOWTO( 4,		 0,  0,	  8,  TRUE,  0, complain_overflow_signed,  0,"DISP8",	  TRUE, 0x000000ff,0x000000ff, TRUE),
-  HOWTO( 5,		 0,  1,	  16, TRUE,  0, complain_overflow_signed,  0,"DISP16",	  TRUE, 0x0000ffff,0x0000ffff, TRUE),
-  HOWTO( 6,		 0,  2,	  32, TRUE,  0, complain_overflow_signed,  0,"DISP32",	  TRUE, 0xffffffff,0xffffffff, TRUE),
-  HOWTO( 7,		 2,  3,	  26, FALSE, 0, complain_overflow_signed,  riscix_fix_pcrel_26_done, "ARM26D",TRUE,0x00ffffff,0x00ffffff, FALSE),
-  EMPTY_HOWTO (-1),
-  HOWTO( 9,		 0, -1,	  16, FALSE, 0, complain_overflow_bitfield,0,"NEG16",	  TRUE, 0x0000ffff,0x0000ffff, FALSE),
-  HOWTO( 10,		  0, -2,  32, FALSE, 0, complain_overflow_bitfield,0,"NEG32",	  TRUE, 0xffffffff,0xffffffff, FALSE)
-};
-
-#define RISCIX_TABLE_SIZE \
-  (sizeof (riscix_std_reloc_howto) / sizeof (reloc_howto_type))
-
-static bfd_reloc_status_type
-riscix_fix_pcrel_26 (bfd *abfd,
-		     arelent *reloc_entry,
-		     asymbol *symbol,
-		     void * data,
-		     asection *input_section,
-		     bfd *output_bfd,
-		     char **error_message ATTRIBUTE_UNUSED)
-{
-  bfd_vma relocation;
-  bfd_size_type addr = reloc_entry->address;
-  long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-
-  /* If this is an undefined symbol, return error.  */
-  if (bfd_is_und_section (symbol->section)
-      && (symbol->flags & BSF_WEAK) == 0)
-    return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
-
-  /* If the sections are different, and we are doing a partial relocation,
-     just ignore it for now.  */
-  if (symbol->section->name != input_section->name
-      && output_bfd != NULL)
-    return bfd_reloc_continue;
-
-  relocation = (target & 0x00ffffff) << 2;
-  relocation = (relocation ^ 0x02000000) - 0x02000000; /* Sign extend.  */
-  relocation += symbol->value;
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-  relocation -= input_section->output_section->vma;
-  relocation -= input_section->output_offset;
-  relocation -= addr;
-  if (relocation & 3)
-    return bfd_reloc_overflow;
-
-  /* Check for overflow.  */
-  if (relocation & 0x02000000)
-    {
-      if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
-	flag = bfd_reloc_overflow;
-    }
-  else if (relocation & ~ (bfd_vma) 0x03ffffff)
-    flag = bfd_reloc_overflow;
-
-  target &= ~0x00ffffff;
-  target |= (relocation >> 2) & 0x00ffffff;
-  bfd_put_32 (abfd, (bfd_vma) target, (bfd_byte *) data + addr);
-
-  /* Now the ARM magic... Change the reloc type so that it is marked as done.
-     Strictly this is only necessary if we are doing a partial relocation.  */
-  reloc_entry->howto = &riscix_std_reloc_howto[7];
-
-  return flag;
-}
-
-static reloc_howto_type *
-riscix_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)
-{
-#define ASTD(i,j)       case i: return &riscix_std_reloc_howto[j]
-  if (code == BFD_RELOC_CTOR)
-    switch (bfd_arch_bits_per_address (abfd))
-      {
-      case 32:
-	code = BFD_RELOC_32;
-	break;
-      default:
-	return NULL;
-      }
-
-  switch (code)
-    {
-      ASTD (BFD_RELOC_16, 1);
-      ASTD (BFD_RELOC_32, 2);
-      ASTD (BFD_RELOC_ARM_PCREL_BRANCH, 3);
-      ASTD (BFD_RELOC_8_PCREL, 4);
-      ASTD (BFD_RELOC_16_PCREL, 5);
-      ASTD (BFD_RELOC_32_PCREL, 6);
-    default:
-      return NULL;
-    }
-}
-
-static reloc_howto_type *
-riscix_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-			  const char *r_name)
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (riscix_std_reloc_howto) / sizeof (riscix_std_reloc_howto[0]);
-       i++)
-    if (riscix_std_reloc_howto[i].name != NULL
-	&& strcasecmp (riscix_std_reloc_howto[i].name, r_name) == 0)
-      return &riscix_std_reloc_howto[i];
-
-  return NULL;
-}
-
-#define MY_bfd_link_hash_table_create  _bfd_generic_link_hash_table_create
-#define MY_bfd_link_add_symbols	       _bfd_generic_link_add_symbols
-#define MY_final_link_callback	       should_not_be_used
-#define MY_bfd_final_link	       _bfd_generic_final_link
-
-#define MY_bfd_reloc_type_lookup       riscix_reloc_type_lookup
-#define MY_bfd_reloc_name_lookup       riscix_reloc_name_lookup
-#define MY_canonicalize_reloc	       arm_aout_riscix_canonicalize_reloc
-#define MY_object_p		       arm_aout_riscix_object_p
-
-static void
-riscix_swap_std_reloc_out (bfd *abfd,
-			   arelent *g,
-			   struct reloc_std_external *natptr)
-{
-  int r_index;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  int r_extern;
-  int r_length;
-  int r_pcrel;
-  int r_neg = 0;	/* Negative relocs use the BASEREL bit.  */
-  asection *output_section = sym->section->output_section;
-
-  PUT_WORD(abfd, g->address, natptr->r_address);
-
-  r_length = g->howto->size ;   /* Size as a power of two.  */
-  if (r_length < 0)
-    {
-      r_length = -r_length;
-      r_neg = 1;
-    }
-
-  r_pcrel  = (int) g->howto->pc_relative; /* Relative to PC?  */
-
-  /* For RISC iX, in pc-relative relocs the r_pcrel bit means that the
-     relocation has been done already (Only for the 26-bit one I think)?  */
-  if (r_length == 3)
-    r_pcrel = r_pcrel ? 0 : 1;
-
-  /* Name was clobbered by aout_write_syms to be symbol index.  */
-
-  /* If this relocation is relative to a symbol then set the
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     check for that here.  */
-
-  if (bfd_is_com_section (output_section)
-      || bfd_is_abs_section (output_section)
-      || bfd_is_und_section (output_section))
-    {
-      if (bfd_abs_section_ptr->symbol == sym)
-	{
-	  /* Whoops, looked like an abs symbol, but is really an offset
-	     from the abs section.  */
-	  r_index = 0;
-	  r_extern = 0;
-	}
-      else
-	{
-	  /* Fill in symbol.  */
-	  r_extern = 1;
-	  r_index = (*g->sym_ptr_ptr)->udata.i;
-	}
-    }
-  else
-    {
-      /* Just an ordinary section.  */
-      r_extern = 0;
-      r_index  = output_section->target_index;
-    }
-
-  /* Now the fun stuff.  */
-  if (bfd_header_big_endian (abfd))
-    {
-      natptr->r_index[0] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[2] = r_index;
-      natptr->r_type[0] =
-	(  (r_extern ?   RELOC_STD_BITS_EXTERN_BIG: 0)
-	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_BIG: 0)
-	 | (r_neg    ?   RELOC_STD_BITS_BASEREL_BIG: 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
-    }
-  else
-    {
-      natptr->r_index[2] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[0] = r_index;
-      natptr->r_type[0] =
-	(  (r_extern ?   RELOC_STD_BITS_EXTERN_LITTLE: 0)
-	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_LITTLE: 0)
-	 | (r_neg    ?   RELOC_STD_BITS_BASEREL_LITTLE: 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
-    }
-}
-
-static bfd_boolean
-riscix_squirt_out_relocs (bfd *abfd, asection *section)
-{
-  arelent **generic;
-  unsigned char *native, *natptr;
-  size_t each_size;
-  unsigned int count = section->reloc_count;
-  bfd_size_type natsize;
-
-  if (count == 0)
-    return TRUE;
-
-  each_size = obj_reloc_entry_size (abfd);
-  natsize = each_size;
-  natsize *= count;
-  native = bfd_zalloc (abfd, natsize);
-  if (!native)
-    return FALSE;
-
-  generic = section->orelocation;
-
-  for (natptr = native;
-       count != 0;
-       --count, natptr += each_size, ++generic)
-    riscix_swap_std_reloc_out (abfd, *generic,
-			       (struct reloc_std_external *) natptr);
-
-  if (bfd_bwrite ((void *) native, natsize, abfd) != natsize)
-    {
-      bfd_release (abfd, native);
-      return FALSE;
-    }
-
-  bfd_release (abfd, native);
-  return TRUE;
-}
-
-/* This is just like the standard aoutx.h version but we need to do our
-   own mapping of external reloc type values to howto entries.  */
-
-static long
-MY (canonicalize_reloc) (bfd *abfd,
-			 sec_ptr section,
-			 arelent **relptr,
-			 asymbol **symbols)
-{
-  arelent *tblptr = section->relocation;
-  unsigned int count, c;
-  extern reloc_howto_type NAME (aout, std_howto_table)[];
-
-  /* If we have already read in the relocation table, return the values.  */
-  if (section->flags & SEC_CONSTRUCTOR)
-    {
-      arelent_chain *chain = section->constructor_chain;
-
-      for (count = 0; count < section->reloc_count; count++)
-	{
-	  *relptr++ = &chain->relent;
-	  chain = chain->next;
-	}
-      *relptr = 0;
-      return section->reloc_count;
-    }
-
-  if (tblptr && section->reloc_count)
-    {
-      for (count = 0; count++ < section->reloc_count;)
-	*relptr++ = tblptr++;
-      *relptr = 0;
-      return section->reloc_count;
-    }
-
-  if (!NAME (aout, slurp_reloc_table) (abfd, section, symbols))
-    return -1;
-  tblptr = section->relocation;
-
-  /* Fix up howto entries.  */
-  for (count = 0; count++ < section->reloc_count;)
-    {
-      c = tblptr->howto - NAME(aout,std_howto_table);
-      BFD_ASSERT (c < RISCIX_TABLE_SIZE);
-      tblptr->howto = &riscix_std_reloc_howto[c];
-
-      *relptr++ = tblptr++;
-    }
-  *relptr = 0;
-  return section->reloc_count;
-}
-
-/* This is the same as NAME(aout,some_aout_object_p), but has different
-   expansions of the macro definitions.  */
-
-static const bfd_target *
-riscix_some_aout_object_p (bfd *abfd,
-			   struct internal_exec *execp,
-			   const bfd_target *(*callback_to_real_object_p) (bfd *))
-{
-  struct aout_data_struct *rawptr, *oldrawptr;
-  const bfd_target *result;
-  bfd_size_type amt = sizeof (struct aout_data_struct);
-
-  rawptr = bfd_zalloc (abfd, amt);
-
-  if (rawptr == NULL)
-    return NULL;
-
-  oldrawptr = abfd->tdata.aout_data;
-  abfd->tdata.aout_data = rawptr;
-
-  /* Copy the contents of the old tdata struct.  */
-  if (oldrawptr != NULL)
-    *abfd->tdata.aout_data = *oldrawptr;
-
-  abfd->tdata.aout_data->a.hdr = &rawptr->e;
-  /* Copy in the internal_exec struct.  */
-  *(abfd->tdata.aout_data->a.hdr) = *execp;
-  execp = abfd->tdata.aout_data->a.hdr;
-
-  /* Set the file flags.  */
-  abfd->flags = BFD_NO_FLAGS;
-  if (execp->a_drsize || execp->a_trsize)
-    abfd->flags |= HAS_RELOC;
-  /* Setting of EXEC_P has been deferred to the bottom of this function.  */
-  if (execp->a_syms)
-    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
-  if (N_DYNAMIC (execp))
-    abfd->flags |= DYNAMIC;
-
- /* Squeezed files aren't supported (yet)!  */
-  if ((execp->a_info & MF_SQUEEZED) != 0)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  else if ((execp->a_info & MF_IS_SL) != 0)
-    {
-      /* Nor are shared libraries.  */
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  else if (N_MAGIC (execp) == ZMAGIC)
-    {
-      abfd->flags |= D_PAGED | WP_TEXT;
-      adata (abfd).magic = z_magic;
-    }
-  else if (N_MAGIC (execp) == NMAGIC)
-    {
-      abfd->flags |= WP_TEXT;
-      adata (abfd).magic = n_magic;
-    }
-  else if (N_MAGIC (execp) == OMAGIC)
-    adata (abfd).magic = o_magic;
-  else
-    /* Should have been checked with N_BADMAG before this routine
-       was called.  */
-    abort ();
-
-  bfd_get_start_address (abfd) = execp->a_entry;
-
-  obj_aout_symbols (abfd) = NULL;
-  bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct external_nlist);
-
-  /* The default relocation entry size is that of traditional V7 Unix.  */
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-
-  /* The default symbol entry size is that of traditional Unix.  */
-  obj_symbol_entry_size (abfd) = EXTERNAL_NLIST_SIZE;
-
-  obj_aout_external_syms (abfd) = NULL;
-  obj_aout_external_strings (abfd) = NULL;
-  obj_aout_sym_hashes (abfd) = NULL;
-
-  if (! NAME (aout, make_sections) (abfd))
-    return NULL;
-
-  obj_datasec (abfd)->size = execp->a_data;
-  obj_bsssec (abfd)->size = execp->a_bss;
-
-  obj_textsec (abfd)->flags =
-    (execp->a_trsize != 0
-     ? (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC)
-     : (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS));
-  obj_datasec (abfd)->flags =
-    (execp->a_drsize != 0
-     ? (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS | SEC_RELOC)
-     : (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS));
-  obj_bsssec (abfd)->flags = SEC_ALLOC;
-
-  result = (*callback_to_real_object_p) (abfd);
-
-#if defined(MACH) || defined(STAT_FOR_EXEC)
-  /* The original heuristic doesn't work in some important cases. The
-     a.out file has no information about the text start address. For
-     files (like kernels) linked to non-standard addresses (ld -Ttext
-     nnn) the entry point may not be between the default text start
-     (obj_textsec(abfd)->vma) and (obj_textsec(abfd)->vma) + text size
-     This is not just a mach issue. Many kernels are loaded at non
-     standard addresses.  */
-  {
-    struct stat stat_buf;
-
-    if (abfd->iostream != NULL
-	&& (abfd->flags & BFD_IN_MEMORY) == 0
-	&& (fstat(fileno((FILE *) (abfd->iostream)), &stat_buf) == 0)
-	&& ((stat_buf.st_mode & 0111) != 0))
-      abfd->flags |= EXEC_P;
-  }
-#else /* ! MACH */
-  /* Now that the segment addresses have been worked out, take a better
-     guess at whether the file is executable.  If the entry point
-     is within the text segment, assume it is.  (This makes files
-     executable even if their entry point address is 0, as long as
-     their text starts at zero.)
-
-     At some point we should probably break down and stat the file and
-     declare it executable if (one of) its 'x' bits are on...  */
-  if ((execp->a_entry >= obj_textsec(abfd)->vma) &&
-      (execp->a_entry < obj_textsec(abfd)->vma + obj_textsec(abfd)->size))
-    abfd->flags |= EXEC_P;
-#endif /* MACH */
-  if (result == NULL)
-    {
-      free (rawptr);
-      abfd->tdata.aout_data = oldrawptr;
-    }
-  return result;
-}
-
-static const bfd_target *
-MY (object_p) (bfd *abfd)
-{
-  struct external_exec exec_bytes;	/* Raw exec header from file.  */
-  struct internal_exec exec;		/* Cleaned-up exec header.  */
-  const bfd_target *target;
-
-  if (bfd_bread ((void *) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  exec.a_info = H_GET_32 (abfd, exec_bytes.e_info);
-
-  if (N_BADMAG (&exec))
-    return NULL;
-
-#ifdef MACHTYPE_OK
-  if (!(MACHTYPE_OK (N_MACHTYPE (&exec))))
-    return NULL;
-#endif
-
-  NAME (aout, swap_exec_header_in) (abfd, & exec_bytes, & exec);
-
-  target = riscix_some_aout_object_p (abfd, & exec, MY (callback));
-
-  return target;
-}
-
-#include "aout-target.h"
diff --git a/bfd/targets.c b/bfd/targets.c
index 675f3252edf..3fb60cb4af6 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -597,12 +597,6 @@ extern const bfd_target am33_elf32_linux_vec;
 extern const bfd_target aout_vec;
 extern const bfd_target arc_elf32_be_vec;
 extern const bfd_target arc_elf32_le_vec;
-extern const bfd_target arm_aout_be_vec;
-extern const bfd_target arm_aout_le_vec;
-extern const bfd_target arm_aout_nbsd_vec;
-extern const bfd_target arm_aout_riscix_vec;
-extern const bfd_target arm_coff_be_vec;
-extern const bfd_target arm_coff_le_vec;
 extern const bfd_target arm_elf32_be_vec;
 extern const bfd_target arm_elf32_le_vec;
 extern const bfd_target arm_elf32_nacl_be_vec;
@@ -925,18 +919,6 @@ static const bfd_target * const _bfd_target_vector[] =
 	&arc_elf32_be_vec,
 	&arc_elf32_le_vec,
 
-#if 0
-	/* We have no way of distinguishing these from other a.out variants.  */
-	&arm_aout_be_vec,
-	&arm_aout_le_vec,
-#endif
-	&arm_aout_nbsd_vec,
-#if 0
-	/* We have no way of distinguishing these from other a.out variants.  */
-	&arm_aout_riscix_vec,
-#endif
-	&arm_coff_be_vec,
-	&arm_coff_le_vec,
 	&arm_elf32_be_vec,
 	&arm_elf32_le_vec,
 	&arm_elf32_symbian_be_vec,
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 991ebbe4dad..2b2c709d198 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2018-04-25  Alan Modra  <amodra@gmail.com>
+
+	* 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.
+
 2018-04-18  Nick Clifton  <nickc@redhat.com>
 
 	PR 23062
diff --git a/binutils/testsuite/binutils-all/arm/objdump.exp b/binutils/testsuite/binutils-all/arm/objdump.exp
index d2768adca8d..8732a141659 100644
--- a/binutils/testsuite/binutils-all/arm/objdump.exp
+++ b/binutils/testsuite/binutils-all/arm/objdump.exp
@@ -18,10 +18,6 @@ if {![istarget "arm*-*-*"]} then {
   return
 }
 
-if {[istarget "*-*-aout"]} then {
-  return
-}
-
 if {![is_remote host] && [which $OBJDUMP] == 0} then {
     perror "$OBJDUMP does not exist"
     return
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index ee88151e238..d585204ddd9 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -651,7 +651,6 @@ proc copy_executable { prog flags test1 test2 } {
 	    setup_xfail "*-*-*"
 	}
 
-	setup_xfail "arm*-*-coff"
 	setup_xfail "arm*-*-pe"
 	setup_xfail "*-*-mingw*"
 	setup_xfail "*-*-cygwin*"
diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index 8708030a23f..47eae87fb6f 100644
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -80,8 +80,6 @@ proc is_aout_format {} {
     if { [istarget *-*-*aout*]
 	 || [istarget *-*-bsd*]
 	 || [istarget *-*-msdos*]
-	 || [istarget arm-*-netbsd*]
-	 || [istarget arm-*-openbsd*]
 	 || [istarget ns32k-*-*]
 	 || [istarget pdp11-*-*]
 	 || [istarget vax-*-netbsd] } {
diff --git a/gas/ChangeLog b/gas/ChangeLog
index ba3d8b5d031..b57224d8626 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,164 @@
+2018-04-25  Alan Modra  <amodra@gmail.com>
+
+	* 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.
+
 2018-04-23  Alan Modra  <amodra@gmail.com>
 
 	* stabs.c (generate_asm_file): Use memcpy rather than strncpy.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index fa0f65cab3f..952377093d0 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -321,7 +321,6 @@ TARG_ENV_HFILES = \
 	config/te-nbsd532.h \
 	config/te-pc532mach.h \
 	config/te-pe.h \
-	config/te-riscix.h \
 	config/te-solaris.h \
 	config/te-svr4.h \
 	config/te-symbian.h \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 873e917c87a..4feabb3432e 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -617,7 +617,6 @@ TARG_ENV_HFILES = \
 	config/te-nbsd532.h \
 	config/te-pc532mach.h \
 	config/te-pe.h \
-	config/te-riscix.h \
 	config/te-solaris.h \
 	config/te-svr4.h \
 	config/te-symbian.h \
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index eda98909216..f7bddd7a6e1 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1040,7 +1040,6 @@ static int
 my_get_expression (expressionS * ep, char ** str, int prefix_mode)
 {
   char * save_in;
-  segT	 seg;
 
   /* In unified syntax, all prefixes are optional.  */
   if (unified_syntax)
@@ -1072,7 +1071,7 @@ my_get_expression (expressionS * ep, char ** str, int prefix_mode)
   save_in = input_line_pointer;
   input_line_pointer = *str;
   in_my_get_expression = TRUE;
-  seg = expression (ep);
+  expression (ep);
   in_my_get_expression = FALSE;
 
   if (ep->X_op == O_illegal || ep->X_op == O_absent)
@@ -1086,22 +1085,6 @@ my_get_expression (expressionS * ep, char ** str, int prefix_mode)
       return 1;
     }
 
-#ifdef OBJ_AOUT
-  if (seg != absolute_section
-      && seg != text_section
-      && seg != data_section
-      && seg != bss_section
-      && seg != undefined_section)
-    {
-      inst.error = _("bad segment");
-      *str = input_line_pointer;
-      input_line_pointer = save_in;
-      return 1;
-    }
-#else
-  (void) seg;
-#endif
-
   /* Get rid of any bignums now, so that we don't generate an error for which
      we can't establish a line number later on.	 Big numbers are never valid
      in instructions, which is where this routine is always called.  */
@@ -22060,21 +22043,6 @@ valueT
 md_section_align (segT	 segment ATTRIBUTE_UNUSED,
 		  valueT size)
 {
-#if (defined (OBJ_AOUT) || defined (OBJ_MAYBE_AOUT))
-  if (OUTPUT_FLAVOR == bfd_target_aout_flavour)
-    {
-      /* For a.out, force the section size to be aligned.  If we don't do
-	 this, BFD will align it for us, but it will not write out the
-	 final bytes of the section.  This may be a bug in BFD, but it is
-	 easier to fix it here since that is how the other a.out targets
-	 work.  */
-      int align;
-
-      align = bfd_get_section_alignment (stdoutput, segment);
-      size = ((size + (1 << align) - 1) & (-((valueT) 1 << align)));
-    }
-#endif
-
   return size;
 }
 
diff --git a/gas/config/tc-arm.h b/gas/config/tc-arm.h
index f50d7c9be13..53067cfc7f2 100644
--- a/gas/config/tc-arm.h
+++ b/gas/config/tc-arm.h
@@ -46,21 +46,7 @@
 
 struct fix;
 
-#if defined OBJ_AOUT
-# if defined TE_RISCIX
-#  define TARGET_FORMAT "a.out-riscix"
-# elif defined TE_LINUX
-#  define ARM_BI_ENDIAN
-#  define TARGET_FORMAT "a.out-arm-linux"
-# elif defined TE_NetBSD
-#  define TARGET_FORMAT "a.out-arm-netbsd"
-# else
-#  define ARM_BI_ENDIAN
-#  define TARGET_FORMAT (target_big_endian ? "a.out-arm-big" : "a.out-arm-little")
-# endif
-#elif defined OBJ_AIF
-# define TARGET_FORMAT "aif"
-#elif defined OBJ_COFF
+#if defined OBJ_COFF
 # define ARM_BI_ENDIAN
 # if defined TE_PE
 #  if defined TE_WINCE
diff --git a/gas/config/te-riscix.h b/gas/config/te-riscix.h
deleted file mode 100644
index 181602cacd2..00000000000
--- a/gas/config/te-riscix.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (C) 2007-2018 Free Software Foundation, Inc.
-
-   This file is part of GAS, the GNU Assembler.
-
-   GAS is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3,
-   or (at your option) any later version.
-
-   GAS is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-   the GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GAS; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
-   02110-1301, USA.  */
-
-#define TE_RISCIX
-
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-#include "obj-format.h"
diff --git a/gas/configure.tgt b/gas/configure.tgt
index c43a4423f1c..67edc1d1978 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -136,8 +136,6 @@ case ${generic_target} in
   arc-*-elf*)				fmt=elf ;;
   arc*-*-linux*)			fmt=elf bfd_gas=yes ;;
 
-  arm-*-aout)				fmt=aout ;;
-  arm-*-coff)				fmt=coff ;;
   arm-*-phoenix*)			fmt=elf ;;
   arm-*-elf)				fmt=elf ;;
   arm-*-eabi* | arm-*-rtems*)		fmt=elf em=armeabi ;;
@@ -148,19 +146,16 @@ case ${generic_target} in
 					fmt=elf  em=freebsd ;;
   arm-*-freebsd* | armeb-*-freebsd*)	fmt=elf  em=armfbsdeabi ;;
   arm*-*-freebsd*)			fmt=elf  em=armfbsdvfp ;;
-  arm-*-linux*aout*)			fmt=aout em=linux ;;
   arm-*-linux-*eabi*)			fmt=elf  em=armlinuxeabi ;;
   arm-*-linux-*)			fmt=elf  em=linux ;;
   arm-*-uclinux*eabi*)			fmt=elf  em=armlinuxeabi ;;
   arm-*-uclinux*)			fmt=elf  em=linux ;;
   arm-*-nacl*)				fmt=elf  em=nacl ;;
   arm-*-netbsdelf*)			fmt=elf  em=nbsd ;;
-  arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
   arm-*-nto*)				fmt=elf ;;
   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
 					fmt=coff em=wince-pe ;;
   arm-*-pe)				fmt=coff em=pe ;;
-  arm-*-riscix*)			fmt=aout em=riscix ;;
   arm-*-fuchsia*)			fmt=elf ;;
 
   avr-*-*)				fmt=elf bfd_gas=yes ;;
diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in
index 1d0e6d90018..154b34136ec 100644
--- a/gas/po/POTFILES.in
+++ b/gas/po/POTFILES.in
@@ -196,7 +196,6 @@ config/te-nbsd.h
 config/te-nbsd532.h
 config/te-pc532mach.h
 config/te-pe.h
-config/te-riscix.h
 config/te-solaris.h
 config/te-svr4.h
 config/te-symbian.h
diff --git a/gas/testsuite/gas/aarch64/codealign.d b/gas/testsuite/gas/aarch64/codealign.d
index a9359be7f19..b435f7a9518 100644
--- a/gas/testsuite/gas/aarch64/codealign.d
+++ b/gas/testsuite/gas/aarch64/codealign.d
@@ -1,7 +1,7 @@
 #objdump: --section-headers
 # Minimum code alignment should be set.
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format.*aarch64.*
 
diff --git a/gas/testsuite/gas/aarch64/mapping.d b/gas/testsuite/gas/aarch64/mapping.d
index d2b3d5b944a..021bd936bb0 100644
--- a/gas/testsuite/gas/aarch64/mapping.d
+++ b/gas/testsuite/gas/aarch64/mapping.d
@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms
 #name: AArch64 Mapping Symbols
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 # Test the generation of AArch64 ELF Mapping Symbols
 
diff --git a/gas/testsuite/gas/aarch64/mapping2.d b/gas/testsuite/gas/aarch64/mapping2.d
index 1d10e75bc62..30fc3463589 100644
--- a/gas/testsuite/gas/aarch64/mapping2.d
+++ b/gas/testsuite/gas/aarch64/mapping2.d
@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms
 #name: AArch64 Mapping Symbols Test 2
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format.*aarch64.*
 
diff --git a/gas/testsuite/gas/arm/adds-thumb1-reloc-local-armv7-m.d b/gas/testsuite/gas/arm/adds-thumb1-reloc-local-armv7-m.d
index 1bab56d7f99..1813fce6a61 100644
--- a/gas/testsuite/gas/arm/adds-thumb1-reloc-local-armv7-m.d
+++ b/gas/testsuite/gas/arm/adds-thumb1-reloc-local-armv7-m.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #name: ADDS relocations against local symbols for armv7-m
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/adds-thumb1-reloc-local.d b/gas/testsuite/gas/arm/adds-thumb1-reloc-local.d
index 190f0aba9a2..e0e195b82d4 100644
--- a/gas/testsuite/gas/arm/adds-thumb1-reloc-local.d
+++ b/gas/testsuite/gas/arm/adds-thumb1-reloc-local.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #name: ADDS relocations against local symbols for armv6s-m
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/addsw-bad.d b/gas/testsuite/gas/arm/addsw-bad.d
index 686570257f2..bdd7480917e 100644
--- a/gas/testsuite/gas/arm/addsw-bad.d
+++ b/gas/testsuite/gas/arm/addsw-bad.d
@@ -1,3 +1,3 @@
 #name: Invalid Immediate field for flag-setting add,sub
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #error-output: addsw-bad.l
diff --git a/gas/testsuite/gas/arm/align.d b/gas/testsuite/gas/arm/align.d
index a15ed8c167c..280269d8647 100644
--- a/gas/testsuite/gas/arm/align.d
+++ b/gas/testsuite/gas/arm/align.d
@@ -1,7 +1,7 @@
 # name: ARM V6t2 Alignment
 # as: -march=armv6kt2
 # objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/align64.d b/gas/testsuite/gas/arm/align64.d
index 8c99ab7ff2d..b794d58c064 100644
--- a/gas/testsuite/gas/arm/align64.d
+++ b/gas/testsuite/gas/arm/align64.d
@@ -1,6 +1,6 @@
 # name: 64 Bytes alignment test
 # objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/arch7.d b/gas/testsuite/gas/arm/arch7.d
index 56ed09cfbab..0b0d3cf4be1 100644
--- a/gas/testsuite/gas/arm/arch7.d
+++ b/gas/testsuite/gas/arm/arch7.d
@@ -1,7 +1,7 @@
 #name: ARM V7 instructions
 #as: -march=armv7r
 #objdump: -dr --prefix-addresses --show-raw-insn
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/arch7a-mp.d b/gas/testsuite/gas/arm/arch7a-mp.d
index 85a1a014ece..241f397296d 100644
--- a/gas/testsuite/gas/arm/arch7a-mp.d
+++ b/gas/testsuite/gas/arm/arch7a-mp.d
@@ -2,7 +2,7 @@
 #as: -march=armv7-a+mp
 #objdump: -dr --prefix-addresses --show-raw-insn
 #source: arch7ar-mp.s
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/arch7em.d b/gas/testsuite/gas/arm/arch7em.d
index 9e3e286538a..9c8e32b7e1d 100644
--- a/gas/testsuite/gas/arm/arch7em.d
+++ b/gas/testsuite/gas/arm/arch7em.d
@@ -1,7 +1,7 @@
 # name: 32-bit Thumb DSP instructions
 # as: -march=armv7e-m
 # objdump: -dr --prefix-addresses --show-raw-insn
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-5.d b/gas/testsuite/gas/arm/archv8m-main-dsp-5.d
index 0e7dfd2f20f..e31a2d66daf 100644
--- a/gas/testsuite/gas/arm/archv8m-main-dsp-5.d
+++ b/gas/testsuite/gas/arm/archv8m-main-dsp-5.d
@@ -2,7 +2,7 @@
 #source: arch7em.s
 #as: -march=armv8-m.main+dsp
 #objdump: -dr --prefix-addresses --show-raw-insn
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/arm-it-auto-2.d b/gas/testsuite/gas/arm/arm-it-auto-2.d
index bff265dd2fb..1fb337fde36 100644
--- a/gas/testsuite/gas/arm/arm-it-auto-2.d
+++ b/gas/testsuite/gas/arm/arm-it-auto-2.d
@@ -1,7 +1,7 @@
 #name: ARM IT automatic instruction generation 2
 #as: -mthumb -march=armv7a -mimplicit-it=always
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/arm-it-auto-3.d b/gas/testsuite/gas/arm/arm-it-auto-3.d
index c0398950aad..27834110d8f 100644
--- a/gas/testsuite/gas/arm/arm-it-auto-3.d
+++ b/gas/testsuite/gas/arm/arm-it-auto-3.d
@@ -1,7 +1,7 @@
 #name: ARM IT automatic instruction generation 3
 #as: -mthumb -march=armv7a -mimplicit-it=always
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/arm-it-auto.d b/gas/testsuite/gas/arm/arm-it-auto.d
index bfdd9d64d4a..01e6b2f438d 100644
--- a/gas/testsuite/gas/arm/arm-it-auto.d
+++ b/gas/testsuite/gas/arm/arm-it-auto.d
@@ -1,7 +1,7 @@
 #name: ARM IT automatic instruction generation
 #as: -mthumb -march=armv7 -mimplicit-it=always
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/arm-it-bad-2.d b/gas/testsuite/gas/arm/arm-it-bad-2.d
index 2a644a3efed..ea930593f20 100644
--- a/gas/testsuite/gas/arm/arm-it-bad-2.d
+++ b/gas/testsuite/gas/arm/arm-it-bad-2.d
@@ -1,4 +1,4 @@
 #name: Test unclosed IT block validation.
 #as: -march=armv7a
-#skip: *-*-*aout* *-*-pe
+#skip: *-*-pe
 #error-output: arm-it-bad-2.l
diff --git a/gas/testsuite/gas/arm/arm-it.d b/gas/testsuite/gas/arm/arm-it.d
index 1abe0493437..e4046642c5a 100644
--- a/gas/testsuite/gas/arm/arm-it.d
+++ b/gas/testsuite/gas/arm/arm-it.d
@@ -1,6 +1,6 @@
 #name: ARM IT instruction
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv7e-m+fpv5-d16.d b/gas/testsuite/gas/arm/armv7e-m+fpv5-d16.d
index 85d58d60881..4ec20da121e 100644
--- a/gas/testsuite/gas/arm/armv7e-m+fpv5-d16.d
+++ b/gas/testsuite/gas/arm/armv7e-m+fpv5-d16.d
@@ -1,6 +1,6 @@
 #name: Valid v7e-m+fpv5-d16
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-pe *-wince-* *-*-coff
+#skip: *-*-pe *-wince-*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv7e-m+fpv5-sp-d16.d b/gas/testsuite/gas/arm/armv7e-m+fpv5-sp-d16.d
index a8a069c36ab..62b1a0d22b9 100644
--- a/gas/testsuite/gas/arm/armv7e-m+fpv5-sp-d16.d
+++ b/gas/testsuite/gas/arm/armv7e-m+fpv5-sp-d16.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-pe *-wince-* *-*-coff
+#skip: *-*-pe *-wince-*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d
index 912a4474b7a..0fb04fe7033 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d
@@ -2,7 +2,7 @@
 #source: armv8-2-fp16-scalar.s
 #objdump: -d
 #as: -march=armv8.2-a+fp16 -mfpu=fp-armv8 -mthumb
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 Disassembly of section .text:
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar.d
index 023bf67be63..42e8ef4dca4 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar.d
@@ -2,7 +2,7 @@
 #source: armv8-2-fp16-scalar.s
 #objdump: -d
 #as: -march=armv8.2-a+fp16 -mfpu=fp-armv8
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 Disassembly of section .text:
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb.d b/gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb.d
index 947049775b4..9bd7b4d2099 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb.d
@@ -2,7 +2,7 @@
 #source: armv8-2-fp16-simd.s
 #objdump: -d
 #as: -march=armv8.2-a+fp16 -mfpu=neon-fp-armv8 -mthumb
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-simd.d b/gas/testsuite/gas/arm/armv8-2-fp16-simd.d
index 2dc40546fef..47784f5a967 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-simd.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-simd.d
@@ -2,7 +2,7 @@
 #source: armv8-2-fp16-simd.s
 #objdump: -d
 #as: -march=armv8.2-a+fp16 -mfpu=neon-fp-armv8
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-a+crypto.d b/gas/testsuite/gas/arm/armv8-a+crypto.d
index 453db31e519..b40c01e9d6e 100644
--- a/gas/testsuite/gas/arm/armv8-a+crypto.d
+++ b/gas/testsuite/gas/arm/armv8-a+crypto.d
@@ -1,6 +1,6 @@
 #name: Valid v8-a+cryptov1
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-a+fp.d b/gas/testsuite/gas/arm/armv8-a+fp.d
index 3e71624244b..4dc65906b73 100644
--- a/gas/testsuite/gas/arm/armv8-a+fp.d
+++ b/gas/testsuite/gas/arm/armv8-a+fp.d
@@ -2,7 +2,7 @@
 #source: armv8-ar+fp.s
 #as: -march=armv8-a
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-a+ras.d b/gas/testsuite/gas/arm/armv8-a+ras.d
index b6a4e453a04..026e77f205b 100644
--- a/gas/testsuite/gas/arm/armv8-a+ras.d
+++ b/gas/testsuite/gas/arm/armv8-a+ras.d
@@ -2,7 +2,7 @@
 #as: -march=armv8-a+ras
 #source: armv8_2-a.s
 #objdump: -dr
-#skip: *-*-pe *-wince-* *-*-coff
+#skip: *-*-pe *-wince-*
 
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/armv8-a+rdma-warning.d b/gas/testsuite/gas/arm/armv8-a+rdma-warning.d
index da54c4dc7d9..6a1fd175700 100644
--- a/gas/testsuite/gas/arm/armv8-a+rdma-warning.d
+++ b/gas/testsuite/gas/arm/armv8-a+rdma-warning.d
@@ -1,6 +1,6 @@
 #name: Accepted v8-a with ARMv8.1 AdvSIMD.
 #as: -march=armv8-a+simd
 #objdump: -dr
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #source: armv8-a+rdma.s
 #error-output: armv8-a+rdma.l
\ No newline at end of file
diff --git a/gas/testsuite/gas/arm/armv8-a+rdma.d b/gas/testsuite/gas/arm/armv8-a+rdma.d
index d30aab760a4..f3af864ccf0 100644
--- a/gas/testsuite/gas/arm/armv8-a+rdma.d
+++ b/gas/testsuite/gas/arm/armv8-a+rdma.d
@@ -1,7 +1,7 @@
 #name: Valid v8-a+rdma
 #as: -march=armv8-a+rdma
 #objdump: -dr
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #source: armv8-a+rdma.s
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/armv8-a+simd.d b/gas/testsuite/gas/arm/armv8-a+simd.d
index 8aa15fb065f..4afc3e90ec8 100644
--- a/gas/testsuite/gas/arm/armv8-a+simd.d
+++ b/gas/testsuite/gas/arm/armv8-a+simd.d
@@ -2,7 +2,7 @@
 #source: armv8-ar+simd.s
 #as: -march=armv8-a
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-a-barrier-thumb.d b/gas/testsuite/gas/arm/armv8-a-barrier-thumb.d
index 318635aae3c..9f1ff035420 100644
--- a/gas/testsuite/gas/arm/armv8-a-barrier-thumb.d
+++ b/gas/testsuite/gas/arm/armv8-a-barrier-thumb.d
@@ -2,7 +2,7 @@
 #as: -march=armv8-a -mthumb
 #source: armv8-ar-barrier.s
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-r+fp.d b/gas/testsuite/gas/arm/armv8-r+fp.d
index 52fdbec4c64..46c204cea7c 100644
--- a/gas/testsuite/gas/arm/armv8-r+fp.d
+++ b/gas/testsuite/gas/arm/armv8-r+fp.d
@@ -2,7 +2,7 @@
 #source: armv8-ar+fp.s
 #as: -march=armv8-r
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-r+simd.d b/gas/testsuite/gas/arm/armv8-r+simd.d
index 4237218e679..469f62d0614 100644
--- a/gas/testsuite/gas/arm/armv8-r+simd.d
+++ b/gas/testsuite/gas/arm/armv8-r+simd.d
@@ -2,7 +2,7 @@
 #source: armv8-ar+simd.s
 #as: -march=armv8-r
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8-r-barrier-thumb.d b/gas/testsuite/gas/arm/armv8-r-barrier-thumb.d
index 5478ff64770..62793aa03f2 100644
--- a/gas/testsuite/gas/arm/armv8-r-barrier-thumb.d
+++ b/gas/testsuite/gas/arm/armv8-r-barrier-thumb.d
@@ -2,7 +2,7 @@
 #as: -march=armv8-r -mthumb
 #source: armv8-ar-barrier.s
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8_1-a+simd.d b/gas/testsuite/gas/arm/armv8_1-a+simd.d
index 2bb27130b2a..d2276069ded 100644
--- a/gas/testsuite/gas/arm/armv8_1-a+simd.d
+++ b/gas/testsuite/gas/arm/armv8_1-a+simd.d
@@ -1,7 +1,7 @@
 #name: Valid ARMv8.1-A with +simd
 #as: -march=armv8.1-a+simd
 #objdump: -dr
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #source: armv8-a+rdma.s
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/armv8_2+rdma.d b/gas/testsuite/gas/arm/armv8_2+rdma.d
index 8aef5007713..3a7a0dee156 100644
--- a/gas/testsuite/gas/arm/armv8_2+rdma.d
+++ b/gas/testsuite/gas/arm/armv8_2+rdma.d
@@ -1,7 +1,7 @@
 #name: Valid ARMv8.2-A with ARMv8.1-A NEON instructions.
 #as: -march=armv8.2-a -mfpu=neon-fp-armv8
 #objdump: -dr
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #source: armv8-a+rdma.s
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/armv8_2-a.d b/gas/testsuite/gas/arm/armv8_2-a.d
index 068e13a5a59..0d266ab4ba3 100644
--- a/gas/testsuite/gas/arm/armv8_2-a.d
+++ b/gas/testsuite/gas/arm/armv8_2-a.d
@@ -1,7 +1,7 @@
 #name: ARMv8.2-A
 #as: -march=armv8.2-a
 #objdump: -dr
-#skip: *-*-pe *-wince-* *-*-coff *-*-aout
+#skip: *-*-pe *-wince-*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8_3-a-fp.d b/gas/testsuite/gas/arm/armv8_3-a-fp.d
index 7f607541d7e..8aff5e9cc6d 100644
--- a/gas/testsuite/gas/arm/armv8_3-a-fp.d
+++ b/gas/testsuite/gas/arm/armv8_3-a-fp.d
@@ -1,6 +1,6 @@
 #as: -march=armv8.3-a+fp
 #objdump: -dr
-#skip: *-*-pe *-wince-* *-*-coff
+#skip: *-*-pe *-wince-*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8_3-a-simd.d b/gas/testsuite/gas/arm/armv8_3-a-simd.d
index 356b5a643e7..6cad42b0f7f 100644
--- a/gas/testsuite/gas/arm/armv8_3-a-simd.d
+++ b/gas/testsuite/gas/arm/armv8_3-a-simd.d
@@ -1,6 +1,6 @@
 #as: -march=armv8.3-a+fp16+simd
 #objdump: -dr
-#skip: *-*-pe *-wince-* *-*-coff
+#skip: *-*-pe *-wince-*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8a-automatic-hlt.d b/gas/testsuite/gas/arm/armv8a-automatic-hlt.d
index 6e8c1dbad67..e33ac66129d 100644
--- a/gas/testsuite/gas/arm/armv8a-automatic-hlt.d
+++ b/gas/testsuite/gas/arm/armv8a-automatic-hlt.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/armv8a-automatic-lda.d b/gas/testsuite/gas/arm/armv8a-automatic-lda.d
index 6e8c1dbad67..e33ac66129d 100644
--- a/gas/testsuite/gas/arm/armv8a-automatic-lda.d
+++ b/gas/testsuite/gas/arm/armv8a-automatic-lda.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/attr-syntax.d b/gas/testsuite/gas/arm/attr-syntax.d
index 894b829330b..211595ded4e 100644
--- a/gas/testsuite/gas/arm/attr-syntax.d
+++ b/gas/testsuite/gas/arm/attr-syntax.d
@@ -1,4 +1,4 @@
 #source: attr-syntax.s
-#not-target: *-*-pe *-*-aout
+#not-target: *-*-pe
 #as:
 #error: :1: Error: Attribute name not recognised: made_up_tag.*:3: Error: expected <tag> , <value>.*:5: Error: expected <tag> , <value>
diff --git a/gas/testsuite/gas/arm/automatic-bw.d b/gas/testsuite/gas/arm/automatic-bw.d
index d8cf54356d4..f05d884a190 100644
--- a/gas/testsuite/gas/arm/automatic-bw.d
+++ b/gas/testsuite/gas/arm/automatic-bw.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-cbz.d b/gas/testsuite/gas/arm/automatic-cbz.d
index d8cf54356d4..f05d884a190 100644
--- a/gas/testsuite/gas/arm/automatic-cbz.d
+++ b/gas/testsuite/gas/arm/automatic-cbz.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-clrex.d b/gas/testsuite/gas/arm/automatic-clrex.d
index d8cf54356d4..f05d884a190 100644
--- a/gas/testsuite/gas/arm/automatic-clrex.d
+++ b/gas/testsuite/gas/arm/automatic-clrex.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-lda.d b/gas/testsuite/gas/arm/automatic-lda.d
index 02bb7a48a92..9b35c9d0d6a 100644
--- a/gas/testsuite/gas/arm/automatic-lda.d
+++ b/gas/testsuite/gas/arm/automatic-lda.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/automatic-ldaex.d b/gas/testsuite/gas/arm/automatic-ldaex.d
index 02bb7a48a92..9b35c9d0d6a 100644
--- a/gas/testsuite/gas/arm/automatic-ldaex.d
+++ b/gas/testsuite/gas/arm/automatic-ldaex.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/automatic-ldaexb.d b/gas/testsuite/gas/arm/automatic-ldaexb.d
index 02bb7a48a92..9b35c9d0d6a 100644
--- a/gas/testsuite/gas/arm/automatic-ldaexb.d
+++ b/gas/testsuite/gas/arm/automatic-ldaexb.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/automatic-ldrex.d b/gas/testsuite/gas/arm/automatic-ldrex.d
index d8cf54356d4..f05d884a190 100644
--- a/gas/testsuite/gas/arm/automatic-ldrex.d
+++ b/gas/testsuite/gas/arm/automatic-ldrex.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-ldrexd.d b/gas/testsuite/gas/arm/automatic-ldrexd.d
index d8cf54356d4..f05d884a190 100644
--- a/gas/testsuite/gas/arm/automatic-ldrexd.d
+++ b/gas/testsuite/gas/arm/automatic-ldrexd.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-movw.d b/gas/testsuite/gas/arm/automatic-movw.d
index d8cf54356d4..f05d884a190 100644
--- a/gas/testsuite/gas/arm/automatic-movw.d
+++ b/gas/testsuite/gas/arm/automatic-movw.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-sdiv.d b/gas/testsuite/gas/arm/automatic-sdiv.d
index c2e5750e8f7..aa115c26980 100644
--- a/gas/testsuite/gas/arm/automatic-sdiv.d
+++ b/gas/testsuite/gas/arm/automatic-sdiv.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v7
diff --git a/gas/testsuite/gas/arm/automatic-strexb.d b/gas/testsuite/gas/arm/automatic-strexb.d
index d8cf54356d4..f05d884a190 100644
--- a/gas/testsuite/gas/arm/automatic-strexb.d
+++ b/gas/testsuite/gas/arm/automatic-strexb.d
@@ -1,6 +1,6 @@
 # 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
   Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/barrier-bad-thumb.d b/gas/testsuite/gas/arm/barrier-bad-thumb.d
index 384b7ef89b8..44f8279eaad 100644
--- a/gas/testsuite/gas/arm/barrier-bad-thumb.d
+++ b/gas/testsuite/gas/arm/barrier-bad-thumb.d
@@ -1,5 +1,5 @@
 #name: Bad barrier options (Thumb)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #source: barrier-bad.s
 #as: -mthumb
 #error-output: barrier-bad.l
diff --git a/gas/testsuite/gas/arm/barrier-bad.d b/gas/testsuite/gas/arm/barrier-bad.d
index 6e19717f3bd..93bea8e53b8 100644
--- a/gas/testsuite/gas/arm/barrier-bad.d
+++ b/gas/testsuite/gas/arm/barrier-bad.d
@@ -1,3 +1,3 @@
 #name: Bad barrier options (ARM)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #error-output: barrier-bad.l
diff --git a/gas/testsuite/gas/arm/barrier-thumb.d b/gas/testsuite/gas/arm/barrier-thumb.d
index 592994699ca..9194372aefe 100644
--- a/gas/testsuite/gas/arm/barrier-thumb.d
+++ b/gas/testsuite/gas/arm/barrier-thumb.d
@@ -3,7 +3,7 @@
 #source: barrier.s
 #as: -mcpu=cortex-a8 -mthumb
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#not-target: *-*-pe *-*-wince
 
 # Test Barrier Instruction Operands
 
diff --git a/gas/testsuite/gas/arm/barrier.d b/gas/testsuite/gas/arm/barrier.d
index 972a51119dc..a09b1ea5ee4 100644
--- a/gas/testsuite/gas/arm/barrier.d
+++ b/gas/testsuite/gas/arm/barrier.d
@@ -2,7 +2,7 @@
 #name: Barrier Instruction Operands
 #as: -mcpu=cortex-a8
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#not-target: *-*-pe *-*-wince
 
 # Test Barrier Instruction Operands
 
diff --git a/gas/testsuite/gas/arm/bignum1.d b/gas/testsuite/gas/arm/bignum1.d
index cef2036cfa3..a5ce59b1409 100644
--- a/gas/testsuite/gas/arm/bignum1.d
+++ b/gas/testsuite/gas/arm/bignum1.d
@@ -2,7 +2,7 @@
 # as:
 # objdump: --full-contents
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/blx-bad.d b/gas/testsuite/gas/arm/blx-bad.d
index 9e52d5b8068..dec67de5274 100644
--- a/gas/testsuite/gas/arm/blx-bad.d
+++ b/gas/testsuite/gas/arm/blx-bad.d
@@ -1,7 +1,7 @@
 #objdump: -drw --show-raw-insn
 #name: BLX encoding
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*:     file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/blx-bl-convert.d b/gas/testsuite/gas/arm/blx-bl-convert.d
index 8c568c236af..7d8c1e6db86 100644
--- a/gas/testsuite/gas/arm/blx-bl-convert.d
+++ b/gas/testsuite/gas/arm/blx-bl-convert.d
@@ -1,7 +1,7 @@
 #name: blx->bl convert under no -march/cpu
 #error-output: blx-bl-convert.l
 #objdump: -d
-#skip: *-*-pe *-wince-* *-*-coff *-*-vxworks *-*-netbsdelf *-*-nto*
+#skip: *-*-pe *-wince-* *-*-vxworks *-*-netbsdelf *-*-nto*
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/arm/blx-local.s b/gas/testsuite/gas/arm/blx-local.s
index ed587c9e4c5..a6b4d79a179 100644
--- a/gas/testsuite/gas/arm/blx-local.s
+++ b/gas/testsuite/gas/arm/blx-local.s
@@ -1,5 +1,5 @@
 # objdump: -fdrw --prefix-addresses --show-raw-insn
-# not-target: *-*-*aout* *-*-pe
+# not-target: *-*-pe
 
   .text
   .arch armv5t
diff --git a/gas/testsuite/gas/arm/crc32-armv8-a-bad.d b/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
index bc559e018e1..608342c79ff 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
@@ -3,7 +3,7 @@
 #source: crc32-armv8-ar-bad.s
 #as: -march=armv8-a+crc
 #stderr: crc32-bad.l
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/crc32-armv8-a.d b/gas/testsuite/gas/arm/crc32-armv8-a.d
index 1374553638b..c163e606595 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-a.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-a.d
@@ -2,7 +2,7 @@
 #name: ARMv8-A CRC32 instructions
 #source: crc32-armv8-ar.s
 #as: -march=armv8-a+crc
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: *file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/crc32-armv8-r-bad.d b/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
index 4e6fe3ff767..f8551d062ab 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
@@ -3,7 +3,7 @@
 #source: crc32-armv8-ar-bad.s
 #as: -march=armv8-r+crc
 #stderr: crc32-bad.l
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/crc32-armv8-r.d b/gas/testsuite/gas/arm/crc32-armv8-r.d
index 6918e071a8b..468e5c8dfe6 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-r.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-r.d
@@ -2,7 +2,7 @@
 #name: ARMv8-R CRC32 instructions
 #source: crc32-armv8-ar.s
 #as: -march=armv8-r+crc
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: *file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/dis-data.d b/gas/testsuite/gas/arm/dis-data.d
index c3897636ae4..0ab0baddc56 100644
--- a/gas/testsuite/gas/arm/dis-data.d
+++ b/gas/testsuite/gas/arm/dis-data.d
@@ -1,5 +1,5 @@
 # name: Data disassembler test (no symbols)
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# skip: *-*-pe *-*-wince
 # objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/dis-data2.d b/gas/testsuite/gas/arm/dis-data2.d
index 9c506549231..c85f00f6285 100644
--- a/gas/testsuite/gas/arm/dis-data2.d
+++ b/gas/testsuite/gas/arm/dis-data2.d
@@ -1,5 +1,5 @@
 # name: Data disassembler test (function symbol)
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# skip: *-*-pe *-*-wince
 # objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/dis-data3.d b/gas/testsuite/gas/arm/dis-data3.d
index e33159b8404..f0e1afd456e 100644
--- a/gas/testsuite/gas/arm/dis-data3.d
+++ b/gas/testsuite/gas/arm/dis-data3.d
@@ -1,5 +1,5 @@
 # name: Data disassembler test (with mapping symbol)
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# skip: *-*-pe *-*-wince
 # objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/eabi_attr_1.d b/gas/testsuite/gas/arm/eabi_attr_1.d
index e3e3982d419..6e05f178190 100644
--- a/gas/testsuite/gas/arm/eabi_attr_1.d
+++ b/gas/testsuite/gas/arm/eabi_attr_1.d
@@ -1,7 +1,7 @@
 # as: -meabi=4
 # 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
   Tag_CPU_name: "ARM1136JF-S"
diff --git a/gas/testsuite/gas/arm/fp-save.d b/gas/testsuite/gas/arm/fp-save.d
index d32d93065fd..501ebac01b6 100644
--- a/gas/testsuite/gas/arm/fp-save.d
+++ b/gas/testsuite/gas/arm/fp-save.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: PR5712 - saving FP registers
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-riscix*
+#not-target: *-*-pe *-*-wince
 #as: -mfpu=fpa
 
 .*: *file format .*arm.*
diff --git a/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
index bd469230969..29574f92f5f 100644
--- a/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, encoding failures (alu)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #error-output: group-reloc-alu-encoding-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d b/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d
index 808bc05f080..7201db13d80 100644
--- a/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, parsing failures (alu)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #error-output: group-reloc-alu-parsing-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-alu.d b/gas/testsuite/gas/arm/group-reloc-alu.d
index 327de740535..3f84b7042b1 100644
--- a/gas/testsuite/gas/arm/group-reloc-alu.d
+++ b/gas/testsuite/gas/arm/group-reloc-alu.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #name: Group relocation tests (alu)
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
index cdf0047d3b1..51d26a1b32e 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, encoding failures (ldc)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #error-output: group-reloc-ldc-encoding-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d
index 09e32997e85..61f954cdcc1 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, parsing failures (ldc)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #error-output: group-reloc-ldc-parsing-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc.d b/gas/testsuite/gas/arm/group-reloc-ldc.d
index 5c6c5e0dbd9..0f68ba12c60 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldc.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #name: Group relocation tests (ldc)
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
index cfa0a0ccff0..d827db79b52 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, encoding failures (ldr)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #error-output: group-reloc-ldr-encoding-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d b/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d
index fa0941e80a9..5a934ee5f61 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, parsing failures (ldr)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #error-output: group-reloc-ldr-parsing-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldr.d b/gas/testsuite/gas/arm/group-reloc-ldr.d
index cd41b264aa3..b731405e350 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldr.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldr.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #name: Group relocation tests (ldr)
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
index 0c0683a18f8..2aab90ef162 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, encoding failures (ldrs)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #error-output: group-reloc-ldrs-encoding-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d b/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d
index cb46d8465d1..c28671e7a09 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, parsing failures (ldrs)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #error-output: group-reloc-ldrs-parsing-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldrs.d b/gas/testsuite/gas/arm/group-reloc-ldrs.d
index 49b8f092341..6aba9bbc252 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldrs.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldrs.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #name: Group relocation tests (ldrs)
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/insn-error-a.d b/gas/testsuite/gas/arm/insn-error-a.d
index d3b492a1310..607280826d1 100644
--- a/gas/testsuite/gas/arm/insn-error-a.d
+++ b/gas/testsuite/gas/arm/insn-error-a.d
@@ -2,5 +2,5 @@
 # after an invalid instruction does not cause an internal error.
 #name: invalid instruction recovery test - ARM version
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #error-output: insn-error-a.l
diff --git a/gas/testsuite/gas/arm/insn-error-t.d b/gas/testsuite/gas/arm/insn-error-t.d
index 01b3ad01cc9..4eead58e7d8 100644
--- a/gas/testsuite/gas/arm/insn-error-t.d
+++ b/gas/testsuite/gas/arm/insn-error-t.d
@@ -2,5 +2,5 @@
 # after an invalid instruction does not cause an internal error.
 #name: invalid instruction recovery test - Thumb version
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #error-output: insn-error-t.l
diff --git a/gas/testsuite/gas/arm/inst-po-2.d b/gas/testsuite/gas/arm/inst-po-2.d
index 3c3c41ff0a3..0d64413ce8f 100644
--- a/gas/testsuite/gas/arm/inst-po-2.d
+++ b/gas/testsuite/gas/arm/inst-po-2.d
@@ -1,4 +1,4 @@
 #name: .inst pseudo-opcode validations test
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #error-output: inst-po-2.l
diff --git a/gas/testsuite/gas/arm/inst-po-3.d b/gas/testsuite/gas/arm/inst-po-3.d
index c6b09fb7d94..fe461ef36a3 100644
--- a/gas/testsuite/gas/arm/inst-po-3.d
+++ b/gas/testsuite/gas/arm/inst-po-3.d
@@ -1,7 +1,7 @@
 #name: .inst pseudo-opcode with automatic IT blocks test
 #as: -mimplicit-it=always
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/inst-po-be.d b/gas/testsuite/gas/arm/inst-po-be.d
index 2a6fb40032e..c9c6cfa9396 100644
--- a/gas/testsuite/gas/arm/inst-po-be.d
+++ b/gas/testsuite/gas/arm/inst-po-be.d
@@ -1,7 +1,7 @@
 #name: .inst pseudo-opcode test 1 - big endian version
 #as: -mbig-endian
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #source: inst-po.s
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/inst-po.d b/gas/testsuite/gas/arm/inst-po.d
index af411399ebe..3feeb7e69d0 100644
--- a/gas/testsuite/gas/arm/inst-po.d
+++ b/gas/testsuite/gas/arm/inst-po.d
@@ -1,6 +1,6 @@
 #name: .inst pseudo-opcode test 1
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/ldconst.d b/gas/testsuite/gas/arm/ldconst.d
index e29acf3527c..167ed00e49f 100644
--- a/gas/testsuite/gas/arm/ldconst.d
+++ b/gas/testsuite/gas/arm/ldconst.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM ldr with immediate constant
 #as: -mcpu=arm7m -EL
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/ldgesb-bad.d b/gas/testsuite/gas/arm/ldgesb-bad.d
index 46a372698a2..1f4283c3cb6 100644
--- a/gas/testsuite/gas/arm/ldgesb-bad.d
+++ b/gas/testsuite/gas/arm/ldgesb-bad.d
@@ -1,4 +1,4 @@
 # name: Reject ld<cc>sb instructions
 # as: -march=armv7-a
 # error-output: ldgesb-bad.l
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/ldgesh-bad.d b/gas/testsuite/gas/arm/ldgesh-bad.d
index 3dced89a375..8268f7f47e6 100644
--- a/gas/testsuite/gas/arm/ldgesh-bad.d
+++ b/gas/testsuite/gas/arm/ldgesh-bad.d
@@ -1,4 +1,4 @@
 # name: Reject ld<cc>sh instructions
 # as: -march=armv7-a
 # error-output: ldgesh-bad.l
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/ldst-offset0.d b/gas/testsuite/gas/arm/ldst-offset0.d
index c1727c3bf25..bcbc97d3773 100644
--- a/gas/testsuite/gas/arm/ldst-offset0.d
+++ b/gas/testsuite/gas/arm/ldst-offset0.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM load/store with 0 offset
 #as:
-#skip: *-*-pe *-wince-* *-*-coff
+#skip: *-*-pe *-wince-*
 
 # Test the standard ARM instructions:
 
diff --git a/gas/testsuite/gas/arm/local_function.d b/gas/testsuite/gas/arm/local_function.d
index 6d227d533ac..23fe3f615b0 100644
--- a/gas/testsuite/gas/arm/local_function.d
+++ b/gas/testsuite/gas/arm/local_function.d
@@ -1,7 +1,7 @@
 #objdump: -r
 #name: Relocations against local function symbols
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#not-target: *-*-pe *-*-wince *-*-vxworks
 
 .*:     file format.*
 
diff --git a/gas/testsuite/gas/arm/local_label_coff.d b/gas/testsuite/gas/arm/local_label_coff.d
index e953a2762b2..e5b505bcec8 100644
--- a/gas/testsuite/gas/arm/local_label_coff.d
+++ b/gas/testsuite/gas/arm/local_label_coff.d
@@ -2,7 +2,7 @@
 #name: ARM local label relocs to section symbol relocs (COFF)
 # This test is only valid on COFF based targets, except Windows CE.
 # There are ELF and Windows CE versions of this test.
-#not-skip: *-unknown-pe *-*-*coff
+#not-skip: *-unknown-pe
 
 # Check if relocations against local symbols are converted to 
 # relocations against section symbols.
diff --git a/gas/testsuite/gas/arm/local_label_elf.d b/gas/testsuite/gas/arm/local_label_elf.d
index d4a8c8ea73f..cfa6dbaf0e8 100644
--- a/gas/testsuite/gas/arm/local_label_elf.d
+++ b/gas/testsuite/gas/arm/local_label_elf.d
@@ -2,7 +2,7 @@
 #name: ARM local label relocs to section symbol relocs (ELF)
 # This test is only valid on ELF targets.
 # There are COFF and Windows CE versions of this test.
-#skip: *-*-*coff *-*-pe *-wince-* *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 
 # Check if relocations against local symbols are converted to 
 # relocations against section symbols.
diff --git a/gas/testsuite/gas/arm/mapping.d b/gas/testsuite/gas/arm/mapping.d
index c4819d28a94..32364d3c366 100644
--- a/gas/testsuite/gas/arm/mapping.d
+++ b/gas/testsuite/gas/arm/mapping.d
@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms
 #name: ARM Mapping Symbols
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 # Test the generation of ARM ELF Mapping Symbols
 
diff --git a/gas/testsuite/gas/arm/mapping2.d b/gas/testsuite/gas/arm/mapping2.d
index 42b300d1666..393b5c6934c 100644
--- a/gas/testsuite/gas/arm/mapping2.d
+++ b/gas/testsuite/gas/arm/mapping2.d
@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms
 #name: ARM Mapping Symbols Test 2
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format.*arm.*
 
diff --git a/gas/testsuite/gas/arm/mapping3.d b/gas/testsuite/gas/arm/mapping3.d
index 2c70a724c67..7a7b39b7ca2 100644
--- a/gas/testsuite/gas/arm/mapping3.d
+++ b/gas/testsuite/gas/arm/mapping3.d
@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms
 #name: ARM Mapping Symbols Test 3
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format.*arm.*
 
diff --git a/gas/testsuite/gas/arm/mapping4.d b/gas/testsuite/gas/arm/mapping4.d
index 2d82a1a0fe6..6331e191068 100644
--- a/gas/testsuite/gas/arm/mapping4.d
+++ b/gas/testsuite/gas/arm/mapping4.d
@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms
 #name: ARM Mapping Symbols Test 4
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format.*arm.*
 
diff --git a/gas/testsuite/gas/arm/mapshort-elf.d b/gas/testsuite/gas/arm/mapshort-elf.d
index 38cd0e8a2d7..ffb649db91b 100644
--- a/gas/testsuite/gas/arm/mapshort-elf.d
+++ b/gas/testsuite/gas/arm/mapshort-elf.d
@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols for .short (ELF version)
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-*eabi* *-*-symbianelf *-*-linux-* *-*-vxworks *-*-elf *-*-nacl*
+#not-target: *-*-pe *-*-wince *-*-*eabi* *-*-symbianelf *-*-linux-* *-*-vxworks *-*-elf *-*-nacl*
 #source: mapshort.s
 
 # Test the generation and use of ARM ELF Mapping Symbols
diff --git a/gas/testsuite/gas/arm/mask_1-armv8-a.d b/gas/testsuite/gas/arm/mask_1-armv8-a.d
index ece640adce7..823a2663316 100644
--- a/gas/testsuite/gas/arm/mask_1-armv8-a.d
+++ b/gas/testsuite/gas/arm/mask_1-armv8-a.d
@@ -3,7 +3,7 @@
 #source: mask_1-armv8-ar.s
 #as: -march=armv8-a
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 # Test VFMA instruction disassembly
 
diff --git a/gas/testsuite/gas/arm/mask_1-armv8-r.d b/gas/testsuite/gas/arm/mask_1-armv8-r.d
index 6da82ef2e1e..7264de66ade 100644
--- a/gas/testsuite/gas/arm/mask_1-armv8-r.d
+++ b/gas/testsuite/gas/arm/mask_1-armv8-r.d
@@ -3,7 +3,7 @@
 #source: mask_1-armv8-ar.s
 #as: -march=armv8-r
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 # Test VFMA instruction disassembly
 
diff --git a/gas/testsuite/gas/arm/movs-thumb1-reloc-local-armv7-m.d b/gas/testsuite/gas/arm/movs-thumb1-reloc-local-armv7-m.d
index 1e94394ea94..5ea3383419b 100644
--- a/gas/testsuite/gas/arm/movs-thumb1-reloc-local-armv7-m.d
+++ b/gas/testsuite/gas/arm/movs-thumb1-reloc-local-armv7-m.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #name: MOVS relocations against local symbols for armv7-m
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/movs-thumb1-reloc-local.d b/gas/testsuite/gas/arm/movs-thumb1-reloc-local.d
index 3febca350f3..98a3c2dfa44 100644
--- a/gas/testsuite/gas/arm/movs-thumb1-reloc-local.d
+++ b/gas/testsuite/gas/arm/movs-thumb1-reloc-local.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #name: MOVS relocations against local symbols for armv6s-m
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/movw-local.d b/gas/testsuite/gas/arm/movw-local.d
index af9562e4ab0..45e91b1ab8d 100644
--- a/gas/testsuite/gas/arm/movw-local.d
+++ b/gas/testsuite/gas/arm/movw-local.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #name: MOVW/MOVT relocations against local symbols
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d b/gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d
index 232e23731ee..331fe4a1b6b 100644
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MRS/MSR test, architecture v6t2, Thumb mode
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d b/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d
index 594ab43cd4e..29bcc8ef245 100644
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MRS/MSR test, architecture v7-M, Thumb mode
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d b/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
index a1595ca7f6e..943cbd1d67a 100644
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MRS/MSR test, architecture v7e-M, Thumb mode
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/arm/msr-imm-bad.d b/gas/testsuite/gas/arm/msr-imm-bad.d
index ae1faa7a616..94dc4153f9c 100644
--- a/gas/testsuite/gas/arm/msr-imm-bad.d
+++ b/gas/testsuite/gas/arm/msr-imm-bad.d
@@ -1,5 +1,5 @@
 # name: Cannot use MSR with immediates in thumb mode.
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
 # error-output: msr-imm-bad.l
 # source: msr-imm.s
 # as: -march=armv7-a -mthumb
diff --git a/gas/testsuite/gas/arm/msr-reg-bad.d b/gas/testsuite/gas/arm/msr-reg-bad.d
index 468bb61320a..1a5ca241474 100644
--- a/gas/testsuite/gas/arm/msr-reg-bad.d
+++ b/gas/testsuite/gas/arm/msr-reg-bad.d
@@ -1,5 +1,5 @@
 # name: Cannot use flag-variant of PSR on v7m and v6m.
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
 # error-output: msr-reg-bad.l
 # source: msr-reg.s
 # as: -march=armv7-m
diff --git a/gas/testsuite/gas/arm/msr-reg-thumb.d b/gas/testsuite/gas/arm/msr-reg-thumb.d
index 39b127508d4..a3f1e31dc57 100644
--- a/gas/testsuite/gas/arm/msr-reg-thumb.d
+++ b/gas/testsuite/gas/arm/msr-reg-thumb.d
@@ -3,7 +3,7 @@
 # source: msr-reg.s
 # objdump: -dr --prefix-addresses --show-raw-insn
 # warning: writing to APSR without specifying a bitmask is deprecated
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/nomapping.d b/gas/testsuite/gas/arm/nomapping.d
index 76f283345e1..caa1ec5a430 100644
--- a/gas/testsuite/gas/arm/nomapping.d
+++ b/gas/testsuite/gas/arm/nomapping.d
@@ -1,7 +1,7 @@
 #nm: -n
 #name: ARM Mapping Symbols Ignored
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 # Check ARM ELF Mapping Symbols are ignored properly
 0+0 t sym1
diff --git a/gas/testsuite/gas/arm/nops.d b/gas/testsuite/gas/arm/nops.d
index 0d57e662977..dc146069e51 100644
--- a/gas/testsuite/gas/arm/nops.d
+++ b/gas/testsuite/gas/arm/nops.d
@@ -1,6 +1,6 @@
 # name: NOP<c> instructions
 # objdump: -dr --prefix-addresses --show-raw-insn
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/pic.d b/gas/testsuite/gas/arm/pic.d
index ac2a65d7e8e..7e8caf37eef 100644
--- a/gas/testsuite/gas/arm/pic.d
+++ b/gas/testsuite/gas/arm/pic.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: PIC
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 # VxWorks needs a special variant of this file.
 #skip: *-*-vxworks*
 
diff --git a/gas/testsuite/gas/arm/pinsn.d b/gas/testsuite/gas/arm/pinsn.d
index b36cc566c55..792843e4cdd 100644
--- a/gas/testsuite/gas/arm/pinsn.d
+++ b/gas/testsuite/gas/arm/pinsn.d
@@ -1,6 +1,6 @@
 # name: 26-bit teq/cmn/tst/cmp instructions
 # objdump: -dr --prefix-addresses --show-raw-insn -marmv4
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/plt-1.d b/gas/testsuite/gas/arm/plt-1.d
index 891270698bc..b40db737022 100644
--- a/gas/testsuite/gas/arm/plt-1.d
+++ b/gas/testsuite/gas/arm/plt-1.d
@@ -2,7 +2,7 @@
 # as:
 # objdump: -dr
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#not-target: *-*-pe *-*-wince *-*-vxworks
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/pr21458.d b/gas/testsuite/gas/arm/pr21458.d
index c0b1d126812..5410e7af170 100644
--- a/gas/testsuite/gas/arm/pr21458.d
+++ b/gas/testsuite/gas/arm/pr21458.d
@@ -1,6 +1,6 @@
 #objdump: -d --prefix-addresses --show-raw-insn
 #name: ADR(L) for Thumb functions
-#skip: *-*-pe *-wince-* *-*-coff *-*-vxworks
+#skip: *-*-pe *-wince-* *-*-vxworks
 
 # Test that using ADR(L) on thumb function symbols sets the T bit.
 
diff --git a/gas/testsuite/gas/arm/pr9722.d b/gas/testsuite/gas/arm/pr9722.d
index 44f7e48d4e1..75051c9e2ad 100644
--- a/gas/testsuite/gas/arm/pr9722.d
+++ b/gas/testsuite/gas/arm/pr9722.d
@@ -1,4 +1,4 @@
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: PR9722: Generation of Thumb NOP instruction
 
diff --git a/gas/testsuite/gas/arm/strex-t.d b/gas/testsuite/gas/arm/strex-t.d
index c38eda64085..4c8394170df 100644
--- a/gas/testsuite/gas/arm/strex-t.d
+++ b/gas/testsuite/gas/arm/strex-t.d
@@ -1,6 +1,6 @@
 # name: STREXH/STREXB. - Thumb
 # objdump: -dr --prefix-address --show-raw-insn
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/t2-branch-global.d b/gas/testsuite/gas/arm/t2-branch-global.d
index 5850d6b62e0..0b77401e29a 100644
--- a/gas/testsuite/gas/arm/t2-branch-global.d
+++ b/gas/testsuite/gas/arm/t2-branch-global.d
@@ -1,6 +1,6 @@
 #name: Thumb-2 branch to constant address
 #This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 #objdump: -rd
 
 
diff --git a/gas/testsuite/gas/arm/target-reloc-1.d b/gas/testsuite/gas/arm/target-reloc-1.d
index 7a33b712311..f9b49422faa 100644
--- a/gas/testsuite/gas/arm/target-reloc-1.d
+++ b/gas/testsuite/gas/arm/target-reloc-1.d
@@ -1,5 +1,5 @@
 #objdump: -dr --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 #name: TARGET reloc
 
 .*:     file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumb-b-bad.d b/gas/testsuite/gas/arm/thumb-b-bad.d
index 958773dbf99..f366827300a 100644
--- a/gas/testsuite/gas/arm/thumb-b-bad.d
+++ b/gas/testsuite/gas/arm/thumb-b-bad.d
@@ -1,4 +1,4 @@
 #name: Out of range Thumb branches (PR 12848)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #as: -mthumb
 #error-output: thumb-b-bad.l
diff --git a/gas/testsuite/gas/arm/thumb-w-bad.d b/gas/testsuite/gas/arm/thumb-w-bad.d
index 7b3b2c0ade5..c257c00f5ff 100644
--- a/gas/testsuite/gas/arm/thumb-w-bad.d
+++ b/gas/testsuite/gas/arm/thumb-w-bad.d
@@ -1,3 +1,3 @@
 #name: Wide instruction rejected in non-Thumb2 cores.
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #error-output: thumb-w-bad.l
diff --git a/gas/testsuite/gas/arm/thumb-w-good.d b/gas/testsuite/gas/arm/thumb-w-good.d
index 4fd7da43d89..0d80ee05a6d 100644
--- a/gas/testsuite/gas/arm/thumb-w-good.d
+++ b/gas/testsuite/gas/arm/thumb-w-good.d
@@ -1,6 +1,6 @@
 #name: Wide instruction acceptance in Thumb-2 cores
 #objdump: -d --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-*-pe *-*-wince *-*-vxworks
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumb.d b/gas/testsuite/gas/arm/thumb.d
index 65d007adf69..d0eae4e638d 100644
--- a/gas/testsuite/gas/arm/thumb.d
+++ b/gas/testsuite/gas/arm/thumb.d
@@ -3,7 +3,7 @@
 # objdump: -dr --prefix-addresses --show-raw-insn
 # The arm-aout and arm-pe ports do not support Thumb branch relocations.
 # EABI targets have their own variant.
-# not-target: *-*-*aout* *-*-pe *-*-*eabi* *-*-symbianelf *-*-nacl*
+# not-target: *-*-pe *-*-*eabi* *-*-symbianelf *-*-nacl*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumb2_it.d b/gas/testsuite/gas/arm/thumb2_it.d
index 073d01f062b..fc31374c42f 100644
--- a/gas/testsuite/gas/arm/thumb2_it.d
+++ b/gas/testsuite/gas/arm/thumb2_it.d
@@ -1,6 +1,5 @@
 # name: Mixed 16 and 32-bit Thumb conditional instructions
 # as: -march=armv6kt2
-#skip: *-*-*aout*
 # objdump: -dr --prefix-addresses --show-raw-insn
 # Modifications to this file shall be mirrored to thumb2_it_auto.d
 
diff --git a/gas/testsuite/gas/arm/thumb2_it_auto.d b/gas/testsuite/gas/arm/thumb2_it_auto.d
index 384d605b69a..fa480f89fa9 100644
--- a/gas/testsuite/gas/arm/thumb2_it_auto.d
+++ b/gas/testsuite/gas/arm/thumb2_it_auto.d
@@ -1,6 +1,5 @@
 # name: Mixed 16 and 32-bit Thumb conditional instructions
 # as: -march=armv6kt2 -mimplicit-it=always
-#skip: *-*-*aout*
 # source: thumb2_it.s
 # objdump: -dr --prefix-addresses --show-raw-insn
 
diff --git a/gas/testsuite/gas/arm/thumb2_it_search.d b/gas/testsuite/gas/arm/thumb2_it_search.d
index 3edaa1b161b..eef84b52f49 100644
--- a/gas/testsuite/gas/arm/thumb2_it_search.d
+++ b/gas/testsuite/gas/arm/thumb2_it_search.d
@@ -1,7 +1,7 @@
 #name: 32-bit Thumb conditional instructions backward search
 #as: -march=armv6kt2
 # This test is only valid on ELF based ports.
-#skip: *-*-*aout* *-*-pe *-*-*coff *-*-wince *-*-netbsd *-*-riscix*
+#skip: *-*-pe *-*-wince
 #source: thumb2_it_search.s
 #objdump: -dr --prefix-addresses --show-raw-insn
 
diff --git a/gas/testsuite/gas/arm/thumb2_ldmstm.d b/gas/testsuite/gas/arm/thumb2_ldmstm.d
index 3ab53ac67ed..295c6a2a129 100644
--- a/gas/testsuite/gas/arm/thumb2_ldmstm.d
+++ b/gas/testsuite/gas/arm/thumb2_ldmstm.d
@@ -1,8 +1,6 @@
 # name: Thumb-2 LDM/STM
 # as: -march=armv6t2
 # objdump: -dr --prefix-addresses --show-raw-insn
-# not-target: *-*-*aout*
-
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d b/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d
index 5291077e529..f37fe31d318 100644
--- a/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d
+++ b/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d
@@ -1,7 +1,7 @@
 # name: Ldr immediate on armv6
 # as: -march=armv6
 # objdump: -dr --prefix-addresses --show-raw-insn
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6t2.d b/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6t2.d
index 09c46a8f181..93f832614b3 100644
--- a/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6t2.d
+++ b/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6t2.d
@@ -1,7 +1,7 @@
 # name: Ldr immediate on armv6t2
 # as: -march=armv6t2
 # objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-pe *-wince-* *-*-coff
+#skip: *-*-pe *-wince-*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d b/gas/testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d
index 7afc1350e53..107657d8d5e 100644
--- a/gas/testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d
+++ b/gas/testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d
@@ -1,7 +1,7 @@
 # name: Ldr small immediate high registers on armv6t2
 # as: -march=armv6t2
 # objdump: -dr --prefix-addresses --show-raw-insn
-# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumb2_pool.d b/gas/testsuite/gas/arm/thumb2_pool.d
index fdf63baaf34..55577da35f7 100644
--- a/gas/testsuite/gas/arm/thumb2_pool.d
+++ b/gas/testsuite/gas/arm/thumb2_pool.d
@@ -1,7 +1,7 @@
 # as: -march=armv6t2
 # objdump: -dr --prefix-addresses --show-raw-insn
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#not-target: *-*-pe *-*-wince *-*-vxworks
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumb2_vpool.d b/gas/testsuite/gas/arm/thumb2_vpool.d
index 5a8cb6f9983..34076146449 100644
--- a/gas/testsuite/gas/arm/thumb2_vpool.d
+++ b/gas/testsuite/gas/arm/thumb2_vpool.d
@@ -1,7 +1,7 @@
 # as: -march=armv6t2 -EL
 # objdump: -dr --prefix-addresses --show-raw-insn
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 #name: Thumb2 vldr with immediate constant
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumb2_vpool_be.d b/gas/testsuite/gas/arm/thumb2_vpool_be.d
index 15aafa5b2ce..164651d5e54 100644
--- a/gas/testsuite/gas/arm/thumb2_vpool_be.d
+++ b/gas/testsuite/gas/arm/thumb2_vpool_be.d
@@ -1,7 +1,7 @@
 # as: -march=armv6t2 -mbig-endian
 # objdump: -dr --prefix-addresses --show-raw-insn
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 #name: Thumb2 vldr with immediate constant
 #source: thumb2_vpool.s
 
diff --git a/gas/testsuite/gas/arm/thumb32.d b/gas/testsuite/gas/arm/thumb32.d
index 8e593a51092..65382b40b27 100644
--- a/gas/testsuite/gas/arm/thumb32.d
+++ b/gas/testsuite/gas/arm/thumb32.d
@@ -2,7 +2,7 @@
 # as: -march=armv6zkt2
 # objdump: -dr --prefix-addresses --show-raw-insn
 # The arm-aout and arm-pe ports do not support Thumb branch relocations.
-# not-target: *-*-*aout* *-*-pe
+# not-target: *-*-pe
 # stderr: thumb32.l
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumbver.d b/gas/testsuite/gas/arm/thumbver.d
index d33d31506d5..49b66d7f90d 100644
--- a/gas/testsuite/gas/arm/thumbver.d
+++ b/gas/testsuite/gas/arm/thumbver.d
@@ -1,7 +1,7 @@
 # as: -meabi=4
 # readelf: -s
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 Symbol table '\.symtab' contains .* entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
diff --git a/gas/testsuite/gas/arm/tls.d b/gas/testsuite/gas/arm/tls.d
index 1ae7ed8a86b..246463379af 100644
--- a/gas/testsuite/gas/arm/tls.d
+++ b/gas/testsuite/gas/arm/tls.d
@@ -1,7 +1,7 @@
 #objdump: -dr
 #name: TLS
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 # VxWorks needs a special variant of this file.
 #skip: *-*-vxworks*
 
diff --git a/gas/testsuite/gas/arm/tls_vxworks.d b/gas/testsuite/gas/arm/tls_vxworks.d
index 62b16b86045..085075b64c1 100644
--- a/gas/testsuite/gas/arm/tls_vxworks.d
+++ b/gas/testsuite/gas/arm/tls_vxworks.d
@@ -1,7 +1,7 @@
 #objdump: -dr
 #name: TLS
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 # This is the VxWorks variant of this file.
 #source: tls.s
 #not-skip: *-*-vxworks*
diff --git a/gas/testsuite/gas/arm/undefined.d b/gas/testsuite/gas/arm/undefined.d
index 3126b84e7d3..897611359f9 100644
--- a/gas/testsuite/gas/arm/undefined.d
+++ b/gas/testsuite/gas/arm/undefined.d
@@ -1,5 +1,5 @@
 #name: Undefined local label error
 # COFF and aout based ports, except Windows CE, 
 # use a different naming convention for local labels.
-#skip: *-*-*coff *-unknown-pe *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#skip: *-unknown-pe *-*-vxworks
 #error-output: undefined.l
diff --git a/gas/testsuite/gas/arm/undefined_coff.d b/gas/testsuite/gas/arm/undefined_coff.d
index a8fb949e7ec..df802d4c8b1 100644
--- a/gas/testsuite/gas/arm/undefined_coff.d
+++ b/gas/testsuite/gas/arm/undefined_coff.d
@@ -1,5 +1,5 @@
 #name: Undefined local label error
 # COFF and aout based ports, except Windows CE, 
 # use a different naming convention for local labels.
-#not-skip: *-*-*coff *-unknown-pe *-*-*aout* *-*-netbsd *-*-riscix*
+#not-skip: *-unknown-pe
 #error-output: undefined_coff.l
diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
index 557c3e47cf7..05f46a02ddb 100644
--- a/gas/testsuite/gas/arm/unwind.d
+++ b/gas/testsuite/gas/arm/unwind.d
@@ -1,7 +1,7 @@
 #objdump: -sr
 #name: Unwind table generation
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 # VxWorks needs a special variant of this file.
 #skip: *-*-vxworks*
 
diff --git a/gas/testsuite/gas/arm/v4bx.d b/gas/testsuite/gas/arm/v4bx.d
index d37c25bf585..587e0028a65 100644
--- a/gas/testsuite/gas/arm/v4bx.d
+++ b/gas/testsuite/gas/arm/v4bx.d
@@ -1,7 +1,7 @@
 # objdump: -dr --prefix-addresses --show-raw-insn
 # as: -meabi=4 --fix-v4bx
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/vcmp-noprefix-imm.d b/gas/testsuite/gas/arm/vcmp-noprefix-imm.d
index 64f37ea007a..15be710d68d 100644
--- a/gas/testsuite/gas/arm/vcmp-noprefix-imm.d
+++ b/gas/testsuite/gas/arm/vcmp-noprefix-imm.d
@@ -1,7 +1,7 @@
 #name: VCMP immediate without prefix
 #as:
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/vcvt-bad.d b/gas/testsuite/gas/arm/vcvt-bad.d
index 20b7798f727..d502a154622 100644
--- a/gas/testsuite/gas/arm/vcvt-bad.d
+++ b/gas/testsuite/gas/arm/vcvt-bad.d
@@ -1,4 +1,4 @@
 #name: Invalid Immediate field for VCVT (between floating-point and fixed-point, VFP)  
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #error-output: vcvt-bad.l
 #as: -mcpu=cortex-a8 -mfpu=vfpv3
diff --git a/gas/testsuite/gas/arm/vfma1.d b/gas/testsuite/gas/arm/vfma1.d
index a60e4308517..be75b15fc35 100644
--- a/gas/testsuite/gas/arm/vfma1.d
+++ b/gas/testsuite/gas/arm/vfma1.d
@@ -2,7 +2,7 @@
 #name: VFMA decoding
 #as: -mcpu=arm7m
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 # Test VFMA instruction disassembly
 
diff --git a/gas/testsuite/gas/arm/vldconst.d b/gas/testsuite/gas/arm/vldconst.d
index 221f3e389d4..74483cc0d72 100644
--- a/gas/testsuite/gas/arm/vldconst.d
+++ b/gas/testsuite/gas/arm/vldconst.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM vldr with immediate constant
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #as: -mcpu=arm7m -EL
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/vldconst_be.d b/gas/testsuite/gas/arm/vldconst_be.d
index f99371bd9c4..63f3c2faa2d 100644
--- a/gas/testsuite/gas/arm/vldconst_be.d
+++ b/gas/testsuite/gas/arm/vldconst_be.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM vldr with immediate constant (Big Endian)
 #as: -mcpu=arm7m -mbig-endian
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+#skip: *-*-pe *-*-wince
 #source: vldconst.s
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/vldm-arm.d b/gas/testsuite/gas/arm/vldm-arm.d
index 37fcb633651..1d0460d1272 100644
--- a/gas/testsuite/gas/arm/vldm-arm.d
+++ b/gas/testsuite/gas/arm/vldm-arm.d
@@ -3,7 +3,7 @@
 # source: vldm.s
 # objdump: -dr --prefix-addresses --show-raw-insn
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/vldr.d b/gas/testsuite/gas/arm/vldr.d
index fbb1560232e..61ba87e1e8f 100644
--- a/gas/testsuite/gas/arm/vldr.d
+++ b/gas/testsuite/gas/arm/vldr.d
@@ -2,7 +2,7 @@
 # as: -mfpu=vfp3 -mcpu=cortex-a8 -mthumb
 # source: vldr.s
 # objdump: -dr --prefix-addresses --show-raw-insn
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
+# skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/weakdef-1.d b/gas/testsuite/gas/arm/weakdef-1.d
index 80535f8117a..8932d19ec09 100644
--- a/gas/testsuite/gas/arm/weakdef-1.d
+++ b/gas/testsuite/gas/arm/weakdef-1.d
@@ -2,7 +2,7 @@
 # as:
 # objdump: -dr
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
+#not-target: *-*-pe *-*-wince *-*-vxworks
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/weakdef-2.d b/gas/testsuite/gas/arm/weakdef-2.d
index e0ff272abb1..cff500f9820 100644
--- a/gas/testsuite/gas/arm/weakdef-2.d
+++ b/gas/testsuite/gas/arm/weakdef-2.d
@@ -2,4 +2,4 @@
 # as:
 # error-output: weakdef-2.l
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-pe *-*-wince
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 366e59e23fe..23843c17269 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 9a4a49fc57a..a905b156020 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 53353cbef52..d2201acef83 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 0dde29e3e0f..1b456117a3d 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 efef2c327d9..00000000000
--- 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 5eccc4c1b8f..00000000000
--- 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 91df7d3c41d..00000000000
--- 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 dd4768daace..00000000000
--- 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 e7f6d92f304..00000000000
--- 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 5de4e8d1751..1350bea980d 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 43e5d29a1a7..00000000000
--- 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 b2d9517e890..00000000000
--- 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 66bdf3f03ab..00000000000
--- 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 942662ec6e0..61b17ba774b 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 c0cdd495e6d..c28acc05f25 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 f81a81e65ee..085a8da27e1 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 368495039af..4e8387a421b 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 3736e590c4d..2b6cfe23139 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 32614ee317d..9e03f8ef703 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 95dc8db4cd5..bca47f04aeb 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 73d70ffcb02..fa4aa8790c6 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 8891e4b2030..5dea876e505 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 fd494bbf78a..1412eb4cdff 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 afd0f8d7147..83966209e82 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 c70da032f72..c19ccae6f8a 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 136ff415306..8252314adaf 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 b7975ded74b..c6b70ba51aa 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 a2b8d733ee0..32cf6893c59 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 45bb023477d..54a1d353118 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 cfbc5dbe4cd..fd6447a1b49 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 ca2016cfde0..f2afa66cad2 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 86257351767..53a325eb962 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 a7e2fff0770..db3a7a67bac 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 581d1b0fa5a..7480a929ff0 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 428410b8144..f0452b67a9a 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 fec7983a3d1..e3c92a2e6dd 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 c97b9cd9add..bb3441628a1 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 139c608e646..2c2bb2d1ec6 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 4724cf447c8..f8d3cce22f0 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 cc192bb3dfc..8328102e24e 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 865351a06eb..d047c717581 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 c9e13545537..c956ee2adae 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 d7a15d7bb64..00e40812121 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 6444bd00a3d..04ddea11c36 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 1d36983304e..8438f4d2201 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 8f9d2e70094..d119ded5e91 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 ab0ff3319f7..1a30439e853 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 e51a41b7564..1223850b578 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 6d19a609ee7..a9f2eeb2a0d 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 650b2641a11..2a5dee9e725 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 f5fb7d77790..3d04776f1ef 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 2e37b47741b..26d90fec67f 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 8c68442b41d..3802b87199b 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 760a82fb65d..68774250e86 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 760a82fb65d..68774250e86 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 22dee2a3b24..cf18747e465 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 7a213186713..ba16004c1e1 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 bdf3bc1c48b..fb269413046 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 78ead24a430..d198e57680f 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 8a01f2d2104..397c3108b95 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 4242822c8d5..10a91739f36 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 f3935169d38..6a16c05deb3 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 f662120c56c..2ffa4e6d95a 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 16cc469683b..98160f8cb67 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 41413b9d6bf..d2c74be0e4f 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 c0b12488a52..d2dc49e7b4c 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 b81fb158850..ae7124c6ff9 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 e9a1e944e48..134822c7809 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 bf756606de0..8cc825e01e8 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 0c9b33e574f..fac3fd95da4 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 54f0c54a44e..01987357672 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 46be48c2238..01e64a9d957 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 cc72d3e4da1..89b57828e8f 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 35eb756e1c3..b5a59b120dd 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 c0fba85666b..191f2a7ee2c 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 bc8cc3f920b..5d5413106fd 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 180482626e4..16d2b3d0a70 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 262d4829b11..04462d600c6 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 6cc7086ccd6..ceeebeb7c7c 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 f0f1fd4785b..330cc7324c7 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.
-- 
2.30.2