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: 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.
---
 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/testsuite/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/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d  |   2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-scalar.d        |   2 +-
 gas/testsuite/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/testsuite/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/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d |   2 +-
 .../gas/arm/thumb2_ldr_immediate_armv6t2.d         |   2 +-
 .../arm/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 +-
 159 files changed, 311 insertions(+), 233 deletions(-)
 delete mode 100644 gas/config/te-riscix.h

(limited to 'gas')

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ba3d8b5..b57224d 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 fa0f65c..9523770 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 873e917..4feabb3 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 eda9890..f7bddd7 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 f50d7c9..53067cf 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 181602c..0000000
--- 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 c43a442..67edc1d 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 1d0e6d9..154b341 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 a9359be..b435f7a 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 d2b3d5b..021bd93 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 1d10e75..30fc346 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 1bab56d..1813fce 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 190f0ab..e0e195b 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 6865702..bdd7480 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 a15ed8c..280269d 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 8c99ab7..b794d58 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 56ed09c..0b0d3cf 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 85a1a01..241f397 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 9e3e286..9c8e32b 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 0e7dfd2..e31a2d6 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 bff265d..1fb337f 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 c039895..2783411 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 bfdd9d6..01e6b2f 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 2a644a3..ea93059 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 1abe049..e404664 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 85d58d6..4ec20da 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 a8a069c..62b1a0d 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 912a447..0fb04fe 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 023bf67..42e8ef4 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 9470497..9bd7b4d 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 2dc4054..47784f5 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 453db31..b40c01e 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 3e71624..4dc6590 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 b6a4e45..026e77f 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 da54c4d..6a1fd17 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 d30aab7..f3af864 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 8aa15fb..4afc3e9 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 318635a..9f1ff03 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 52fdbec..46c204c 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 4237218..469f62d 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 5478ff6..62793aa 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 2bb2713..d227606 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 8aef500..3a7a0de 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 068e13a..0d266ab 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 7f60754..8aff5e9 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 356b5a6..6cad42b 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 6e8c1db..e33ac66 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 6e8c1db..e33ac66 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 894b829..211595d 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 d8cf543..f05d884 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 d8cf543..f05d884 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 d8cf543..f05d884 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 02bb7a4..9b35c9d 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 02bb7a4..9b35c9d 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 02bb7a4..9b35c9d 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 d8cf543..f05d884 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 d8cf543..f05d884 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 d8cf543..f05d884 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 c2e5750..aa115c2 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 d8cf543..f05d884 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 384b7ef..44f8279 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 6e19717..93bea8e 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 5929946..9194372 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 972a511..a09b1ea 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 cef2036..a5ce59b 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 9e52d5b..dec67de 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 8c568c2..7d8c1e6 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 ed587c9..a6b4d79 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 bc559e0..608342c 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 1374553..c163e60 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 4e6fe3f..f8551d0 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 6918e07..468e5c8 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 c389763..0ab0bad 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 9c50654..c85f00f 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 e33159b..f0e1afd 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 e3e3982..6e05f178 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 d32d930..501ebac 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 bd46923..29574f9 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 808bc05..7201db1 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 327de74..3f84b70 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 cdf0047..51d26a1 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 09e3299..61f954c 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 5c6c5e0..0f68ba1 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 cfa0a0c..d827db7 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 fa0941e..5a934ee 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 cd41b26..b731405 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 0c0683a..2aab90e 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 cb46d84..c28671e 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 49b8f09..6aba9bb 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 d3b492a..6072808 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 01b3ad0..4eead58 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 3c3c41f..0d64413 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 c6b09fb..fe461ef 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 2a6fb40..c9c6cfa 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 af41139..3feeb7e 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 e29acf3..167ed00 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 46a3726..1f4283c 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 3dced89..8268f7f 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 c1727c3..bcbc97d 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 6d227d5..23fe3f6 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 e953a27..e5b505b 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 d4a8c8e..cfa6dba 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 c4819d2..32364d3 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 42b300d..393b5c6 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 2c70a72..7a7b39b 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 2d82a1a..6331e19 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 38cd0e8..ffb649d 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 ece640a..823a266 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 6da82ef..7264de66 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 1e94394..5ea3383 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 3febca3..98a3c2d 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 af9562e..45e91b1 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 232e237..331fe4a 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 594ab43..29bcc8e 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 a1595ca..943cbd1 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 ae1faa7..94dc415 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 468bb61..1a5ca24 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 39b1275..a3f1e31 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 76f2833..caa1ec5 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 0d57e66..dc14606 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 ac2a65d..7e8caf3 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 b36cc56..792843e 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 8912706..b40db73 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 c0b1d12..5410e7a 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 44f7e48..75051c9 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 c38eda6..4c83941 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 5850d6b..0b77401 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 7a33b71..f9b4942 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 958773db..f366827 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 7b3b2c0..c257c00 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 4fd7da4..0d80ee0 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 65d007a..d0eae4e 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 073d01f..fc31374 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 384d605..fa480f8 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 3edaa1b..eef84b5 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 3ab53ac..295c6a2 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 5291077..f37fe31 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 09c46a8..93f8326 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 7afc135..107657d 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 fdf63ba..55577da 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 5a8cb6f..3407614 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 15aafa5..164651d 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 8e593a5..65382b4 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 d33d315..49b66d7 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 1ae7ed8..2464633 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 62b16b8..085075b 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 3126b84..8976113 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 a8fb949..df802d4 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 557c3e4..05f46a0 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 d37c25b..587e002 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 64f37ea..15be710 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 20b7798..d502a15 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 a60e430..be75b15 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 221f3e3..74483cc 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 f99371b..63f3c2f 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 37fcb63..1d0460d 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 fbb1560..61ba87e 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 80535f8..8932d19 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 e0ff272..cff500f 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
-- 
cgit v1.1