This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] gas run_dump_test rename stderr and error-output


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e643ed088a085f35b724413140846f739413a78a

commit e643ed088a085f35b724413140846f739413a78a
Author: Alan Modra <amodra@gmail.com>
Date:   Thu Sep 13 16:56:08 2018 +0930

    gas run_dump_test rename stderr and error-output
    
    Use warning_output and error_output, like the ld version of
    run_dump_test.  Note that some tests used the wrong option, and this
    went undetected since the gas version of run_dump_test doesn't
    properly check tool error status.  This patch corrects wrong options,
    in preparation for a later patch that will check error status.
    
    	* testsuite/gas/aarch64/armv8_2-a-crypto-fp16-illegal.d,
    	* testsuite/gas/aarch64/armv8_2-a-illegal.d,
    	* testsuite/gas/aarch64/armv8_4-a-illegal.d,
    	* testsuite/gas/aarch64/armv8_4-a-registers-illegal.d,
    	* testsuite/gas/aarch64/deprecated.d,
    	* testsuite/gas/aarch64/diagnostic.d,
    	* testsuite/gas/aarch64/illegal-2.d,
    	* testsuite/gas/aarch64/illegal-by-element.d,
    	* testsuite/gas/aarch64/illegal-crypto-nofp.d,
    	* testsuite/gas/aarch64/illegal-fcmla.d,
    	* testsuite/gas/aarch64/illegal-fjcvtzs.d,
    	* testsuite/gas/aarch64/illegal-fp16-nofp.d,
    	* testsuite/gas/aarch64/illegal-ldapr.d,
    	* testsuite/gas/aarch64/illegal-ldraa.d,
    	* testsuite/gas/aarch64/illegal-lse.d,
    	* testsuite/gas/aarch64/illegal-nofp-armv8_3.d,
    	* testsuite/gas/aarch64/illegal-nofp16.d,
    	* testsuite/gas/aarch64/illegal-ras-1.d,
    	* testsuite/gas/aarch64/illegal-sysreg-2.d,
    	* testsuite/gas/aarch64/illegal-sysreg-3.d,
    	* testsuite/gas/aarch64/illegal.d,
    	* testsuite/gas/aarch64/legacy_reg_names.d,
    	* testsuite/gas/aarch64/pan-illegal.d,
    	* testsuite/gas/aarch64/pr22529.d,
    	* testsuite/gas/aarch64/rm-simd-ext.d,
    	* testsuite/gas/aarch64/sve-invalid.d,
    	* testsuite/gas/aarch64/sve-reg-diagnostic.d,
    	* testsuite/gas/aarch64/sve-sysreg-invalid.d,
    	* testsuite/gas/aarch64/sysreg-diagnostic.d,
    	* testsuite/gas/aarch64/verbose-error.d,
    	* testsuite/gas/all/byte.d,
    	* testsuite/gas/all/org-1.d,
    	* testsuite/gas/all/org-2.d,
    	* testsuite/gas/all/org-3.d,
    	* testsuite/gas/all/sleb128-9.d,
    	* testsuite/gas/arc/asm-errors-2.d,
    	* testsuite/gas/arc/asm-errors-3.d,
    	* testsuite/gas/arc/asm-errors.d,
    	* testsuite/gas/arc/attr-rf16.d,
    	* testsuite/gas/arc/relocs-errors.d,
    	* testsuite/gas/arc/textinsn-errors.d,
    	* testsuite/gas/arm/addsw-bad.d,
    	* testsuite/gas/arm/addthumb2err.d,
    	* testsuite/gas/arm/adr-invalid.d,
    	* testsuite/gas/arm/arch7em-bad-1.d,
    	* testsuite/gas/arm/arch7em-bad-2.d,
    	* testsuite/gas/arm/arch7em-bad-3.d,
    	* testsuite/gas/arm/arch7m-bad.d,
    	* testsuite/gas/arm/archv6s-m-bad.d,
    	* testsuite/gas/arm/archv6t2-bad.d,
    	* testsuite/gas/arm/arm-idiv-bad.d,
    	* testsuite/gas/arm/arm-it-bad-2.d,
    	* testsuite/gas/arm/arm-it-bad-3.d,
    	* testsuite/gas/arm/arm-it-bad.d,
    	* testsuite/gas/arm/arm3-bad.d,
    	* testsuite/gas/arm/arm7-bad.d,
    	* testsuite/gas/arm/armv1-bad.d,
    	* testsuite/gas/arm/armv1.d,
    	* testsuite/gas/arm/armv2-mp-bad.d,
    	* testsuite/gas/arm/armv8-2-fp16-scalar-bad.d,
    	* testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb.d,
    	* testsuite/gas/arm/armv8-2-fp16-simd-warning.d,
    	* testsuite/gas/arm/armv8-a+rdma-warning.d,
    	* testsuite/gas/arm/armv8-a-bad.d,
    	* testsuite/gas/arm/armv8-a-it-bad.d,
    	* testsuite/gas/arm/armv8-r-bad.d,
    	* testsuite/gas/arm/armv8-r-it-bad.d,
    	* testsuite/gas/arm/armv8_2-a-fp16-illegal.d,
    	* testsuite/gas/arm/armv8_3-a-fp-bad.d,
    	* testsuite/gas/arm/armv8_3-a-simd-bad.d,
    	* testsuite/gas/arm/barrier-bad-thumb.d,
    	* testsuite/gas/arm/barrier-bad.d,
    	* testsuite/gas/arm/bl-local-v4t.d,
    	* testsuite/gas/arm/blx-bl-convert.d,
    	* testsuite/gas/arm/blx-local.d,
    	* testsuite/gas/arm/branch-reloc.d,
    	* testsuite/gas/arm/copro-arm_v2plus-arm_v1.d,
    	* testsuite/gas/arm/copro-arm_v5plus-arm_v4.d,
    	* testsuite/gas/arm/copro-arm_v5teplus-arm_v5.d,
    	* testsuite/gas/arm/copro-arm_v6plus-arm_v5te.d,
    	* testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-1.d,
    	* testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-2.d,
    	* testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-3.d,
    	* testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-4.d,
    	* testsuite/gas/arm/crc32-armv8-a-bad.d,
    	* testsuite/gas/arm/crc32-armv8-r-bad.d,
    	* testsuite/gas/arm/depr-swp.d,
    	* testsuite/gas/arm/dest-unpredictable.d,
    	* testsuite/gas/arm/dotprod-illegal.d,
    	* testsuite/gas/arm/dotprod-legacy-arch.d,
    	* testsuite/gas/arm/forbid-armv7-idiv-ext.d,
    	* testsuite/gas/arm/group-reloc-alu-encoding-bad.d,
    	* testsuite/gas/arm/group-reloc-alu-parsing-bad.d,
    	* testsuite/gas/arm/group-reloc-ldc-encoding-bad.d,
    	* testsuite/gas/arm/group-reloc-ldc-parsing-bad.d,
    	* testsuite/gas/arm/group-reloc-ldr-encoding-bad.d,
    	* testsuite/gas/arm/group-reloc-ldr-parsing-bad.d,
    	* testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d,
    	* testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d,
    	* testsuite/gas/arm/insn-error-a.d,
    	* testsuite/gas/arm/insn-error-t.d,
    	* testsuite/gas/arm/inst-po-2.d,
    	* testsuite/gas/arm/iwmmxt-bad.d,
    	* testsuite/gas/arm/iwmmxt-bad2.d,
    	* testsuite/gas/arm/ld-sp-warn-cortex-m3.d,
    	* testsuite/gas/arm/ld-sp-warn-cortex-m4.d,
    	* testsuite/gas/arm/ld-sp-warn-v7.d,
    	* testsuite/gas/arm/ld-sp-warn-v7a.d,
    	* testsuite/gas/arm/ld-sp-warn-v7em.d,
    	* testsuite/gas/arm/ld-sp-warn-v7m.d,
    	* testsuite/gas/arm/ld-sp-warn-v7r.d,
    	* testsuite/gas/arm/ld-sp-warn.d,
    	* testsuite/gas/arm/ldgesb-bad.d,
    	* testsuite/gas/arm/ldgesh-bad.d,
    	* testsuite/gas/arm/ldr-bad.d,
    	* testsuite/gas/arm/ldr-t-bad.d,
    	* testsuite/gas/arm/ldrd-unpredictable.d,
    	* testsuite/gas/arm/ldsgeb.d,
    	* testsuite/gas/arm/ldsgeh.d,
    	* testsuite/gas/arm/missing.d,
    	* testsuite/gas/arm/mrs-msr-arm-v7-a-bad.d,
    	* testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.d,
    	* testsuite/gas/arm/msr-imm-bad.d,
    	* testsuite/gas/arm/msr-reg-bad.d,
    	* testsuite/gas/arm/mul-overlap.d,
    	* testsuite/gas/arm/neon-addressing-bad.d,
    	* testsuite/gas/arm/neon-cond-bad.d,
    	* testsuite/gas/arm/neon-ldst-align-bad.d,
    	* testsuite/gas/arm/neon-ldst-es-bad.d,
    	* testsuite/gas/arm/neon-suffix-bad.d,
    	* testsuite/gas/arm/neon-vmov-bad.d,
    	* testsuite/gas/arm/noarm.d,
    	* testsuite/gas/arm/pr18256.d,
    	* testsuite/gas/arm/pr18347.d,
    	* testsuite/gas/arm/pr20429.d,
    	* testsuite/gas/arm/pr22773.d,
    	* testsuite/gas/arm/r15-bad.d,
    	* testsuite/gas/arm/reloc-bad.d,
    	* testsuite/gas/arm/req.d,
    	* testsuite/gas/arm/shift-bad-pc.d,
    	* testsuite/gas/arm/shift-bad.d,
    	* testsuite/gas/arm/simd_by_scalar_low_regbank.d,
    	* testsuite/gas/arm/simd_by_scalar_low_regbank_thumb.d,
    	* testsuite/gas/arm/sp-pc-validations-bad-t-v8a.d,
    	* testsuite/gas/arm/sp-pc-validations-bad-t.d,
    	* testsuite/gas/arm/sp-pc-validations-bad.d,
    	* testsuite/gas/arm/sp-usage-thumb2-relax-on-v7.d,
    	* testsuite/gas/arm/srs-arm.d,
    	* testsuite/gas/arm/srs-t2.d,
    	* testsuite/gas/arm/strex-bad-t.d,
    	* testsuite/gas/arm/t16-bad.d,
    	* testsuite/gas/arm/thumb-b-bad.d,
    	* testsuite/gas/arm/thumb-w-bad.d,
    	* testsuite/gas/arm/thumb2_bad_reg.d,
    	* testsuite/gas/arm/thumb2_it_bad.d,
    	* testsuite/gas/arm/thumb2_it_bad_auto.d,
    	* testsuite/gas/arm/thumb2_ldmstm_bad.d,
    	* testsuite/gas/arm/thumb2_ldstd_unpredictable.d,
    	* testsuite/gas/arm/thumb2_mul-bad.d,
    	* testsuite/gas/arm/thumb2_str-bad.d,
    	* testsuite/gas/arm/thumb32.d,
    	* testsuite/gas/arm/udf-bad.d,
    	* testsuite/gas/arm/udf.d,
    	* testsuite/gas/arm/undefined.d,
    	* testsuite/gas/arm/undefined_coff.d,
    	* testsuite/gas/arm/vcmp-zero-bad.d,
    	* testsuite/gas/arm/vcvt-bad.d,
    	* testsuite/gas/arm/vfp-bad.d,
    	* testsuite/gas/arm/vfp-bad_t2.d,
    	* testsuite/gas/arm/vfpv3-d16-bad.d,
    	* testsuite/gas/arm/vldm-thumb-bad.d,
    	* testsuite/gas/arm/vldmw-arm-bad.d,
    	* testsuite/gas/arm/vldmw-thumb-bad.d,
    	* testsuite/gas/arm/vstr-arm-bad.d,
    	* testsuite/gas/arm/vstr-thumb-bad.d,
    	* testsuite/gas/arm/weakdef-2.d,
    	* testsuite/gas/avr/pr21621.d,
    	* testsuite/gas/elf/bad-bss.d,
    	* testsuite/gas/elf/bad-group.d,
    	* testsuite/gas/elf/bad-group.err,
    	* testsuite/gas/elf/bad-section-flag.d,
    	* testsuite/gas/elf/bad-section-flag.err,
    	* testsuite/gas/elf/bad-size.d,
    	* testsuite/gas/elf/bad-size.err,
    	* testsuite/gas/elf/common1.d,
    	* testsuite/gas/elf/common2.d,
    	* testsuite/gas/elf/common5a.d,
    	* testsuite/gas/elf/common5b.d,
    	* testsuite/gas/elf/common5c.d,
    	* testsuite/gas/elf/common5d.d,
    	* testsuite/gas/elf/dwarf2-10.d,
    	* testsuite/gas/elf/dwarf2-8.d,
    	* testsuite/gas/elf/dwarf2-9.d,
    	* testsuite/gas/elf/pr21661.d,
    	* testsuite/gas/elf/pseudo.d,
    	* testsuite/gas/elf/section13.d,
    	* testsuite/gas/i386/bad-size.d,
    	* testsuite/gas/i386/bundle-bad.d,
    	* testsuite/gas/i386/ilp32/x86-64-sse-check-warn.d,
    	* testsuite/gas/i386/intel-intel.d,
    	* testsuite/gas/i386/intel.d,
    	* testsuite/gas/i386/intelok.d,
    	* testsuite/gas/i386/mpx-add-bnd-prefix.d,
    	* testsuite/gas/i386/sse-check-warn.d,
    	* testsuite/gas/i386/string-ok.d,
    	* testsuite/gas/i386/vgather-check-warn.d,
    	* testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d,
    	* testsuite/gas/i386/x86-64-sse-check-warn.d,
    	* testsuite/gas/i386/x86-64-vgather-check-warn.d,
    	* testsuite/gas/mips/addiu-error.d,
    	* testsuite/gas/mips/branch-extern-3.d,
    	* testsuite/gas/mips/branch-extern-4.d,
    	* testsuite/gas/mips/branch-local-2.d,
    	* testsuite/gas/mips/branch-local-3.d,
    	* testsuite/gas/mips/branch-local-5.d,
    	* testsuite/gas/mips/branch-local-6.d,
    	* testsuite/gas/mips/branch-local-n32-2.d,
    	* testsuite/gas/mips/branch-local-n32-3.d,
    	* testsuite/gas/mips/branch-local-n32-5.d,
    	* testsuite/gas/mips/branch-local-n32-6.d,
    	* testsuite/gas/mips/branch-local-n64-2.d,
    	* testsuite/gas/mips/branch-local-n64-3.d,
    	* testsuite/gas/mips/branch-local-n64-5.d,
    	* testsuite/gas/mips/branch-local-n64-6.d,
    	* testsuite/gas/mips/branch-section-3.d,
    	* testsuite/gas/mips/branch-section-4.d,
    	* testsuite/gas/mips/branch-weak-3.d,
    	* testsuite/gas/mips/branch-weak-4.d,
    	* testsuite/gas/mips/break-error.d,
    	* testsuite/gas/mips/crc-err.d,
    	* testsuite/gas/mips/crc64-err.d,
    	* testsuite/gas/mips/ginv-err.d,
    	* testsuite/gas/mips/interaptiv-mr2@isa-override-1.d,
    	* testsuite/gas/mips/interaptiv-mr2@isa-override-2.d,
    	* testsuite/gas/mips/isa-override-2.d,
    	* testsuite/gas/mips/lui-1.d,
    	* testsuite/gas/mips/lui-2.d,
    	* testsuite/gas/mips/macro-warn-1-n32.d,
    	* testsuite/gas/mips/macro-warn-1.d,
    	* testsuite/gas/mips/macro-warn-2.d,
    	* testsuite/gas/mips/macro-warn-3.d,
    	* testsuite/gas/mips/macro-warn-4.d,
    	* testsuite/gas/mips/micromips-branch-delay.d,
    	* testsuite/gas/mips/micromips-branch-relax-insn32-pic.d,
    	* testsuite/gas/mips/micromips-branch-relax-insn32.d,
    	* testsuite/gas/mips/micromips-branch-relax-pic.d,
    	* testsuite/gas/mips/micromips-branch-relax.d,
    	* testsuite/gas/mips/micromips-compact.d,
    	* testsuite/gas/mips/micromips-insn32.d,
    	* testsuite/gas/mips/micromips-noinsn32.d,
    	* testsuite/gas/mips/micromips-size-1.d,
    	* testsuite/gas/mips/micromips-trap.d,
    	* testsuite/gas/mips/micromips-warn-branch-delay.d,
    	* testsuite/gas/mips/micromips.d,
    	* testsuite/gas/mips/micromips@addiu-error.d,
    	* testsuite/gas/mips/micromips@mips5-fp.d,
    	* testsuite/gas/mips/micromips@msa-relax.d,
    	* testsuite/gas/mips/micromips@relax-at.d,
    	* testsuite/gas/mips/micromips@relax-offset.d,
    	* testsuite/gas/mips/micromips@relax.d,
    	* testsuite/gas/mips/mips-gp32-fp64-pic.d,
    	* testsuite/gas/mips/mips-gp32-fp64.d,
    	* testsuite/gas/mips/mips-gp64-fp32-pic.d,
    	* testsuite/gas/mips/mips-gp64-fp32.d,
    	* testsuite/gas/mips/mips-gp64-fp64.d,
    	* testsuite/gas/mips/mips16-32@mips16-insn-e.d,
    	* testsuite/gas/mips/mips16-32@mips16-insn-t.d,
    	* testsuite/gas/mips/mips16-32@mips16-macro-e.d,
    	* testsuite/gas/mips/mips16-32@mips16-macro-t.d,
    	* testsuite/gas/mips/mips16-32@mips16-macro.d,
    	* testsuite/gas/mips/mips16-64@mips16-insn-e.d,
    	* testsuite/gas/mips/mips16-64@mips16-insn-t.d,
    	* testsuite/gas/mips/mips16-absolute-reloc-2.d,
    	* testsuite/gas/mips/mips16-absolute-reloc-3.d,
    	* testsuite/gas/mips/mips16-branch-addend-5.d,
    	* testsuite/gas/mips/mips16-branch-unextended-1.d,
    	* testsuite/gas/mips/mips16-branch-unextended-2.d,
    	* testsuite/gas/mips/mips16-insn-e.d,
    	* testsuite/gas/mips/mips16-insn-t.d,
    	* testsuite/gas/mips/mips16-jal-t.d,
    	* testsuite/gas/mips/mips16-macro-e.d,
    	* testsuite/gas/mips/mips16-macro-t.d,
    	* testsuite/gas/mips/mips16-pcrel-2.d,
    	* testsuite/gas/mips/mips16-pcrel-3.d,
    	* testsuite/gas/mips/mips16-pcrel-4.d,
    	* testsuite/gas/mips/mips16-pcrel-5.d,
    	* testsuite/gas/mips/mips16-pcrel-absolute-n64-4.d,
    	* testsuite/gas/mips/mips16-pcrel-absolute-n64-6.d,
    	* testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-4.d,
    	* testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-6.d,
    	* testsuite/gas/mips/mips16-pcrel-addend-n64-8.d,
    	* testsuite/gas/mips/mips16-pcrel-addend-n64-9.d,
    	* testsuite/gas/mips/mips16-pcrel-addend-pic-8.d,
    	* testsuite/gas/mips/mips16-pcrel-addend-pic-9.d,
    	* testsuite/gas/mips/mips16-pcrel-delay-0.d,
    	* testsuite/gas/mips/mips16-pcrel-delay-1.d,
    	* testsuite/gas/mips/mips16-pcrel-n64-0.d,
    	* testsuite/gas/mips/mips16-pcrel-n64-1.d,
    	* testsuite/gas/mips/mips16-pcrel-pic-0.d,
    	* testsuite/gas/mips/mips16-pcrel-pic-1.d,
    	* testsuite/gas/mips/mips16-reg-error.d,
    	* testsuite/gas/mips/mips16-relax-unextended-1.d,
    	* testsuite/gas/mips/mips16-relax-unextended-2.d,
    	* testsuite/gas/mips/mips16-reloc-error.d,
    	* testsuite/gas/mips/mips16-sdrasp.d,
    	* testsuite/gas/mips/mips16@addiu-error.d,
    	* testsuite/gas/mips/mips16e-32@mips16-insn-e.d,
    	* testsuite/gas/mips/mips16e-32@mips16-insn-t.d,
    	* testsuite/gas/mips/mips16e-32@mips16-macro-e.d,
    	* testsuite/gas/mips/mips16e-32@mips16-macro-t.d,
    	* testsuite/gas/mips/mips16e-32@mips16-macro.d,
    	* testsuite/gas/mips/mips16e-32@mips16e-64.d,
    	* testsuite/gas/mips/mips16e2-32@mips16-insn-e.d,
    	* testsuite/gas/mips/mips16e2-32@mips16-insn-t.d,
    	* testsuite/gas/mips/mips16e2-32@mips16-macro-e.d,
    	* testsuite/gas/mips/mips16e2-32@mips16-macro-t.d,
    	* testsuite/gas/mips/mips16e2-32@mips16-macro.d,
    	* testsuite/gas/mips/mips16e2-32@mips16e-64.d,
    	* testsuite/gas/mips/mips16e2-copy-err.d,
    	* testsuite/gas/mips/mips16e2-imm-error.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-e.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-t.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-sub.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64-sub.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64.d,
    	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-sub.d,
    	* testsuite/gas/mips/mips16e2-mt-err.d,
    	* testsuite/gas/mips/mips16e2-reloc-error.d,
    	* testsuite/gas/mips/mips16e2@lui-2.d,
    	* testsuite/gas/mips/mips16e2@mips16-pcrel-2.d,
    	* testsuite/gas/mips/mips16e2@mips16-pcrel-delay-0.d,
    	* testsuite/gas/mips/mips16e2@mips16-pcrel-delay-1.d,
    	* testsuite/gas/mips/mips1@isa-override-2.d,
    	* testsuite/gas/mips/mips1@relax-offset.d,
    	* testsuite/gas/mips/mips2@isa-override-2.d,
    	* testsuite/gas/mips/mips32-mt.d,
    	* testsuite/gas/mips/mips32@isa-override-2.d,
    	* testsuite/gas/mips/mips32r2@isa-override-2.d,
    	* testsuite/gas/mips/mips32r3@isa-override-2.d,
    	* testsuite/gas/mips/mips32r5@isa-override-2.d,
    	* testsuite/gas/mips/mips32r6@isa-override-2.d,
    	* testsuite/gas/mips/mips5-fp.d,
    	* testsuite/gas/mips/mips64-mips3d-incl.d,
    	* testsuite/gas/mips/mips64-mips3d.d,
    	* testsuite/gas/mips/mipsr6@mips5-fp.d,
    	* testsuite/gas/mips/msa-relax.d,
    	* testsuite/gas/mips/octeon3@isa-override-1.d,
    	* testsuite/gas/mips/octeon3@isa-override-2.d,
    	* testsuite/gas/mips/option-pic-relax-2.d,
    	* testsuite/gas/mips/option-pic-relax-3.d,
    	* testsuite/gas/mips/option-pic-relax-4.d,
    	* testsuite/gas/mips/option-pic-relax-5.d,
    	* testsuite/gas/mips/org-1.d,
    	* testsuite/gas/mips/org-10.d,
    	* testsuite/gas/mips/org-4.d,
    	* testsuite/gas/mips/org-5.d,
    	* testsuite/gas/mips/org-6.d,
    	* testsuite/gas/mips/r3000@isa-override-2.d,
    	* testsuite/gas/mips/r3000@relax-offset.d,
    	* testsuite/gas/mips/r3900@isa-override-2.d,
    	* testsuite/gas/mips/r3900@relax-offset.d,
    	* testsuite/gas/mips/reginfo-2-n32.d,
    	* testsuite/gas/mips/reginfo-2.d,
    	* testsuite/gas/mips/relax-at.d,
    	* testsuite/gas/mips/relax-offset.d,
    	* testsuite/gas/mips/relax-swap1-mips1.d,
    	* testsuite/gas/mips/relax-swap1-mips2.d,
    	* testsuite/gas/mips/relax-swap2.d,
    	* testsuite/gas/mips/relax.d,
    	* testsuite/gas/mips/save-err.d,
    	* testsuite/gas/mips/set-arch.d,
    	* testsuite/gas/mips/xpa-err.d,
    	* testsuite/gas/mips/xpa-virt-err.d,
    	* testsuite/gas/msp430/bad.d,
    	* testsuite/gas/msp430/errata_warns.d,
    	* testsuite/gas/msp430/pr22133.d,
    	* testsuite/gas/ppc/lsp-checks.d,
    	* testsuite/gas/ppc/misalign.d,
    	* testsuite/gas/ppc/spe2-checks.d,
    	* testsuite/gas/riscv/bad-csr.d,
    	* testsuite/gas/riscv/c-addi16sp-fail.d,
    	* testsuite/gas/riscv/c-addi4spn-fail.d,
    	* testsuite/gas/riscv/c-fld-fsd-fail.d,
    	* testsuite/gas/riscv/c-lui-fail.d,
    	* testsuite/gas/riscv/c-nonzero-imm.d,
    	* testsuite/gas/riscv/c-nonzero-reg.d,
    	* testsuite/gas/riscv/fence-fail.d,
    	* testsuite/gas/riscv/lla64-fail.d,
    	* testsuite/gas/riscv/rouding-fail.d,
    	* testsuite/gas/sh/pcrel-hms.d,
    	* testsuite/gas/sh/pcrel.d,
    	* testsuite/gas/sparc/dcti-couples-v8.d,
    	* testsuite/gas/sparc/dcti-couples-v9c.d,
    	* testsuite/gas/tic6x/arch-invalid-1.d,
    	* testsuite/gas/tic6x/arch-invalid-2.d,
    	* testsuite/gas/tic6x/dir-junk.d,
    	* testsuite/gas/tic6x/insns-bad-1.d,
    	* testsuite/gas/tic6x/insns-bad-2.d,
    	* testsuite/gas/tic6x/parallel-bad-1.d,
    	* testsuite/gas/tic6x/parallel-bad-2.d,
    	* testsuite/gas/tic6x/parallel-bad-3.d,
    	* testsuite/gas/tic6x/parallel-bad-4.d,
    	* testsuite/gas/tic6x/predicate-bad-1.d,
    	* testsuite/gas/tic6x/predicate-bad-2.d,
    	* testsuite/gas/tic6x/predicate-bad-3.d,
    	* testsuite/gas/tic6x/reloc-bad-1.d,
    	* testsuite/gas/tic6x/reloc-bad-2.d,
    	* testsuite/gas/tic6x/reloc-bad-3.d,
    	* testsuite/gas/tic6x/reloc-bad-4.d,
    	* testsuite/gas/tic6x/reloc-bad-5.d,
    	* testsuite/gas/tic6x/reloc-bad-6.d,
    	* testsuite/gas/tic6x/resource-func-unit-1.d,
    	* testsuite/gas/tic6x/resource-func-unit-2.d,
    	* testsuite/gas/tic6x/sploop-bad-1.d,
    	* testsuite/gas/tic6x/sploop-bad-2.d,
    	* testsuite/gas/tic6x/sploop-bad-3.d,
    	* testsuite/gas/tic6x/sploop-bad-4.d,
    	* testsuite/gas/tic6x/sploop-bad-5.d,
    	* testsuite/gas/tic6x/sploop-bad-6.d,
    	* testsuite/gas/tic6x/sploop-bad-7.d,
    	* testsuite/gas/tic6x/unwind-bad-1.d,
    	* testsuite/gas/tic6x/unwind-bad-2.d,
    	* testsuite/lib/gas-defs.exp (run_dump_tests): Replace stderr
    	and error-output with warning_output and error_output.
    	(slurp_options): Accept underscore rather than dash.

Diff:
---
 gas/ChangeLog                                      | 431 +++++++++++++++++++++
 .../gas/aarch64/armv8_2-a-crypto-fp16-illegal.d    |   2 +-
 gas/testsuite/gas/aarch64/armv8_2-a-illegal.d      |   2 +-
 gas/testsuite/gas/aarch64/armv8_4-a-illegal.d      |   2 +-
 .../gas/aarch64/armv8_4-a-registers-illegal.d      |   2 +-
 gas/testsuite/gas/aarch64/deprecated.d             |   2 +-
 gas/testsuite/gas/aarch64/diagnostic.d             |   2 +-
 gas/testsuite/gas/aarch64/illegal-2.d              |   2 +-
 gas/testsuite/gas/aarch64/illegal-by-element.d     |   2 +-
 gas/testsuite/gas/aarch64/illegal-crypto-nofp.d    |   2 +-
 gas/testsuite/gas/aarch64/illegal-fcmla.d          |   2 +-
 gas/testsuite/gas/aarch64/illegal-fjcvtzs.d        |   2 +-
 gas/testsuite/gas/aarch64/illegal-fp16-nofp.d      |   2 +-
 gas/testsuite/gas/aarch64/illegal-ldapr.d          |   2 +-
 gas/testsuite/gas/aarch64/illegal-ldraa.d          |   2 +-
 gas/testsuite/gas/aarch64/illegal-lse.d            |   2 +-
 gas/testsuite/gas/aarch64/illegal-nofp-armv8_3.d   |   2 +-
 gas/testsuite/gas/aarch64/illegal-nofp16.d         |   2 +-
 gas/testsuite/gas/aarch64/illegal-ras-1.d          |   2 +-
 gas/testsuite/gas/aarch64/illegal-sysreg-2.d       |   2 +-
 gas/testsuite/gas/aarch64/illegal-sysreg-3.d       |   2 +-
 gas/testsuite/gas/aarch64/illegal.d                |   2 +-
 gas/testsuite/gas/aarch64/legacy_reg_names.d       |   2 +-
 gas/testsuite/gas/aarch64/pan-illegal.d            |   2 +-
 gas/testsuite/gas/aarch64/pr22529.d                |   2 +-
 gas/testsuite/gas/aarch64/rm-simd-ext.d            |   2 +-
 gas/testsuite/gas/aarch64/sve-invalid.d            |   2 +-
 gas/testsuite/gas/aarch64/sve-reg-diagnostic.d     |   2 +-
 gas/testsuite/gas/aarch64/sve-sysreg-invalid.d     |   2 +-
 gas/testsuite/gas/aarch64/sysreg-diagnostic.d      |   2 +-
 gas/testsuite/gas/aarch64/verbose-error.d          |   2 +-
 gas/testsuite/gas/all/byte.d                       |   2 +-
 gas/testsuite/gas/all/org-1.d                      |   2 +-
 gas/testsuite/gas/all/org-2.d                      |   2 +-
 gas/testsuite/gas/all/org-3.d                      |   2 +-
 gas/testsuite/gas/all/sleb128-9.d                  |   2 +-
 gas/testsuite/gas/arc/asm-errors-2.d               |   2 +-
 gas/testsuite/gas/arc/asm-errors-3.d               |   2 +-
 gas/testsuite/gas/arc/asm-errors.d                 |   2 +-
 gas/testsuite/gas/arc/attr-rf16.d                  |   2 +-
 gas/testsuite/gas/arc/relocs-errors.d              |   2 +-
 gas/testsuite/gas/arc/textinsn-errors.d            |   2 +-
 gas/testsuite/gas/arm/addsw-bad.d                  |   2 +-
 gas/testsuite/gas/arm/addthumb2err.d               |   2 +-
 gas/testsuite/gas/arm/adr-invalid.d                |   2 +-
 gas/testsuite/gas/arm/arch7em-bad-1.d              |   2 +-
 gas/testsuite/gas/arm/arch7em-bad-2.d              |   2 +-
 gas/testsuite/gas/arm/arch7em-bad-3.d              |   2 +-
 gas/testsuite/gas/arm/arch7m-bad.d                 |   2 +-
 gas/testsuite/gas/arm/archv6s-m-bad.d              |   2 +-
 gas/testsuite/gas/arm/archv6t2-bad.d               |   2 +-
 gas/testsuite/gas/arm/arm-idiv-bad.d               |   2 +-
 gas/testsuite/gas/arm/arm-it-bad-2.d               |   2 +-
 gas/testsuite/gas/arm/arm-it-bad-3.d               |   2 +-
 gas/testsuite/gas/arm/arm-it-bad.d                 |   2 +-
 gas/testsuite/gas/arm/arm3-bad.d                   |   2 +-
 gas/testsuite/gas/arm/arm7-bad.d                   |   2 +-
 gas/testsuite/gas/arm/armv1-bad.d                  |   2 +-
 gas/testsuite/gas/arm/armv1.d                      |   2 +-
 gas/testsuite/gas/arm/armv2-mp-bad.d               |   2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.d    |   2 +-
 .../gas/arm/armv8-2-fp16-simd-warning-thumb.d      |   2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-simd-warning.d  |   2 +-
 gas/testsuite/gas/arm/armv8-a+rdma-warning.d       |   2 +-
 gas/testsuite/gas/arm/armv8-a-bad.d                |   2 +-
 gas/testsuite/gas/arm/armv8-a-it-bad.d             |   2 +-
 gas/testsuite/gas/arm/armv8-r-bad.d                |   2 +-
 gas/testsuite/gas/arm/armv8-r-it-bad.d             |   2 +-
 gas/testsuite/gas/arm/armv8_2-a-fp16-illegal.d     |   2 +-
 gas/testsuite/gas/arm/armv8_3-a-fp-bad.d           |   2 +-
 gas/testsuite/gas/arm/armv8_3-a-simd-bad.d         |   2 +-
 gas/testsuite/gas/arm/barrier-bad-thumb.d          |   2 +-
 gas/testsuite/gas/arm/barrier-bad.d                |   2 +-
 gas/testsuite/gas/arm/bl-local-v4t.d               |   2 +-
 gas/testsuite/gas/arm/blx-bl-convert.d             |   2 +-
 gas/testsuite/gas/arm/blx-local.d                  |   2 +-
 gas/testsuite/gas/arm/branch-reloc.d               |   2 +-
 gas/testsuite/gas/arm/copro-arm_v2plus-arm_v1.d    |   2 +-
 gas/testsuite/gas/arm/copro-arm_v5plus-arm_v4.d    |   2 +-
 gas/testsuite/gas/arm/copro-arm_v5teplus-arm_v5.d  |   2 +-
 gas/testsuite/gas/arm/copro-arm_v6plus-arm_v5te.d  |   2 +-
 .../gas/arm/copro-thumb_v6t2plus-thumb_v4t-1.d     |   2 +-
 .../gas/arm/copro-thumb_v6t2plus-thumb_v4t-2.d     |   2 +-
 .../gas/arm/copro-thumb_v6t2plus-thumb_v4t-3.d     |   2 +-
 .../gas/arm/copro-thumb_v6t2plus-thumb_v4t-4.d     |   2 +-
 gas/testsuite/gas/arm/crc32-armv8-a-bad.d          |   2 +-
 gas/testsuite/gas/arm/crc32-armv8-r-bad.d          |   2 +-
 gas/testsuite/gas/arm/depr-swp.d                   |   2 +-
 gas/testsuite/gas/arm/dest-unpredictable.d         |   2 +-
 gas/testsuite/gas/arm/dotprod-illegal.d            |   2 +-
 gas/testsuite/gas/arm/dotprod-legacy-arch.d        |   2 +-
 gas/testsuite/gas/arm/forbid-armv7-idiv-ext.d      |   2 +-
 .../gas/arm/group-reloc-alu-encoding-bad.d         |   2 +-
 .../gas/arm/group-reloc-alu-parsing-bad.d          |   2 +-
 .../gas/arm/group-reloc-ldc-encoding-bad.d         |   2 +-
 .../gas/arm/group-reloc-ldc-parsing-bad.d          |   2 +-
 .../gas/arm/group-reloc-ldr-encoding-bad.d         |   2 +-
 .../gas/arm/group-reloc-ldr-parsing-bad.d          |   2 +-
 .../gas/arm/group-reloc-ldrs-encoding-bad.d        |   2 +-
 .../gas/arm/group-reloc-ldrs-parsing-bad.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/iwmmxt-bad.d                 |   2 +-
 gas/testsuite/gas/arm/iwmmxt-bad2.d                |   2 +-
 gas/testsuite/gas/arm/ld-sp-warn-cortex-m3.d       |   2 +-
 gas/testsuite/gas/arm/ld-sp-warn-cortex-m4.d       |   2 +-
 gas/testsuite/gas/arm/ld-sp-warn-v7.d              |   2 +-
 gas/testsuite/gas/arm/ld-sp-warn-v7a.d             |   2 +-
 gas/testsuite/gas/arm/ld-sp-warn-v7em.d            |   2 +-
 gas/testsuite/gas/arm/ld-sp-warn-v7m.d             |   2 +-
 gas/testsuite/gas/arm/ld-sp-warn-v7r.d             |   2 +-
 gas/testsuite/gas/arm/ld-sp-warn.d                 |   2 +-
 gas/testsuite/gas/arm/ldgesb-bad.d                 |   2 +-
 gas/testsuite/gas/arm/ldgesh-bad.d                 |   2 +-
 gas/testsuite/gas/arm/ldr-bad.d                    |   2 +-
 gas/testsuite/gas/arm/ldr-t-bad.d                  |   2 +-
 gas/testsuite/gas/arm/ldrd-unpredictable.d         |   2 +-
 gas/testsuite/gas/arm/ldsgeb.d                     |   2 +-
 gas/testsuite/gas/arm/ldsgeh.d                     |   2 +-
 gas/testsuite/gas/arm/missing.d                    |   2 +-
 gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.d       |   2 +-
 gas/testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.d     |   2 +-
 gas/testsuite/gas/arm/msr-imm-bad.d                |   2 +-
 gas/testsuite/gas/arm/msr-reg-bad.d                |   2 +-
 gas/testsuite/gas/arm/mul-overlap.d                |   2 +-
 gas/testsuite/gas/arm/neon-addressing-bad.d        |   2 +-
 gas/testsuite/gas/arm/neon-cond-bad.d              |   2 +-
 gas/testsuite/gas/arm/neon-ldst-align-bad.d        |   2 +-
 gas/testsuite/gas/arm/neon-ldst-es-bad.d           |   2 +-
 gas/testsuite/gas/arm/neon-suffix-bad.d            |   2 +-
 gas/testsuite/gas/arm/neon-vmov-bad.d              |   2 +-
 gas/testsuite/gas/arm/noarm.d                      |   2 +-
 gas/testsuite/gas/arm/pr18256.d                    |   2 +-
 gas/testsuite/gas/arm/pr18347.d                    |   2 +-
 gas/testsuite/gas/arm/pr20429.d                    |   2 +-
 gas/testsuite/gas/arm/pr22773.d                    |   2 +-
 gas/testsuite/gas/arm/r15-bad.d                    |   2 +-
 gas/testsuite/gas/arm/reloc-bad.d                  |   2 +-
 gas/testsuite/gas/arm/req.d                        |   2 +-
 gas/testsuite/gas/arm/shift-bad-pc.d               |   2 +-
 gas/testsuite/gas/arm/shift-bad.d                  |   2 +-
 gas/testsuite/gas/arm/simd_by_scalar_low_regbank.d |   2 +-
 .../gas/arm/simd_by_scalar_low_regbank_thumb.d     |   2 +-
 .../gas/arm/sp-pc-validations-bad-t-v8a.d          |   2 +-
 gas/testsuite/gas/arm/sp-pc-validations-bad-t.d    |   2 +-
 gas/testsuite/gas/arm/sp-pc-validations-bad.d      |   2 +-
 .../gas/arm/sp-usage-thumb2-relax-on-v7.d          |   2 +-
 gas/testsuite/gas/arm/srs-arm.d                    |   2 +-
 gas/testsuite/gas/arm/srs-t2.d                     |   2 +-
 gas/testsuite/gas/arm/strex-bad-t.d                |   2 +-
 gas/testsuite/gas/arm/t16-bad.d                    |   2 +-
 gas/testsuite/gas/arm/thumb-b-bad.d                |   2 +-
 gas/testsuite/gas/arm/thumb-w-bad.d                |   2 +-
 gas/testsuite/gas/arm/thumb2_bad_reg.d             |   2 +-
 gas/testsuite/gas/arm/thumb2_it_bad.d              |   2 +-
 gas/testsuite/gas/arm/thumb2_it_bad_auto.d         |   2 +-
 gas/testsuite/gas/arm/thumb2_ldmstm_bad.d          |   2 +-
 gas/testsuite/gas/arm/thumb2_ldstd_unpredictable.d |   2 +-
 gas/testsuite/gas/arm/thumb2_mul-bad.d             |   2 +-
 gas/testsuite/gas/arm/thumb2_str-bad.d             |   2 +-
 gas/testsuite/gas/arm/thumb32.d                    |   2 +-
 gas/testsuite/gas/arm/udf-bad.d                    |   2 +-
 gas/testsuite/gas/arm/udf.d                        |   2 +-
 gas/testsuite/gas/arm/undefined.d                  |   2 +-
 gas/testsuite/gas/arm/undefined_coff.d             |   2 +-
 gas/testsuite/gas/arm/vcmp-zero-bad.d              |   2 +-
 gas/testsuite/gas/arm/vcvt-bad.d                   |   2 +-
 gas/testsuite/gas/arm/vfp-bad.d                    |   2 +-
 gas/testsuite/gas/arm/vfp-bad_t2.d                 |   2 +-
 gas/testsuite/gas/arm/vfpv3-d16-bad.d              |   2 +-
 gas/testsuite/gas/arm/vldm-thumb-bad.d             |   2 +-
 gas/testsuite/gas/arm/vldmw-arm-bad.d              |   2 +-
 gas/testsuite/gas/arm/vldmw-thumb-bad.d            |   2 +-
 gas/testsuite/gas/arm/vstr-arm-bad.d               |   2 +-
 gas/testsuite/gas/arm/vstr-thumb-bad.d             |   2 +-
 gas/testsuite/gas/arm/weakdef-2.d                  |   4 +-
 gas/testsuite/gas/avr/pr21621.d                    |   2 +-
 gas/testsuite/gas/elf/bad-bss.d                    |   2 +-
 gas/testsuite/gas/elf/bad-group.d                  |   2 +-
 gas/testsuite/gas/elf/bad-group.err                |   4 +-
 gas/testsuite/gas/elf/bad-section-flag.d           |   2 +-
 gas/testsuite/gas/elf/bad-section-flag.err         |   4 +-
 gas/testsuite/gas/elf/bad-size.d                   |   2 +-
 gas/testsuite/gas/elf/bad-size.err                 |   4 +-
 gas/testsuite/gas/elf/common1.d                    |   2 +-
 gas/testsuite/gas/elf/common2.d                    |   2 +-
 gas/testsuite/gas/elf/common5a.d                   |   2 +-
 gas/testsuite/gas/elf/common5b.d                   |   2 +-
 gas/testsuite/gas/elf/common5c.d                   |   2 +-
 gas/testsuite/gas/elf/common5d.d                   |   2 +-
 gas/testsuite/gas/elf/dwarf2-10.d                  |   2 +-
 gas/testsuite/gas/elf/dwarf2-8.d                   |   2 +-
 gas/testsuite/gas/elf/dwarf2-9.d                   |   2 +-
 gas/testsuite/gas/elf/pr21661.d                    |   2 +-
 gas/testsuite/gas/elf/pseudo.d                     |   2 +-
 gas/testsuite/gas/elf/section13.d                  |   2 +-
 gas/testsuite/gas/i386/bad-size.d                  |   2 +-
 gas/testsuite/gas/i386/bundle-bad.d                |   2 +-
 .../gas/i386/ilp32/x86-64-sse-check-warn.d         |   2 +-
 gas/testsuite/gas/i386/intel-intel.d               |   2 +-
 gas/testsuite/gas/i386/intel.d                     |   2 +-
 gas/testsuite/gas/i386/intelok.d                   |   2 +-
 gas/testsuite/gas/i386/mpx-add-bnd-prefix.d        |   2 +-
 gas/testsuite/gas/i386/sse-check-warn.d            |   2 +-
 gas/testsuite/gas/i386/string-ok.d                 |   2 +-
 gas/testsuite/gas/i386/vgather-check-warn.d        |   2 +-
 gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d |   2 +-
 gas/testsuite/gas/i386/x86-64-sse-check-warn.d     |   2 +-
 gas/testsuite/gas/i386/x86-64-vgather-check-warn.d |   2 +-
 gas/testsuite/gas/mips/addiu-error.d               |   2 +-
 gas/testsuite/gas/mips/branch-extern-3.d           |   2 +-
 gas/testsuite/gas/mips/branch-extern-4.d           |   2 +-
 gas/testsuite/gas/mips/branch-local-2.d            |   2 +-
 gas/testsuite/gas/mips/branch-local-3.d            |   2 +-
 gas/testsuite/gas/mips/branch-local-5.d            |   2 +-
 gas/testsuite/gas/mips/branch-local-6.d            |   2 +-
 gas/testsuite/gas/mips/branch-local-n32-2.d        |   2 +-
 gas/testsuite/gas/mips/branch-local-n32-3.d        |   2 +-
 gas/testsuite/gas/mips/branch-local-n32-5.d        |   2 +-
 gas/testsuite/gas/mips/branch-local-n32-6.d        |   2 +-
 gas/testsuite/gas/mips/branch-local-n64-2.d        |   2 +-
 gas/testsuite/gas/mips/branch-local-n64-3.d        |   2 +-
 gas/testsuite/gas/mips/branch-local-n64-5.d        |   2 +-
 gas/testsuite/gas/mips/branch-local-n64-6.d        |   2 +-
 gas/testsuite/gas/mips/branch-section-3.d          |   2 +-
 gas/testsuite/gas/mips/branch-section-4.d          |   2 +-
 gas/testsuite/gas/mips/branch-weak-3.d             |   2 +-
 gas/testsuite/gas/mips/branch-weak-4.d             |   2 +-
 gas/testsuite/gas/mips/break-error.d               |   2 +-
 gas/testsuite/gas/mips/crc-err.d                   |   2 +-
 gas/testsuite/gas/mips/crc64-err.d                 |   2 +-
 gas/testsuite/gas/mips/ginv-err.d                  |   2 +-
 .../gas/mips/interaptiv-mr2@isa-override-1.d       |   2 +-
 .../gas/mips/interaptiv-mr2@isa-override-2.d       |   2 +-
 gas/testsuite/gas/mips/isa-override-2.d            |   2 +-
 gas/testsuite/gas/mips/lui-1.d                     |   2 +-
 gas/testsuite/gas/mips/lui-2.d                     |   2 +-
 gas/testsuite/gas/mips/macro-warn-1-n32.d          |   2 +-
 gas/testsuite/gas/mips/macro-warn-1.d              |   2 +-
 gas/testsuite/gas/mips/macro-warn-2.d              |   2 +-
 gas/testsuite/gas/mips/macro-warn-3.d              |   2 +-
 gas/testsuite/gas/mips/macro-warn-4.d              |   2 +-
 gas/testsuite/gas/mips/micromips-branch-delay.d    |   2 +-
 .../gas/mips/micromips-branch-relax-insn32-pic.d   |   2 +-
 .../gas/mips/micromips-branch-relax-insn32.d       |   2 +-
 .../gas/mips/micromips-branch-relax-pic.d          |   2 +-
 gas/testsuite/gas/mips/micromips-branch-relax.d    |   2 +-
 gas/testsuite/gas/mips/micromips-compact.d         |   2 +-
 gas/testsuite/gas/mips/micromips-insn32.d          |   2 +-
 gas/testsuite/gas/mips/micromips-noinsn32.d        |   2 +-
 gas/testsuite/gas/mips/micromips-size-1.d          |   2 +-
 gas/testsuite/gas/mips/micromips-trap.d            |   2 +-
 .../gas/mips/micromips-warn-branch-delay.d         |   2 +-
 gas/testsuite/gas/mips/micromips.d                 |   2 +-
 gas/testsuite/gas/mips/micromips@addiu-error.d     |   2 +-
 gas/testsuite/gas/mips/micromips@mips5-fp.d        |   2 +-
 gas/testsuite/gas/mips/micromips@msa-relax.d       |   2 +-
 gas/testsuite/gas/mips/micromips@relax-at.d        |   2 +-
 gas/testsuite/gas/mips/micromips@relax-offset.d    |   2 +-
 gas/testsuite/gas/mips/micromips@relax.d           |   2 +-
 gas/testsuite/gas/mips/mips-gp32-fp64-pic.d        |   2 +-
 gas/testsuite/gas/mips/mips-gp32-fp64.d            |   2 +-
 gas/testsuite/gas/mips/mips-gp64-fp32-pic.d        |   2 +-
 gas/testsuite/gas/mips/mips-gp64-fp32.d            |   2 +-
 gas/testsuite/gas/mips/mips-gp64-fp64.d            |   2 +-
 gas/testsuite/gas/mips/mips16-32@mips16-insn-e.d   |   2 +-
 gas/testsuite/gas/mips/mips16-32@mips16-insn-t.d   |   2 +-
 gas/testsuite/gas/mips/mips16-32@mips16-macro-e.d  |   2 +-
 gas/testsuite/gas/mips/mips16-32@mips16-macro-t.d  |   2 +-
 gas/testsuite/gas/mips/mips16-32@mips16-macro.d    |   2 +-
 gas/testsuite/gas/mips/mips16-64@mips16-insn-e.d   |   2 +-
 gas/testsuite/gas/mips/mips16-64@mips16-insn-t.d   |   2 +-
 gas/testsuite/gas/mips/mips16-absolute-reloc-2.d   |   2 +-
 gas/testsuite/gas/mips/mips16-absolute-reloc-3.d   |   2 +-
 gas/testsuite/gas/mips/mips16-branch-addend-5.d    |   2 +-
 .../gas/mips/mips16-branch-unextended-1.d          |   2 +-
 .../gas/mips/mips16-branch-unextended-2.d          |   2 +-
 gas/testsuite/gas/mips/mips16-insn-e.d             |   2 +-
 gas/testsuite/gas/mips/mips16-insn-t.d             |   2 +-
 gas/testsuite/gas/mips/mips16-jal-t.d              |   2 +-
 gas/testsuite/gas/mips/mips16-macro-e.d            |   2 +-
 gas/testsuite/gas/mips/mips16-macro-t.d            |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-2.d            |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-3.d            |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-4.d            |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-5.d            |   2 +-
 .../gas/mips/mips16-pcrel-absolute-n64-4.d         |   2 +-
 .../gas/mips/mips16-pcrel-absolute-n64-6.d         |   2 +-
 .../gas/mips/mips16-pcrel-absolute-pic-n64-4.d     |   2 +-
 .../gas/mips/mips16-pcrel-absolute-pic-n64-6.d     |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-addend-n64-8.d |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-addend-n64-9.d |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-addend-pic-8.d |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-addend-pic-9.d |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-delay-0.d      |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-delay-1.d      |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-n64-0.d        |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-n64-1.d        |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-pic-0.d        |   2 +-
 gas/testsuite/gas/mips/mips16-pcrel-pic-1.d        |   2 +-
 gas/testsuite/gas/mips/mips16-reg-error.d          |   2 +-
 gas/testsuite/gas/mips/mips16-relax-unextended-1.d |   2 +-
 gas/testsuite/gas/mips/mips16-relax-unextended-2.d |   2 +-
 gas/testsuite/gas/mips/mips16-reloc-error.d        |   2 +-
 gas/testsuite/gas/mips/mips16-sdrasp.d             |   2 +-
 gas/testsuite/gas/mips/mips16@addiu-error.d        |   2 +-
 gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.d  |   2 +-
 gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.d  |   2 +-
 gas/testsuite/gas/mips/mips16e-32@mips16-macro-e.d |   2 +-
 gas/testsuite/gas/mips/mips16e-32@mips16-macro-t.d |   2 +-
 gas/testsuite/gas/mips/mips16e-32@mips16-macro.d   |   2 +-
 gas/testsuite/gas/mips/mips16e-32@mips16e-64.d     |   2 +-
 gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.d |   2 +-
 gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.d |   2 +-
 .../gas/mips/mips16e2-32@mips16-macro-e.d          |   2 +-
 .../gas/mips/mips16e2-32@mips16-macro-t.d          |   2 +-
 gas/testsuite/gas/mips/mips16e2-32@mips16-macro.d  |   2 +-
 gas/testsuite/gas/mips/mips16e2-32@mips16e-64.d    |   2 +-
 gas/testsuite/gas/mips/mips16e2-copy-err.d         |   2 +-
 gas/testsuite/gas/mips/mips16e2-imm-error.d        |   2 +-
 .../mips/mips16e2-interaptiv-mr2@mips16-insn-e.d   |   2 +-
 .../mips/mips16e2-interaptiv-mr2@mips16-insn-t.d   |   2 +-
 .../mips/mips16e2-interaptiv-mr2@mips16-macro-e.d  |   2 +-
 .../mips/mips16e2-interaptiv-mr2@mips16-macro-t.d  |   2 +-
 .../mips/mips16e2-interaptiv-mr2@mips16-macro.d    |   2 +-
 .../gas/mips/mips16e2-interaptiv-mr2@mips16-sub.d  |   2 +-
 .../mips/mips16e2-interaptiv-mr2@mips16e-64-sub.d  |   2 +-
 .../gas/mips/mips16e2-interaptiv-mr2@mips16e-64.d  |   2 +-
 .../gas/mips/mips16e2-interaptiv-mr2@mips16e-sub.d |   2 +-
 gas/testsuite/gas/mips/mips16e2-mt-err.d           |   2 +-
 gas/testsuite/gas/mips/mips16e2-reloc-error.d      |   2 +-
 gas/testsuite/gas/mips/mips16e2@lui-2.d            |   2 +-
 gas/testsuite/gas/mips/mips16e2@mips16-pcrel-2.d   |   2 +-
 .../gas/mips/mips16e2@mips16-pcrel-delay-0.d       |   2 +-
 .../gas/mips/mips16e2@mips16-pcrel-delay-1.d       |   2 +-
 gas/testsuite/gas/mips/mips1@isa-override-2.d      |   2 +-
 gas/testsuite/gas/mips/mips1@relax-offset.d        |   2 +-
 gas/testsuite/gas/mips/mips2@isa-override-2.d      |   2 +-
 gas/testsuite/gas/mips/mips32-mt.d                 |   1 -
 gas/testsuite/gas/mips/mips32@isa-override-2.d     |   2 +-
 gas/testsuite/gas/mips/mips32r2@isa-override-2.d   |   2 +-
 gas/testsuite/gas/mips/mips32r3@isa-override-2.d   |   2 +-
 gas/testsuite/gas/mips/mips32r5@isa-override-2.d   |   2 +-
 gas/testsuite/gas/mips/mips32r6@isa-override-2.d   |   2 +-
 gas/testsuite/gas/mips/mips5-fp.d                  |   2 +-
 gas/testsuite/gas/mips/mips64-mips3d-incl.d        |   2 +-
 gas/testsuite/gas/mips/mips64-mips3d.d             |   2 +-
 gas/testsuite/gas/mips/mipsr6@mips5-fp.d           |   1 -
 gas/testsuite/gas/mips/msa-relax.d                 |   2 +-
 gas/testsuite/gas/mips/octeon3@isa-override-1.d    |   2 +-
 gas/testsuite/gas/mips/octeon3@isa-override-2.d    |   2 +-
 gas/testsuite/gas/mips/option-pic-relax-2.d        |   2 +-
 gas/testsuite/gas/mips/option-pic-relax-3.d        |   2 +-
 gas/testsuite/gas/mips/option-pic-relax-4.d        |   2 +-
 gas/testsuite/gas/mips/option-pic-relax-5.d        |   2 +-
 gas/testsuite/gas/mips/org-1.d                     |   2 +-
 gas/testsuite/gas/mips/org-10.d                    |   2 +-
 gas/testsuite/gas/mips/org-4.d                     |   2 +-
 gas/testsuite/gas/mips/org-5.d                     |   2 +-
 gas/testsuite/gas/mips/org-6.d                     |   2 +-
 gas/testsuite/gas/mips/r3000@isa-override-2.d      |   2 +-
 gas/testsuite/gas/mips/r3000@relax-offset.d        |   2 +-
 gas/testsuite/gas/mips/r3900@isa-override-2.d      |   2 +-
 gas/testsuite/gas/mips/r3900@relax-offset.d        |   2 +-
 gas/testsuite/gas/mips/reginfo-2-n32.d             |   2 +-
 gas/testsuite/gas/mips/reginfo-2.d                 |   2 +-
 gas/testsuite/gas/mips/relax-at.d                  |   2 +-
 gas/testsuite/gas/mips/relax-offset.d              |   2 +-
 gas/testsuite/gas/mips/relax-swap1-mips1.d         |   2 +-
 gas/testsuite/gas/mips/relax-swap1-mips2.d         |   2 +-
 gas/testsuite/gas/mips/relax-swap2.d               |   2 +-
 gas/testsuite/gas/mips/relax.d                     |   2 +-
 gas/testsuite/gas/mips/save-err.d                  |   2 +-
 gas/testsuite/gas/mips/set-arch.d                  |   2 +-
 gas/testsuite/gas/mips/xpa-err.d                   |   2 +-
 gas/testsuite/gas/mips/xpa-virt-err.d              |   2 +-
 gas/testsuite/gas/msp430/bad.d                     |   2 +-
 gas/testsuite/gas/msp430/errata_warns.d            |   2 +-
 gas/testsuite/gas/msp430/pr22133.d                 |   2 +-
 gas/testsuite/gas/ppc/lsp-checks.d                 |   2 +-
 gas/testsuite/gas/ppc/misalign.d                   |   2 +-
 gas/testsuite/gas/ppc/spe2-checks.d                |   2 +-
 gas/testsuite/gas/riscv/bad-csr.d                  |   2 +-
 gas/testsuite/gas/riscv/c-addi16sp-fail.d          |   2 +-
 gas/testsuite/gas/riscv/c-addi4spn-fail.d          |   2 +-
 gas/testsuite/gas/riscv/c-fld-fsd-fail.d           |   2 +-
 gas/testsuite/gas/riscv/c-lui-fail.d               |   2 +-
 gas/testsuite/gas/riscv/c-nonzero-imm.d            |   2 +-
 gas/testsuite/gas/riscv/c-nonzero-reg.d            |   2 +-
 gas/testsuite/gas/riscv/fence-fail.d               |   2 +-
 gas/testsuite/gas/riscv/lla64-fail.d               |   2 +-
 gas/testsuite/gas/riscv/rouding-fail.d             |   2 +-
 gas/testsuite/gas/sh/pcrel-hms.d                   |   2 +-
 gas/testsuite/gas/sh/pcrel.d                       |   2 +-
 gas/testsuite/gas/sparc/dcti-couples-v8.d          |   2 +-
 gas/testsuite/gas/sparc/dcti-couples-v9c.d         |   2 +-
 gas/testsuite/gas/tic6x/arch-invalid-1.d           |   2 +-
 gas/testsuite/gas/tic6x/arch-invalid-2.d           |   2 +-
 gas/testsuite/gas/tic6x/dir-junk.d                 |   2 +-
 gas/testsuite/gas/tic6x/insns-bad-1.d              |   2 +-
 gas/testsuite/gas/tic6x/insns-bad-2.d              |   2 +-
 gas/testsuite/gas/tic6x/parallel-bad-1.d           |   2 +-
 gas/testsuite/gas/tic6x/parallel-bad-2.d           |   2 +-
 gas/testsuite/gas/tic6x/parallel-bad-3.d           |   2 +-
 gas/testsuite/gas/tic6x/parallel-bad-4.d           |   2 +-
 gas/testsuite/gas/tic6x/predicate-bad-1.d          |   2 +-
 gas/testsuite/gas/tic6x/predicate-bad-2.d          |   2 +-
 gas/testsuite/gas/tic6x/predicate-bad-3.d          |   2 +-
 gas/testsuite/gas/tic6x/reloc-bad-1.d              |   2 +-
 gas/testsuite/gas/tic6x/reloc-bad-2.d              |   2 +-
 gas/testsuite/gas/tic6x/reloc-bad-3.d              |   2 +-
 gas/testsuite/gas/tic6x/reloc-bad-4.d              |   2 +-
 gas/testsuite/gas/tic6x/reloc-bad-5.d              |   2 +-
 gas/testsuite/gas/tic6x/reloc-bad-6.d              |   2 +-
 gas/testsuite/gas/tic6x/resource-func-unit-1.d     |   2 +-
 gas/testsuite/gas/tic6x/resource-func-unit-2.d     |   2 +-
 gas/testsuite/gas/tic6x/sploop-bad-1.d             |   2 +-
 gas/testsuite/gas/tic6x/sploop-bad-2.d             |   2 +-
 gas/testsuite/gas/tic6x/sploop-bad-3.d             |   2 +-
 gas/testsuite/gas/tic6x/sploop-bad-4.d             |   2 +-
 gas/testsuite/gas/tic6x/sploop-bad-5.d             |   2 +-
 gas/testsuite/gas/tic6x/sploop-bad-6.d             |   2 +-
 gas/testsuite/gas/tic6x/sploop-bad-7.d             |   2 +-
 gas/testsuite/gas/tic6x/unwind-bad-1.d             |   2 +-
 gas/testsuite/gas/tic6x/unwind-bad-2.d             |   2 +-
 gas/testsuite/lib/gas-defs.exp                     |  38 +-
 427 files changed, 877 insertions(+), 448 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index da7d7aa..0aac1f3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,436 @@
 2018-09-15  Alan Modra  <amodra@gmail.com>
 
+	* testsuite/gas/aarch64/armv8_2-a-crypto-fp16-illegal.d,
+	* testsuite/gas/aarch64/armv8_2-a-illegal.d,
+	* testsuite/gas/aarch64/armv8_4-a-illegal.d,
+	* testsuite/gas/aarch64/armv8_4-a-registers-illegal.d,
+	* testsuite/gas/aarch64/deprecated.d,
+	* testsuite/gas/aarch64/diagnostic.d,
+	* testsuite/gas/aarch64/illegal-2.d,
+	* testsuite/gas/aarch64/illegal-by-element.d,
+	* testsuite/gas/aarch64/illegal-crypto-nofp.d,
+	* testsuite/gas/aarch64/illegal-fcmla.d,
+	* testsuite/gas/aarch64/illegal-fjcvtzs.d,
+	* testsuite/gas/aarch64/illegal-fp16-nofp.d,
+	* testsuite/gas/aarch64/illegal-ldapr.d,
+	* testsuite/gas/aarch64/illegal-ldraa.d,
+	* testsuite/gas/aarch64/illegal-lse.d,
+	* testsuite/gas/aarch64/illegal-nofp-armv8_3.d,
+	* testsuite/gas/aarch64/illegal-nofp16.d,
+	* testsuite/gas/aarch64/illegal-ras-1.d,
+	* testsuite/gas/aarch64/illegal-sysreg-2.d,
+	* testsuite/gas/aarch64/illegal-sysreg-3.d,
+	* testsuite/gas/aarch64/illegal.d,
+	* testsuite/gas/aarch64/legacy_reg_names.d,
+	* testsuite/gas/aarch64/pan-illegal.d,
+	* testsuite/gas/aarch64/pr22529.d,
+	* testsuite/gas/aarch64/rm-simd-ext.d,
+	* testsuite/gas/aarch64/sve-invalid.d,
+	* testsuite/gas/aarch64/sve-reg-diagnostic.d,
+	* testsuite/gas/aarch64/sve-sysreg-invalid.d,
+	* testsuite/gas/aarch64/sysreg-diagnostic.d,
+	* testsuite/gas/aarch64/verbose-error.d,
+	* testsuite/gas/all/byte.d,
+	* testsuite/gas/all/org-1.d,
+	* testsuite/gas/all/org-2.d,
+	* testsuite/gas/all/org-3.d,
+	* testsuite/gas/all/sleb128-9.d,
+	* testsuite/gas/arc/asm-errors-2.d,
+	* testsuite/gas/arc/asm-errors-3.d,
+	* testsuite/gas/arc/asm-errors.d,
+	* testsuite/gas/arc/attr-rf16.d,
+	* testsuite/gas/arc/relocs-errors.d,
+	* testsuite/gas/arc/textinsn-errors.d,
+	* testsuite/gas/arm/addsw-bad.d,
+	* testsuite/gas/arm/addthumb2err.d,
+	* testsuite/gas/arm/adr-invalid.d,
+	* testsuite/gas/arm/arch7em-bad-1.d,
+	* testsuite/gas/arm/arch7em-bad-2.d,
+	* testsuite/gas/arm/arch7em-bad-3.d,
+	* testsuite/gas/arm/arch7m-bad.d,
+	* testsuite/gas/arm/archv6s-m-bad.d,
+	* testsuite/gas/arm/archv6t2-bad.d,
+	* testsuite/gas/arm/arm-idiv-bad.d,
+	* testsuite/gas/arm/arm-it-bad-2.d,
+	* testsuite/gas/arm/arm-it-bad-3.d,
+	* testsuite/gas/arm/arm-it-bad.d,
+	* testsuite/gas/arm/arm3-bad.d,
+	* testsuite/gas/arm/arm7-bad.d,
+	* testsuite/gas/arm/armv1-bad.d,
+	* testsuite/gas/arm/armv1.d,
+	* testsuite/gas/arm/armv2-mp-bad.d,
+	* testsuite/gas/arm/armv8-2-fp16-scalar-bad.d,
+	* testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb.d,
+	* testsuite/gas/arm/armv8-2-fp16-simd-warning.d,
+	* testsuite/gas/arm/armv8-a+rdma-warning.d,
+	* testsuite/gas/arm/armv8-a-bad.d,
+	* testsuite/gas/arm/armv8-a-it-bad.d,
+	* testsuite/gas/arm/armv8-r-bad.d,
+	* testsuite/gas/arm/armv8-r-it-bad.d,
+	* testsuite/gas/arm/armv8_2-a-fp16-illegal.d,
+	* testsuite/gas/arm/armv8_3-a-fp-bad.d,
+	* testsuite/gas/arm/armv8_3-a-simd-bad.d,
+	* testsuite/gas/arm/barrier-bad-thumb.d,
+	* testsuite/gas/arm/barrier-bad.d,
+	* testsuite/gas/arm/bl-local-v4t.d,
+	* testsuite/gas/arm/blx-bl-convert.d,
+	* testsuite/gas/arm/blx-local.d,
+	* testsuite/gas/arm/branch-reloc.d,
+	* testsuite/gas/arm/copro-arm_v2plus-arm_v1.d,
+	* testsuite/gas/arm/copro-arm_v5plus-arm_v4.d,
+	* testsuite/gas/arm/copro-arm_v5teplus-arm_v5.d,
+	* testsuite/gas/arm/copro-arm_v6plus-arm_v5te.d,
+	* testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-1.d,
+	* testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-2.d,
+	* testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-3.d,
+	* testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-4.d,
+	* testsuite/gas/arm/crc32-armv8-a-bad.d,
+	* testsuite/gas/arm/crc32-armv8-r-bad.d,
+	* testsuite/gas/arm/depr-swp.d,
+	* testsuite/gas/arm/dest-unpredictable.d,
+	* testsuite/gas/arm/dotprod-illegal.d,
+	* testsuite/gas/arm/dotprod-legacy-arch.d,
+	* testsuite/gas/arm/forbid-armv7-idiv-ext.d,
+	* testsuite/gas/arm/group-reloc-alu-encoding-bad.d,
+	* testsuite/gas/arm/group-reloc-alu-parsing-bad.d,
+	* testsuite/gas/arm/group-reloc-ldc-encoding-bad.d,
+	* testsuite/gas/arm/group-reloc-ldc-parsing-bad.d,
+	* testsuite/gas/arm/group-reloc-ldr-encoding-bad.d,
+	* testsuite/gas/arm/group-reloc-ldr-parsing-bad.d,
+	* testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d,
+	* testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d,
+	* testsuite/gas/arm/insn-error-a.d,
+	* testsuite/gas/arm/insn-error-t.d,
+	* testsuite/gas/arm/inst-po-2.d,
+	* testsuite/gas/arm/iwmmxt-bad.d,
+	* testsuite/gas/arm/iwmmxt-bad2.d,
+	* testsuite/gas/arm/ld-sp-warn-cortex-m3.d,
+	* testsuite/gas/arm/ld-sp-warn-cortex-m4.d,
+	* testsuite/gas/arm/ld-sp-warn-v7.d,
+	* testsuite/gas/arm/ld-sp-warn-v7a.d,
+	* testsuite/gas/arm/ld-sp-warn-v7em.d,
+	* testsuite/gas/arm/ld-sp-warn-v7m.d,
+	* testsuite/gas/arm/ld-sp-warn-v7r.d,
+	* testsuite/gas/arm/ld-sp-warn.d,
+	* testsuite/gas/arm/ldgesb-bad.d,
+	* testsuite/gas/arm/ldgesh-bad.d,
+	* testsuite/gas/arm/ldr-bad.d,
+	* testsuite/gas/arm/ldr-t-bad.d,
+	* testsuite/gas/arm/ldrd-unpredictable.d,
+	* testsuite/gas/arm/ldsgeb.d,
+	* testsuite/gas/arm/ldsgeh.d,
+	* testsuite/gas/arm/missing.d,
+	* testsuite/gas/arm/mrs-msr-arm-v7-a-bad.d,
+	* testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.d,
+	* testsuite/gas/arm/msr-imm-bad.d,
+	* testsuite/gas/arm/msr-reg-bad.d,
+	* testsuite/gas/arm/mul-overlap.d,
+	* testsuite/gas/arm/neon-addressing-bad.d,
+	* testsuite/gas/arm/neon-cond-bad.d,
+	* testsuite/gas/arm/neon-ldst-align-bad.d,
+	* testsuite/gas/arm/neon-ldst-es-bad.d,
+	* testsuite/gas/arm/neon-suffix-bad.d,
+	* testsuite/gas/arm/neon-vmov-bad.d,
+	* testsuite/gas/arm/noarm.d,
+	* testsuite/gas/arm/pr18256.d,
+	* testsuite/gas/arm/pr18347.d,
+	* testsuite/gas/arm/pr20429.d,
+	* testsuite/gas/arm/pr22773.d,
+	* testsuite/gas/arm/r15-bad.d,
+	* testsuite/gas/arm/reloc-bad.d,
+	* testsuite/gas/arm/req.d,
+	* testsuite/gas/arm/shift-bad-pc.d,
+	* testsuite/gas/arm/shift-bad.d,
+	* testsuite/gas/arm/simd_by_scalar_low_regbank.d,
+	* testsuite/gas/arm/simd_by_scalar_low_regbank_thumb.d,
+	* testsuite/gas/arm/sp-pc-validations-bad-t-v8a.d,
+	* testsuite/gas/arm/sp-pc-validations-bad-t.d,
+	* testsuite/gas/arm/sp-pc-validations-bad.d,
+	* testsuite/gas/arm/sp-usage-thumb2-relax-on-v7.d,
+	* testsuite/gas/arm/srs-arm.d,
+	* testsuite/gas/arm/srs-t2.d,
+	* testsuite/gas/arm/strex-bad-t.d,
+	* testsuite/gas/arm/t16-bad.d,
+	* testsuite/gas/arm/thumb-b-bad.d,
+	* testsuite/gas/arm/thumb-w-bad.d,
+	* testsuite/gas/arm/thumb2_bad_reg.d,
+	* testsuite/gas/arm/thumb2_it_bad.d,
+	* testsuite/gas/arm/thumb2_it_bad_auto.d,
+	* testsuite/gas/arm/thumb2_ldmstm_bad.d,
+	* testsuite/gas/arm/thumb2_ldstd_unpredictable.d,
+	* testsuite/gas/arm/thumb2_mul-bad.d,
+	* testsuite/gas/arm/thumb2_str-bad.d,
+	* testsuite/gas/arm/thumb32.d,
+	* testsuite/gas/arm/udf-bad.d,
+	* testsuite/gas/arm/udf.d,
+	* testsuite/gas/arm/undefined.d,
+	* testsuite/gas/arm/undefined_coff.d,
+	* testsuite/gas/arm/vcmp-zero-bad.d,
+	* testsuite/gas/arm/vcvt-bad.d,
+	* testsuite/gas/arm/vfp-bad.d,
+	* testsuite/gas/arm/vfp-bad_t2.d,
+	* testsuite/gas/arm/vfpv3-d16-bad.d,
+	* testsuite/gas/arm/vldm-thumb-bad.d,
+	* testsuite/gas/arm/vldmw-arm-bad.d,
+	* testsuite/gas/arm/vldmw-thumb-bad.d,
+	* testsuite/gas/arm/vstr-arm-bad.d,
+	* testsuite/gas/arm/vstr-thumb-bad.d,
+	* testsuite/gas/arm/weakdef-2.d,
+	* testsuite/gas/avr/pr21621.d,
+	* testsuite/gas/elf/bad-bss.d,
+	* testsuite/gas/elf/bad-group.d,
+	* testsuite/gas/elf/bad-group.err,
+	* testsuite/gas/elf/bad-section-flag.d,
+	* testsuite/gas/elf/bad-section-flag.err,
+	* testsuite/gas/elf/bad-size.d,
+	* testsuite/gas/elf/bad-size.err,
+	* testsuite/gas/elf/common1.d,
+	* testsuite/gas/elf/common2.d,
+	* testsuite/gas/elf/common5a.d,
+	* testsuite/gas/elf/common5b.d,
+	* testsuite/gas/elf/common5c.d,
+	* testsuite/gas/elf/common5d.d,
+	* testsuite/gas/elf/dwarf2-10.d,
+	* testsuite/gas/elf/dwarf2-8.d,
+	* testsuite/gas/elf/dwarf2-9.d,
+	* testsuite/gas/elf/pr21661.d,
+	* testsuite/gas/elf/pseudo.d,
+	* testsuite/gas/elf/section13.d,
+	* testsuite/gas/i386/bad-size.d,
+	* testsuite/gas/i386/bundle-bad.d,
+	* testsuite/gas/i386/ilp32/x86-64-sse-check-warn.d,
+	* testsuite/gas/i386/intel-intel.d,
+	* testsuite/gas/i386/intel.d,
+	* testsuite/gas/i386/intelok.d,
+	* testsuite/gas/i386/mpx-add-bnd-prefix.d,
+	* testsuite/gas/i386/sse-check-warn.d,
+	* testsuite/gas/i386/string-ok.d,
+	* testsuite/gas/i386/vgather-check-warn.d,
+	* testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d,
+	* testsuite/gas/i386/x86-64-sse-check-warn.d,
+	* testsuite/gas/i386/x86-64-vgather-check-warn.d,
+	* testsuite/gas/mips/addiu-error.d,
+	* testsuite/gas/mips/branch-extern-3.d,
+	* testsuite/gas/mips/branch-extern-4.d,
+	* testsuite/gas/mips/branch-local-2.d,
+	* testsuite/gas/mips/branch-local-3.d,
+	* testsuite/gas/mips/branch-local-5.d,
+	* testsuite/gas/mips/branch-local-6.d,
+	* testsuite/gas/mips/branch-local-n32-2.d,
+	* testsuite/gas/mips/branch-local-n32-3.d,
+	* testsuite/gas/mips/branch-local-n32-5.d,
+	* testsuite/gas/mips/branch-local-n32-6.d,
+	* testsuite/gas/mips/branch-local-n64-2.d,
+	* testsuite/gas/mips/branch-local-n64-3.d,
+	* testsuite/gas/mips/branch-local-n64-5.d,
+	* testsuite/gas/mips/branch-local-n64-6.d,
+	* testsuite/gas/mips/branch-section-3.d,
+	* testsuite/gas/mips/branch-section-4.d,
+	* testsuite/gas/mips/branch-weak-3.d,
+	* testsuite/gas/mips/branch-weak-4.d,
+	* testsuite/gas/mips/break-error.d,
+	* testsuite/gas/mips/crc-err.d,
+	* testsuite/gas/mips/crc64-err.d,
+	* testsuite/gas/mips/ginv-err.d,
+	* testsuite/gas/mips/interaptiv-mr2@isa-override-1.d,
+	* testsuite/gas/mips/interaptiv-mr2@isa-override-2.d,
+	* testsuite/gas/mips/isa-override-2.d,
+	* testsuite/gas/mips/lui-1.d,
+	* testsuite/gas/mips/lui-2.d,
+	* testsuite/gas/mips/macro-warn-1-n32.d,
+	* testsuite/gas/mips/macro-warn-1.d,
+	* testsuite/gas/mips/macro-warn-2.d,
+	* testsuite/gas/mips/macro-warn-3.d,
+	* testsuite/gas/mips/macro-warn-4.d,
+	* testsuite/gas/mips/micromips-branch-delay.d,
+	* testsuite/gas/mips/micromips-branch-relax-insn32-pic.d,
+	* testsuite/gas/mips/micromips-branch-relax-insn32.d,
+	* testsuite/gas/mips/micromips-branch-relax-pic.d,
+	* testsuite/gas/mips/micromips-branch-relax.d,
+	* testsuite/gas/mips/micromips-compact.d,
+	* testsuite/gas/mips/micromips-insn32.d,
+	* testsuite/gas/mips/micromips-noinsn32.d,
+	* testsuite/gas/mips/micromips-size-1.d,
+	* testsuite/gas/mips/micromips-trap.d,
+	* testsuite/gas/mips/micromips-warn-branch-delay.d,
+	* testsuite/gas/mips/micromips.d,
+	* testsuite/gas/mips/micromips@addiu-error.d,
+	* testsuite/gas/mips/micromips@mips5-fp.d,
+	* testsuite/gas/mips/micromips@msa-relax.d,
+	* testsuite/gas/mips/micromips@relax-at.d,
+	* testsuite/gas/mips/micromips@relax-offset.d,
+	* testsuite/gas/mips/micromips@relax.d,
+	* testsuite/gas/mips/mips-gp32-fp64-pic.d,
+	* testsuite/gas/mips/mips-gp32-fp64.d,
+	* testsuite/gas/mips/mips-gp64-fp32-pic.d,
+	* testsuite/gas/mips/mips-gp64-fp32.d,
+	* testsuite/gas/mips/mips-gp64-fp64.d,
+	* testsuite/gas/mips/mips16-32@mips16-insn-e.d,
+	* testsuite/gas/mips/mips16-32@mips16-insn-t.d,
+	* testsuite/gas/mips/mips16-32@mips16-macro-e.d,
+	* testsuite/gas/mips/mips16-32@mips16-macro-t.d,
+	* testsuite/gas/mips/mips16-32@mips16-macro.d,
+	* testsuite/gas/mips/mips16-64@mips16-insn-e.d,
+	* testsuite/gas/mips/mips16-64@mips16-insn-t.d,
+	* testsuite/gas/mips/mips16-absolute-reloc-2.d,
+	* testsuite/gas/mips/mips16-absolute-reloc-3.d,
+	* testsuite/gas/mips/mips16-branch-addend-5.d,
+	* testsuite/gas/mips/mips16-branch-unextended-1.d,
+	* testsuite/gas/mips/mips16-branch-unextended-2.d,
+	* testsuite/gas/mips/mips16-insn-e.d,
+	* testsuite/gas/mips/mips16-insn-t.d,
+	* testsuite/gas/mips/mips16-jal-t.d,
+	* testsuite/gas/mips/mips16-macro-e.d,
+	* testsuite/gas/mips/mips16-macro-t.d,
+	* testsuite/gas/mips/mips16-pcrel-2.d,
+	* testsuite/gas/mips/mips16-pcrel-3.d,
+	* testsuite/gas/mips/mips16-pcrel-4.d,
+	* testsuite/gas/mips/mips16-pcrel-5.d,
+	* testsuite/gas/mips/mips16-pcrel-absolute-n64-4.d,
+	* testsuite/gas/mips/mips16-pcrel-absolute-n64-6.d,
+	* testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-4.d,
+	* testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-6.d,
+	* testsuite/gas/mips/mips16-pcrel-addend-n64-8.d,
+	* testsuite/gas/mips/mips16-pcrel-addend-n64-9.d,
+	* testsuite/gas/mips/mips16-pcrel-addend-pic-8.d,
+	* testsuite/gas/mips/mips16-pcrel-addend-pic-9.d,
+	* testsuite/gas/mips/mips16-pcrel-delay-0.d,
+	* testsuite/gas/mips/mips16-pcrel-delay-1.d,
+	* testsuite/gas/mips/mips16-pcrel-n64-0.d,
+	* testsuite/gas/mips/mips16-pcrel-n64-1.d,
+	* testsuite/gas/mips/mips16-pcrel-pic-0.d,
+	* testsuite/gas/mips/mips16-pcrel-pic-1.d,
+	* testsuite/gas/mips/mips16-reg-error.d,
+	* testsuite/gas/mips/mips16-relax-unextended-1.d,
+	* testsuite/gas/mips/mips16-relax-unextended-2.d,
+	* testsuite/gas/mips/mips16-reloc-error.d,
+	* testsuite/gas/mips/mips16-sdrasp.d,
+	* testsuite/gas/mips/mips16@addiu-error.d,
+	* testsuite/gas/mips/mips16e-32@mips16-insn-e.d,
+	* testsuite/gas/mips/mips16e-32@mips16-insn-t.d,
+	* testsuite/gas/mips/mips16e-32@mips16-macro-e.d,
+	* testsuite/gas/mips/mips16e-32@mips16-macro-t.d,
+	* testsuite/gas/mips/mips16e-32@mips16-macro.d,
+	* testsuite/gas/mips/mips16e-32@mips16e-64.d,
+	* testsuite/gas/mips/mips16e2-32@mips16-insn-e.d,
+	* testsuite/gas/mips/mips16e2-32@mips16-insn-t.d,
+	* testsuite/gas/mips/mips16e2-32@mips16-macro-e.d,
+	* testsuite/gas/mips/mips16e2-32@mips16-macro-t.d,
+	* testsuite/gas/mips/mips16e2-32@mips16-macro.d,
+	* testsuite/gas/mips/mips16e2-32@mips16e-64.d,
+	* testsuite/gas/mips/mips16e2-copy-err.d,
+	* testsuite/gas/mips/mips16e2-imm-error.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-e.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-t.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-sub.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64-sub.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64.d,
+	* testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-sub.d,
+	* testsuite/gas/mips/mips16e2-mt-err.d,
+	* testsuite/gas/mips/mips16e2-reloc-error.d,
+	* testsuite/gas/mips/mips16e2@lui-2.d,
+	* testsuite/gas/mips/mips16e2@mips16-pcrel-2.d,
+	* testsuite/gas/mips/mips16e2@mips16-pcrel-delay-0.d,
+	* testsuite/gas/mips/mips16e2@mips16-pcrel-delay-1.d,
+	* testsuite/gas/mips/mips1@isa-override-2.d,
+	* testsuite/gas/mips/mips1@relax-offset.d,
+	* testsuite/gas/mips/mips2@isa-override-2.d,
+	* testsuite/gas/mips/mips32-mt.d,
+	* testsuite/gas/mips/mips32@isa-override-2.d,
+	* testsuite/gas/mips/mips32r2@isa-override-2.d,
+	* testsuite/gas/mips/mips32r3@isa-override-2.d,
+	* testsuite/gas/mips/mips32r5@isa-override-2.d,
+	* testsuite/gas/mips/mips32r6@isa-override-2.d,
+	* testsuite/gas/mips/mips5-fp.d,
+	* testsuite/gas/mips/mips64-mips3d-incl.d,
+	* testsuite/gas/mips/mips64-mips3d.d,
+	* testsuite/gas/mips/mipsr6@mips5-fp.d,
+	* testsuite/gas/mips/msa-relax.d,
+	* testsuite/gas/mips/octeon3@isa-override-1.d,
+	* testsuite/gas/mips/octeon3@isa-override-2.d,
+	* testsuite/gas/mips/option-pic-relax-2.d,
+	* testsuite/gas/mips/option-pic-relax-3.d,
+	* testsuite/gas/mips/option-pic-relax-4.d,
+	* testsuite/gas/mips/option-pic-relax-5.d,
+	* testsuite/gas/mips/org-1.d,
+	* testsuite/gas/mips/org-10.d,
+	* testsuite/gas/mips/org-4.d,
+	* testsuite/gas/mips/org-5.d,
+	* testsuite/gas/mips/org-6.d,
+	* testsuite/gas/mips/r3000@isa-override-2.d,
+	* testsuite/gas/mips/r3000@relax-offset.d,
+	* testsuite/gas/mips/r3900@isa-override-2.d,
+	* testsuite/gas/mips/r3900@relax-offset.d,
+	* testsuite/gas/mips/reginfo-2-n32.d,
+	* testsuite/gas/mips/reginfo-2.d,
+	* testsuite/gas/mips/relax-at.d,
+	* testsuite/gas/mips/relax-offset.d,
+	* testsuite/gas/mips/relax-swap1-mips1.d,
+	* testsuite/gas/mips/relax-swap1-mips2.d,
+	* testsuite/gas/mips/relax-swap2.d,
+	* testsuite/gas/mips/relax.d,
+	* testsuite/gas/mips/save-err.d,
+	* testsuite/gas/mips/set-arch.d,
+	* testsuite/gas/mips/xpa-err.d,
+	* testsuite/gas/mips/xpa-virt-err.d,
+	* testsuite/gas/msp430/bad.d,
+	* testsuite/gas/msp430/errata_warns.d,
+	* testsuite/gas/msp430/pr22133.d,
+	* testsuite/gas/ppc/lsp-checks.d,
+	* testsuite/gas/ppc/misalign.d,
+	* testsuite/gas/ppc/spe2-checks.d,
+	* testsuite/gas/riscv/bad-csr.d,
+	* testsuite/gas/riscv/c-addi16sp-fail.d,
+	* testsuite/gas/riscv/c-addi4spn-fail.d,
+	* testsuite/gas/riscv/c-fld-fsd-fail.d,
+	* testsuite/gas/riscv/c-lui-fail.d,
+	* testsuite/gas/riscv/c-nonzero-imm.d,
+	* testsuite/gas/riscv/c-nonzero-reg.d,
+	* testsuite/gas/riscv/fence-fail.d,
+	* testsuite/gas/riscv/lla64-fail.d,
+	* testsuite/gas/riscv/rouding-fail.d,
+	* testsuite/gas/sh/pcrel-hms.d,
+	* testsuite/gas/sh/pcrel.d,
+	* testsuite/gas/sparc/dcti-couples-v8.d,
+	* testsuite/gas/sparc/dcti-couples-v9c.d,
+	* testsuite/gas/tic6x/arch-invalid-1.d,
+	* testsuite/gas/tic6x/arch-invalid-2.d,
+	* testsuite/gas/tic6x/dir-junk.d,
+	* testsuite/gas/tic6x/insns-bad-1.d,
+	* testsuite/gas/tic6x/insns-bad-2.d,
+	* testsuite/gas/tic6x/parallel-bad-1.d,
+	* testsuite/gas/tic6x/parallel-bad-2.d,
+	* testsuite/gas/tic6x/parallel-bad-3.d,
+	* testsuite/gas/tic6x/parallel-bad-4.d,
+	* testsuite/gas/tic6x/predicate-bad-1.d,
+	* testsuite/gas/tic6x/predicate-bad-2.d,
+	* testsuite/gas/tic6x/predicate-bad-3.d,
+	* testsuite/gas/tic6x/reloc-bad-1.d,
+	* testsuite/gas/tic6x/reloc-bad-2.d,
+	* testsuite/gas/tic6x/reloc-bad-3.d,
+	* testsuite/gas/tic6x/reloc-bad-4.d,
+	* testsuite/gas/tic6x/reloc-bad-5.d,
+	* testsuite/gas/tic6x/reloc-bad-6.d,
+	* testsuite/gas/tic6x/resource-func-unit-1.d,
+	* testsuite/gas/tic6x/resource-func-unit-2.d,
+	* testsuite/gas/tic6x/sploop-bad-1.d,
+	* testsuite/gas/tic6x/sploop-bad-2.d,
+	* testsuite/gas/tic6x/sploop-bad-3.d,
+	* testsuite/gas/tic6x/sploop-bad-4.d,
+	* testsuite/gas/tic6x/sploop-bad-5.d,
+	* testsuite/gas/tic6x/sploop-bad-6.d,
+	* testsuite/gas/tic6x/sploop-bad-7.d,
+	* testsuite/gas/tic6x/unwind-bad-1.d,
+	* testsuite/gas/tic6x/unwind-bad-2.d,
+	* testsuite/lib/gas-defs.exp (run_dump_tests): Replace stderr
+	and error-output with warning_output and error_output.
+	(slurp_options): Accept underscore rather than dash.
+
+2018-09-15  Alan Modra  <amodra@gmail.com>
+
 	* testsuite/gas/aarch64/codealign.d,
 	* testsuite/gas/aarch64/litpool.d,
 	* testsuite/gas/aarch64/mapmisc.d,
diff --git a/gas/testsuite/gas/aarch64/armv8_2-a-crypto-fp16-illegal.d b/gas/testsuite/gas/aarch64/armv8_2-a-crypto-fp16-illegal.d
index 7954de9..d1cd753 100644
--- a/gas/testsuite/gas/aarch64/armv8_2-a-crypto-fp16-illegal.d
+++ b/gas/testsuite/gas/aarch64/armv8_2-a-crypto-fp16-illegal.d
@@ -1,3 +1,3 @@
 #as: -march=armv8.2-a+crypto+sm4+sha3
 #source: armv8_2-a-illegal.s
-#error-output: armv8_2-a-illegal.l
+#error_output: armv8_2-a-illegal.l
diff --git a/gas/testsuite/gas/aarch64/armv8_2-a-illegal.d b/gas/testsuite/gas/aarch64/armv8_2-a-illegal.d
index ce7f637..f76d06d 100644
--- a/gas/testsuite/gas/aarch64/armv8_2-a-illegal.d
+++ b/gas/testsuite/gas/aarch64/armv8_2-a-illegal.d
@@ -1,3 +1,3 @@
 #as: -march=armv8.2-a
 #source: armv8_2-a-illegal.s
-#error-output: armv8_2-a-illegal.l
+#error_output: armv8_2-a-illegal.l
diff --git a/gas/testsuite/gas/aarch64/armv8_4-a-illegal.d b/gas/testsuite/gas/aarch64/armv8_4-a-illegal.d
index 6b5e944..829b04a 100644
--- a/gas/testsuite/gas/aarch64/armv8_4-a-illegal.d
+++ b/gas/testsuite/gas/aarch64/armv8_4-a-illegal.d
@@ -1,3 +1,3 @@
 #as: -march=armv8.4-a
 #source: armv8_4-a-illegal.s
-#error-output: armv8_4-a-illegal.l
+#error_output: armv8_4-a-illegal.l
diff --git a/gas/testsuite/gas/aarch64/armv8_4-a-registers-illegal.d b/gas/testsuite/gas/aarch64/armv8_4-a-registers-illegal.d
index 098552b..2c00b65 100644
--- a/gas/testsuite/gas/aarch64/armv8_4-a-registers-illegal.d
+++ b/gas/testsuite/gas/aarch64/armv8_4-a-registers-illegal.d
@@ -1,3 +1,3 @@
 #as: -march=armv8.4-a+crypto+sm4+sha3
 #source: armv8_4-a-registers-illegal.s
-#error-output: armv8_4-a-registers-illegal.l
+#error_output: armv8_4-a-registers-illegal.l
diff --git a/gas/testsuite/gas/aarch64/deprecated.d b/gas/testsuite/gas/aarch64/deprecated.d
index 9199697..502387b 100644
--- a/gas/testsuite/gas/aarch64/deprecated.d
+++ b/gas/testsuite/gas/aarch64/deprecated.d
@@ -1,4 +1,4 @@
 #name: Deprecated Support
 #source: deprecated.s
-#error-output: deprecated.l
+#warning_output: deprecated.l
 #as: --warn
diff --git a/gas/testsuite/gas/aarch64/diagnostic.d b/gas/testsuite/gas/aarch64/diagnostic.d
index e0f9718..5cb6a76 100644
--- a/gas/testsuite/gas/aarch64/diagnostic.d
+++ b/gas/testsuite/gas/aarch64/diagnostic.d
@@ -1,3 +1,3 @@
 #name: Diagnostics Quality
 #source: diagnostic.s
-#error-output: diagnostic.l
+#error_output: diagnostic.l
diff --git a/gas/testsuite/gas/aarch64/illegal-2.d b/gas/testsuite/gas/aarch64/illegal-2.d
index e925739..a86618a 100644
--- a/gas/testsuite/gas/aarch64/illegal-2.d
+++ b/gas/testsuite/gas/aarch64/illegal-2.d
@@ -1,4 +1,4 @@
 #name: Illegal Instructions - 2
 #as:
 #source: illegal-2.s
-#error-output: illegal-2.l
+#error_output: illegal-2.l
diff --git a/gas/testsuite/gas/aarch64/illegal-by-element.d b/gas/testsuite/gas/aarch64/illegal-by-element.d
index 5e9e5c2..3ec774d 100644
--- a/gas/testsuite/gas/aarch64/illegal-by-element.d
+++ b/gas/testsuite/gas/aarch64/illegal-by-element.d
@@ -1,3 +1,3 @@
 #as: -march=armv8-a
 #source: illegal-by-element.s
-#error-output: illegal-by-element.l
+#error_output: illegal-by-element.l
diff --git a/gas/testsuite/gas/aarch64/illegal-crypto-nofp.d b/gas/testsuite/gas/aarch64/illegal-crypto-nofp.d
index ee52a9c..297ca79 100644
--- a/gas/testsuite/gas/aarch64/illegal-crypto-nofp.d
+++ b/gas/testsuite/gas/aarch64/illegal-crypto-nofp.d
@@ -1,3 +1,3 @@
 #as: -march=armv8-a+crypto+nofp
 #source: crypto.s
-#error-output: illegal-crypto-nofp.l
+#error_output: illegal-crypto-nofp.l
diff --git a/gas/testsuite/gas/aarch64/illegal-fcmla.d b/gas/testsuite/gas/aarch64/illegal-fcmla.d
index af94c51..c4b0fac 100644
--- a/gas/testsuite/gas/aarch64/illegal-fcmla.d
+++ b/gas/testsuite/gas/aarch64/illegal-fcmla.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.3-a -mno-verbose-error
-#error-output: illegal-fcmla.l
+#error_output: illegal-fcmla.l
diff --git a/gas/testsuite/gas/aarch64/illegal-fjcvtzs.d b/gas/testsuite/gas/aarch64/illegal-fjcvtzs.d
index 000904b..48e8da5 100644
--- a/gas/testsuite/gas/aarch64/illegal-fjcvtzs.d
+++ b/gas/testsuite/gas/aarch64/illegal-fjcvtzs.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.3-a -mno-verbose-error
-#error-output: illegal-fjcvtzs.l
+#error_output: illegal-fjcvtzs.l
diff --git a/gas/testsuite/gas/aarch64/illegal-fp16-nofp.d b/gas/testsuite/gas/aarch64/illegal-fp16-nofp.d
index 7aefc53..6468aab 100644
--- a/gas/testsuite/gas/aarch64/illegal-fp16-nofp.d
+++ b/gas/testsuite/gas/aarch64/illegal-fp16-nofp.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.2-a+fp16+nofp -mno-verbose-error
-#error-output: illegal-fp16-nofp.l
+#error_output: illegal-fp16-nofp.l
diff --git a/gas/testsuite/gas/aarch64/illegal-ldapr.d b/gas/testsuite/gas/aarch64/illegal-ldapr.d
index 36e94df..77471b7 100644
--- a/gas/testsuite/gas/aarch64/illegal-ldapr.d
+++ b/gas/testsuite/gas/aarch64/illegal-ldapr.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.3-a -mno-verbose-error
-#error-output: illegal-ldapr.l
+#error_output: illegal-ldapr.l
diff --git a/gas/testsuite/gas/aarch64/illegal-ldraa.d b/gas/testsuite/gas/aarch64/illegal-ldraa.d
index ab2dc30..0415e36 100644
--- a/gas/testsuite/gas/aarch64/illegal-ldraa.d
+++ b/gas/testsuite/gas/aarch64/illegal-ldraa.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.3-a -mno-verbose-error
-#error-output: illegal-ldraa.l
+#error_output: illegal-ldraa.l
diff --git a/gas/testsuite/gas/aarch64/illegal-lse.d b/gas/testsuite/gas/aarch64/illegal-lse.d
index bcb965e..f1cca33 100644
--- a/gas/testsuite/gas/aarch64/illegal-lse.d
+++ b/gas/testsuite/gas/aarch64/illegal-lse.d
@@ -1,4 +1,4 @@
 #name: LSE Illegal Instruction Operands
 #source: illegal-lse.s
 #as: -march=armv8-a+lse -mno-verbose-error
-#error-output: illegal-lse.l
+#error_output: illegal-lse.l
diff --git a/gas/testsuite/gas/aarch64/illegal-nofp-armv8_3.d b/gas/testsuite/gas/aarch64/illegal-nofp-armv8_3.d
index 89e0e89..d2131d2 100644
--- a/gas/testsuite/gas/aarch64/illegal-nofp-armv8_3.d
+++ b/gas/testsuite/gas/aarch64/illegal-nofp-armv8_3.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.3-a+nofp -mno-verbose-error
-#error-output: illegal-nofp-armv8_3.l
+#error_output: illegal-nofp-armv8_3.l
diff --git a/gas/testsuite/gas/aarch64/illegal-nofp16.d b/gas/testsuite/gas/aarch64/illegal-nofp16.d
index 669e85d..6568e15 100644
--- a/gas/testsuite/gas/aarch64/illegal-nofp16.d
+++ b/gas/testsuite/gas/aarch64/illegal-nofp16.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.2-a+nofp16 -mno-verbose-error
-#error-output: illegal-nofp16.l
+#error_output: illegal-nofp16.l
diff --git a/gas/testsuite/gas/aarch64/illegal-ras-1.d b/gas/testsuite/gas/aarch64/illegal-ras-1.d
index b7b72ea..2eb70b4 100644
--- a/gas/testsuite/gas/aarch64/illegal-ras-1.d
+++ b/gas/testsuite/gas/aarch64/illegal-ras-1.d
@@ -1,4 +1,4 @@
 #name: Illegal RAS instruction use.
 #source: illegal-ras-1.s
 #as: -march=armv8-a -mno-verbose-error
-#error-output: illegal-ras-1.l
+#error_output: illegal-ras-1.l
diff --git a/gas/testsuite/gas/aarch64/illegal-sysreg-2.d b/gas/testsuite/gas/aarch64/illegal-sysreg-2.d
index 5306efb..891f4f6 100644
--- a/gas/testsuite/gas/aarch64/illegal-sysreg-2.d
+++ b/gas/testsuite/gas/aarch64/illegal-sysreg-2.d
@@ -1,3 +1,3 @@
 #as: -march=armv8-a
 #source: sysreg-2.s
-#error-output: illegal-sysreg-2.l
+#error_output: illegal-sysreg-2.l
diff --git a/gas/testsuite/gas/aarch64/illegal-sysreg-3.d b/gas/testsuite/gas/aarch64/illegal-sysreg-3.d
index 309391b..932eb54 100644
--- a/gas/testsuite/gas/aarch64/illegal-sysreg-3.d
+++ b/gas/testsuite/gas/aarch64/illegal-sysreg-3.d
@@ -1,3 +1,3 @@
 #as: -march=armv8-a
 #source: sysreg-3.s
-#error-output: illegal-sysreg-3.l
+#error_output: illegal-sysreg-3.l
diff --git a/gas/testsuite/gas/aarch64/illegal.d b/gas/testsuite/gas/aarch64/illegal.d
index 904eace..33bbb0c 100644
--- a/gas/testsuite/gas/aarch64/illegal.d
+++ b/gas/testsuite/gas/aarch64/illegal.d
@@ -1,4 +1,4 @@
 #name: Illegal Instructions
 #as: -mno-verbose-error
 #source: illegal.s
-#error-output: illegal.l
+#error_output: illegal.l
diff --git a/gas/testsuite/gas/aarch64/legacy_reg_names.d b/gas/testsuite/gas/aarch64/legacy_reg_names.d
index 79caca7..2377da7 100644
--- a/gas/testsuite/gas/aarch64/legacy_reg_names.d
+++ b/gas/testsuite/gas/aarch64/legacy_reg_names.d
@@ -1,2 +1,2 @@
 #name: Legacy register names errors
-#error-output: legacy_reg_names.l
+#error_output: legacy_reg_names.l
diff --git a/gas/testsuite/gas/aarch64/pan-illegal.d b/gas/testsuite/gas/aarch64/pan-illegal.d
index 372b9d7..82ac6f3 100644
--- a/gas/testsuite/gas/aarch64/pan-illegal.d
+++ b/gas/testsuite/gas/aarch64/pan-illegal.d
@@ -1,3 +1,3 @@
 #as: -march=armv8.1-a --defsym ERROR=1
 #source: pan.s
-#error-output: pan-illegal.l
+#error_output: pan-illegal.l
diff --git a/gas/testsuite/gas/aarch64/pr22529.d b/gas/testsuite/gas/aarch64/pr22529.d
index 1fd0d85..4e9a5b9 100644
--- a/gas/testsuite/gas/aarch64/pr22529.d
+++ b/gas/testsuite/gas/aarch64/pr22529.d
@@ -1,4 +1,4 @@
 #as: -march=armv8.4-a
 #source: pr22529.s
-#error-output: pr22529.l
+#error_output: pr22529.l
 
diff --git a/gas/testsuite/gas/aarch64/rm-simd-ext.d b/gas/testsuite/gas/aarch64/rm-simd-ext.d
index a60f987..ebc919f 100644
--- a/gas/testsuite/gas/aarch64/rm-simd-ext.d
+++ b/gas/testsuite/gas/aarch64/rm-simd-ext.d
@@ -1,4 +1,4 @@
 #name: SIMD Extension Removal
 #source: rm-simd-ext.s
-#error-output: rm-simd-ext.l
+#error_output: rm-simd-ext.l
 #as: -mcpu=cortex-a57+nosimd
diff --git a/gas/testsuite/gas/aarch64/sve-invalid.d b/gas/testsuite/gas/aarch64/sve-invalid.d
index 961b55d..ca78608 100644
--- a/gas/testsuite/gas/aarch64/sve-invalid.d
+++ b/gas/testsuite/gas/aarch64/sve-invalid.d
@@ -1,4 +1,4 @@
 #name: Invalid SVE instructions
 #as: -march=armv8-a+sve
 #source: sve-invalid.s
-#error-output: sve-invalid.l
+#error_output: sve-invalid.l
diff --git a/gas/testsuite/gas/aarch64/sve-reg-diagnostic.d b/gas/testsuite/gas/aarch64/sve-reg-diagnostic.d
index 9bfe350..03a019b 100644
--- a/gas/testsuite/gas/aarch64/sve-reg-diagnostic.d
+++ b/gas/testsuite/gas/aarch64/sve-reg-diagnostic.d
@@ -1,3 +1,3 @@
 #name: Diagnostics Quality (SVE registers)
 #source: sve-reg-diagnostic.s
-#error-output: sve-reg-diagnostic.l
+#error_output: sve-reg-diagnostic.l
diff --git a/gas/testsuite/gas/aarch64/sve-sysreg-invalid.d b/gas/testsuite/gas/aarch64/sve-sysreg-invalid.d
index bea0678..bfe2d27 100644
--- a/gas/testsuite/gas/aarch64/sve-sysreg-invalid.d
+++ b/gas/testsuite/gas/aarch64/sve-sysreg-invalid.d
@@ -1,3 +1,3 @@
 #as: -march=armv8-a+nosve
 #source: sve-sysreg.s
-#error-output: sve-sysreg-invalid.l
+#error_output: sve-sysreg-invalid.l
diff --git a/gas/testsuite/gas/aarch64/sysreg-diagnostic.d b/gas/testsuite/gas/aarch64/sysreg-diagnostic.d
index 2f52f36..8389473 100644
--- a/gas/testsuite/gas/aarch64/sysreg-diagnostic.d
+++ b/gas/testsuite/gas/aarch64/sysreg-diagnostic.d
@@ -1,6 +1,6 @@
 #objdump: -dr -M notes
 #as: -march=armv8-a
-#error-output: sysreg-diagnostic.l
+#warning_output: sysreg-diagnostic.l
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/aarch64/verbose-error.d b/gas/testsuite/gas/aarch64/verbose-error.d
index 5e5f78a..41b1761 100644
--- a/gas/testsuite/gas/aarch64/verbose-error.d
+++ b/gas/testsuite/gas/aarch64/verbose-error.d
@@ -1,4 +1,4 @@
 #name: Verbose Error Messages
 #as: -mverbose-error
 #source: verbose-error.s
-#error-output: verbose-error.l
+#error_output: verbose-error.l
diff --git a/gas/testsuite/gas/all/byte.d b/gas/testsuite/gas/all/byte.d
index 62f3699..fd3c7dd 100644
--- a/gas/testsuite/gas/all/byte.d
+++ b/gas/testsuite/gas/all/byte.d
@@ -1,4 +1,4 @@
 #name: bad byte directive
-#error-output: byte.l
+#error_output: byte.l
 # Quoted expressions are now allowed in .byte (and similar) expressions.
 #skip: *-*-*
diff --git a/gas/testsuite/gas/all/org-1.d b/gas/testsuite/gas/all/org-1.d
index 983e6d6..960c4cf 100644
--- a/gas/testsuite/gas/all/org-1.d
+++ b/gas/testsuite/gas/all/org-1.d
@@ -1,3 +1,3 @@
 #name: .org test 1
 #as: -gdwarf2
-#error-output: org-1.l
+#error_output: org-1.l
diff --git a/gas/testsuite/gas/all/org-2.d b/gas/testsuite/gas/all/org-2.d
index 6295a97..aaac7db 100644
--- a/gas/testsuite/gas/all/org-2.d
+++ b/gas/testsuite/gas/all/org-2.d
@@ -1,2 +1,2 @@
 #name: .org test 2
-#error-output: org-2.l
+#error_output: org-2.l
diff --git a/gas/testsuite/gas/all/org-3.d b/gas/testsuite/gas/all/org-3.d
index d719403..2aa0f7b 100644
--- a/gas/testsuite/gas/all/org-3.d
+++ b/gas/testsuite/gas/all/org-3.d
@@ -1,2 +1,2 @@
 #name: .org test 3
-#error-output: org-3.l
+#error_output: org-3.l
diff --git a/gas/testsuite/gas/all/sleb128-9.d b/gas/testsuite/gas/all/sleb128-9.d
index 3d932fc..13d30d1 100644
--- a/gas/testsuite/gas/all/sleb128-9.d
+++ b/gas/testsuite/gas/all/sleb128-9.d
@@ -1,5 +1,5 @@
 #name: undefined symbols in sleb128 directive
 #source: sleb128-9.s
-#error-output: sleb128-9.l
+#error_output: sleb128-9.l
 #notarget: riscv*-*
 
diff --git a/gas/testsuite/gas/arc/asm-errors-2.d b/gas/testsuite/gas/arc/asm-errors-2.d
index fd3c09a..df88747 100644
--- a/gas/testsuite/gas/arc/asm-errors-2.d
+++ b/gas/testsuite/gas/arc/asm-errors-2.d
@@ -1,2 +1,2 @@
 #as: -mcpu=arcem
-#error-output: asm-errors-2.err
+#error_output: asm-errors-2.err
diff --git a/gas/testsuite/gas/arc/asm-errors-3.d b/gas/testsuite/gas/arc/asm-errors-3.d
index aa34c86..55337c9 100644
--- a/gas/testsuite/gas/arc/asm-errors-3.d
+++ b/gas/testsuite/gas/arc/asm-errors-3.d
@@ -1,2 +1,2 @@
 #as:
-#error-output: asm-errors-3.err
+#error_output: asm-errors-3.err
diff --git a/gas/testsuite/gas/arc/asm-errors.d b/gas/testsuite/gas/arc/asm-errors.d
index 9255a27..5a8470d 100644
--- a/gas/testsuite/gas/arc/asm-errors.d
+++ b/gas/testsuite/gas/arc/asm-errors.d
@@ -1,2 +1,2 @@
 #as: -mcpu=arc700
-#error-output: asm-errors.err
+#error_output: asm-errors.err
diff --git a/gas/testsuite/gas/arc/attr-rf16.d b/gas/testsuite/gas/arc/attr-rf16.d
index fcbac17..3235c3f 100644
--- a/gas/testsuite/gas/arc/attr-rf16.d
+++ b/gas/testsuite/gas/arc/attr-rf16.d
@@ -1,4 +1,4 @@
-#error-output: attr-rf16.err
+#warning_output: attr-rf16.err
 #as:
 #readelf: -A
 
diff --git a/gas/testsuite/gas/arc/relocs-errors.d b/gas/testsuite/gas/arc/relocs-errors.d
index 29373a7..b16941a 100644
--- a/gas/testsuite/gas/arc/relocs-errors.d
+++ b/gas/testsuite/gas/arc/relocs-errors.d
@@ -1 +1 @@
-#error-output: relocs-errors.err
+#error_output: relocs-errors.err
diff --git a/gas/testsuite/gas/arc/textinsn-errors.d b/gas/testsuite/gas/arc/textinsn-errors.d
index b2f4a71..b442a52 100644
--- a/gas/testsuite/gas/arc/textinsn-errors.d
+++ b/gas/testsuite/gas/arc/textinsn-errors.d
@@ -1 +1 @@
-#error-output: textinsn-errors.err
+#warning_output: textinsn-errors.err
diff --git a/gas/testsuite/gas/arm/addsw-bad.d b/gas/testsuite/gas/arm/addsw-bad.d
index bdd7480..56f8550 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: *-*-pe *-*-wince
-#error-output: addsw-bad.l
+#error_output: addsw-bad.l
diff --git a/gas/testsuite/gas/arm/addthumb2err.d b/gas/testsuite/gas/arm/addthumb2err.d
index 46532f3..a6b5916 100644
--- a/gas/testsuite/gas/arm/addthumb2err.d
+++ b/gas/testsuite/gas/arm/addthumb2err.d
@@ -1,6 +1,6 @@
 #name: bad Thumb2 Add{S} and Sub{S} instructions
 #as: -march=armv7-a
-#error-output: addthumb2err.l
+#error_output: addthumb2err.l
 
 # Test some Thumb2 instructions:
 
diff --git a/gas/testsuite/gas/arm/adr-invalid.d b/gas/testsuite/gas/arm/adr-invalid.d
index d8043dc..fd99e51 100644
--- a/gas/testsuite/gas/arm/adr-invalid.d
+++ b/gas/testsuite/gas/arm/adr-invalid.d
@@ -1,2 +1,2 @@
 # name: Invalid use of ADR and ADRL
-# error-output: adr-invalid.l
+# error_output: adr-invalid.l
diff --git a/gas/testsuite/gas/arm/arch7em-bad-1.d b/gas/testsuite/gas/arm/arch7em-bad-1.d
index 7cd11fc..d62965c 100644
--- a/gas/testsuite/gas/arm/arch7em-bad-1.d
+++ b/gas/testsuite/gas/arm/arch7em-bad-1.d
@@ -1,4 +1,4 @@
 #name: Valid v7E-M, invalid v7-M
 #as: -march=armv7-m
 #source: arch7em.s
-#error-output: arch7em-bad.l
+#error_output: arch7em-bad.l
diff --git a/gas/testsuite/gas/arm/arch7em-bad-2.d b/gas/testsuite/gas/arm/arch7em-bad-2.d
index 2ca6a12..1d9e97b 100644
--- a/gas/testsuite/gas/arm/arch7em-bad-2.d
+++ b/gas/testsuite/gas/arm/arch7em-bad-2.d
@@ -1,4 +1,4 @@
 #name: Valid v8-M Mainline with DSP extension, invalid v8-M Baseline
 #as: -march=armv8-m.base
 #source: arch7em.s
-#error-output: arch7em-bad.l
+#error_output: arch7em-bad.l
diff --git a/gas/testsuite/gas/arm/arch7em-bad-3.d b/gas/testsuite/gas/arm/arch7em-bad-3.d
index a513c28..65de41f 100644
--- a/gas/testsuite/gas/arm/arch7em-bad-3.d
+++ b/gas/testsuite/gas/arm/arch7em-bad-3.d
@@ -1,4 +1,4 @@
 #name: Valid v8-M Mainline with DSP extension, invalid v8-M Mainline
 #as: -march=armv8-m.main
 #source: arch7em.s
-#error-output: arch7em-bad.l
+#error_output: arch7em-bad.l
diff --git a/gas/testsuite/gas/arm/arch7m-bad.d b/gas/testsuite/gas/arm/arch7m-bad.d
index b7a3336..00515ac 100644
--- a/gas/testsuite/gas/arm/arch7m-bad.d
+++ b/gas/testsuite/gas/arm/arch7m-bad.d
@@ -1,4 +1,4 @@
 #name: Invalid V7M instructions
 #as: -march=armv7m
-#error-output: arch7m-bad.l
+#error_output: arch7m-bad.l
 
diff --git a/gas/testsuite/gas/arm/archv6s-m-bad.d b/gas/testsuite/gas/arm/archv6s-m-bad.d
index d50d34f..f0d9450 100644
--- a/gas/testsuite/gas/arm/archv6s-m-bad.d
+++ b/gas/testsuite/gas/arm/archv6s-m-bad.d
@@ -1,4 +1,4 @@
 #name: Valid v6S-M, invalid v6-M
 #as: -march=armv6-m
 #source: archv6s-m.s
-#error-output: archv6s-m-bad.l
+#error_output: archv6s-m-bad.l
diff --git a/gas/testsuite/gas/arm/archv6t2-bad.d b/gas/testsuite/gas/arm/archv6t2-bad.d
index 9b8e1b9..f1d7035 100644
--- a/gas/testsuite/gas/arm/archv6t2-bad.d
+++ b/gas/testsuite/gas/arm/archv6t2-bad.d
@@ -1,3 +1,3 @@
 #name: Invalid V6T2 instructions
 #as: -march=armv6t2
-#error-output: archv6t2-bad.l
+#error_output: archv6t2-bad.l
diff --git a/gas/testsuite/gas/arm/arm-idiv-bad.d b/gas/testsuite/gas/arm/arm-idiv-bad.d
index c3d7394..91119c3 100644
--- a/gas/testsuite/gas/arm/arm-idiv-bad.d
+++ b/gas/testsuite/gas/arm/arm-idiv-bad.d
@@ -1,4 +1,4 @@
 #name: Invalid V7 ARM DIV instructions
 #as: -march=armv7-a
-#error-output: arm-idiv-bad.l
+#error_output: arm-idiv-bad.l
 
diff --git a/gas/testsuite/gas/arm/arm-it-bad-2.d b/gas/testsuite/gas/arm/arm-it-bad-2.d
index ea93059..87914e0 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: *-*-pe
-#error-output: arm-it-bad-2.l
+#warning_output: arm-it-bad-2.l
diff --git a/gas/testsuite/gas/arm/arm-it-bad-3.d b/gas/testsuite/gas/arm/arm-it-bad-3.d
index 75e84b4..49c687b 100644
--- a/gas/testsuite/gas/arm/arm-it-bad-3.d
+++ b/gas/testsuite/gas/arm/arm-it-bad-3.d
@@ -1,3 +1,3 @@
 #name: Test automatic IT generation in Thumb-1 architectures.
 #as: -mimplicit-it=always
-#error-output: arm-it-bad-3.l
+#error_output: arm-it-bad-3.l
diff --git a/gas/testsuite/gas/arm/arm-it-bad.d b/gas/testsuite/gas/arm/arm-it-bad.d
index 9b160cf..a0bedcb 100644
--- a/gas/testsuite/gas/arm/arm-it-bad.d
+++ b/gas/testsuite/gas/arm/arm-it-bad.d
@@ -1,3 +1,3 @@
 #name: Test IT block validation in ARM mode.
 #as: -march=armv7a -mimplicit-it=never
-#error-output: arm-it-bad.l
+#error_output: arm-it-bad.l
diff --git a/gas/testsuite/gas/arm/arm3-bad.d b/gas/testsuite/gas/arm/arm3-bad.d
index 29449b2..18d0460 100644
--- a/gas/testsuite/gas/arm/arm3-bad.d
+++ b/gas/testsuite/gas/arm/arm3-bad.d
@@ -1,3 +1,3 @@
 # name: ARM 3 errors
 # as: -mcpu=arm3
-# error-output: arm3-bad.l
+# error_output: arm3-bad.l
diff --git a/gas/testsuite/gas/arm/arm7-bad.d b/gas/testsuite/gas/arm/arm7-bad.d
index 45f900c..8da8cd9 100644
--- a/gas/testsuite/gas/arm/arm7-bad.d
+++ b/gas/testsuite/gas/arm/arm7-bad.d
@@ -1,3 +1,3 @@
 # name: ARM mode Thumb errors
 # as:
-# error-output: arm7-bad.l
+# error_output: arm7-bad.l
diff --git a/gas/testsuite/gas/arm/armv1-bad.d b/gas/testsuite/gas/arm/armv1-bad.d
index f6f1454..d184bf2 100644
--- a/gas/testsuite/gas/arm/armv1-bad.d
+++ b/gas/testsuite/gas/arm/armv1-bad.d
@@ -1,3 +1,3 @@
 #name: ARM v1 errors
 #as: -mcpu=arm7m
-#error-output: armv1-bad.l
+#error_output: armv1-bad.l
diff --git a/gas/testsuite/gas/arm/armv1.d b/gas/testsuite/gas/arm/armv1.d
index 7899df7..8b9759b 100644
--- a/gas/testsuite/gas/arm/armv1.d
+++ b/gas/testsuite/gas/arm/armv1.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM v1 instructions
 #as: -mcpu=arm7t
-#error-output: armv1.l
+#warning_output: armv1.l
 
 # Test the ARM v1 instructions
 
diff --git a/gas/testsuite/gas/arm/armv2-mp-bad.d b/gas/testsuite/gas/arm/armv2-mp-bad.d
index c43ba96..be90b5f 100644
--- a/gas/testsuite/gas/arm/armv2-mp-bad.d
+++ b/gas/testsuite/gas/arm/armv2-mp-bad.d
@@ -1,4 +1,4 @@
 #name: ARM MP Extension errors
 #source: blank.s
 #as: -march=armv2+mp
-#error-output: armv2-mp-bad.l
+#error_output: armv2-mp-bad.l
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.d
index 7a48bcd..13eb7c7 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.d
@@ -1,4 +1,4 @@
 #name: Invalid armv8.2-a scalar fp16
 #source: armv8-2-fp16-scalar-bad.s
 #as: -march=armv8.2-a+fp16 -mfpu=fp-armv8
-#error-output: armv8-2-fp16-scalar-bad.l
+#error_output: armv8-2-fp16-scalar-bad.l
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb.d b/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb.d
index e78f080..b6af4d4 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb.d
@@ -1,4 +1,4 @@
 #name: Reject ARM v8.2 FP16 SIMD instruction for early arch (Thumb)
 #source: armv8-2-fp16-simd.s
 #as: -march=armv8.2-a -mfpu=neon-fp-armv8 -mthumb
-#error-output: armv8-2-fp16-simd-warning.l
+#error_output: armv8-2-fp16-simd-warning.l
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning.d b/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning.d
index d39c36d..3b769ff 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning.d
@@ -1,4 +1,4 @@
 #name: Reject ARM v8.2 FP16 SIMD instruction for early arch
 #source: armv8-2-fp16-simd.s
 #as: -march=armv8.2-a -mfpu=neon-fp-armv8
-#error-output: armv8-2-fp16-simd-warning.l
+#error_output: armv8-2-fp16-simd-warning.l
diff --git a/gas/testsuite/gas/arm/armv8-a+rdma-warning.d b/gas/testsuite/gas/arm/armv8-a+rdma-warning.d
index 6a1fd17..ee1de5b 100644
--- a/gas/testsuite/gas/arm/armv8-a+rdma-warning.d
+++ b/gas/testsuite/gas/arm/armv8-a+rdma-warning.d
@@ -3,4 +3,4 @@
 #objdump: -dr
 #skip: *-*-pe *-*-wince
 #source: armv8-a+rdma.s
-#error-output: armv8-a+rdma.l
\ No newline at end of file
+#warning_output: armv8-a+rdma.l
diff --git a/gas/testsuite/gas/arm/armv8-a-bad.d b/gas/testsuite/gas/arm/armv8-a-bad.d
index 14d6b48..302658d 100644
--- a/gas/testsuite/gas/arm/armv8-a-bad.d
+++ b/gas/testsuite/gas/arm/armv8-a-bad.d
@@ -1,4 +1,4 @@
 #name: Invalid v8-a
 #source: armv8-ar-bad.s
 #as: -march=armv8-a
-#error-output: armv8-ar-bad.l
+#error_output: armv8-ar-bad.l
diff --git a/gas/testsuite/gas/arm/armv8-a-it-bad.d b/gas/testsuite/gas/arm/armv8-a-it-bad.d
index 208ae1b..43fc9f1 100644
--- a/gas/testsuite/gas/arm/armv8-a-it-bad.d
+++ b/gas/testsuite/gas/arm/armv8-a-it-bad.d
@@ -1,4 +1,4 @@
 #name: Deprecated IT blocks (ARM v8)
 #source: armv8-ar-it-bad.s
-#error-output: armv8-ar-it-bad.l
+#error_output: armv8-ar-it-bad.l
 #as: -march=armv8-a -mimplicit-it=always
diff --git a/gas/testsuite/gas/arm/armv8-r-bad.d b/gas/testsuite/gas/arm/armv8-r-bad.d
index 332c791..150390b 100644
--- a/gas/testsuite/gas/arm/armv8-r-bad.d
+++ b/gas/testsuite/gas/arm/armv8-r-bad.d
@@ -1,4 +1,4 @@
 #name: Invalid v8-r
 #source: armv8-ar-bad.s
 #as: -march=armv8-r
-#error-output: armv8-ar-bad.l
+#error_output: armv8-ar-bad.l
diff --git a/gas/testsuite/gas/arm/armv8-r-it-bad.d b/gas/testsuite/gas/arm/armv8-r-it-bad.d
index ae24051..5260ae0 100644
--- a/gas/testsuite/gas/arm/armv8-r-it-bad.d
+++ b/gas/testsuite/gas/arm/armv8-r-it-bad.d
@@ -1,4 +1,4 @@
 #name: Deprecated IT blocks (ARM v8)
 #source: armv8-ar-it-bad.s
-#error-output: armv8-ar-it-bad.l
+#error_output: armv8-ar-it-bad.l
 #as: -march=armv8-r -mimplicit-it=always
diff --git a/gas/testsuite/gas/arm/armv8_2-a-fp16-illegal.d b/gas/testsuite/gas/arm/armv8_2-a-fp16-illegal.d
index b568087..567a74f 100644
--- a/gas/testsuite/gas/arm/armv8_2-a-fp16-illegal.d
+++ b/gas/testsuite/gas/arm/armv8_2-a-fp16-illegal.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.2-a+fp16fml -mfpu=neon-fp-armv8
-#error-output: armv8_2-a-fp16-illegal.l
+#error_output: armv8_2-a-fp16-illegal.l
diff --git a/gas/testsuite/gas/arm/armv8_3-a-fp-bad.d b/gas/testsuite/gas/arm/armv8_3-a-fp-bad.d
index a38f6e6..5a5fb3f 100644
--- a/gas/testsuite/gas/arm/armv8_3-a-fp-bad.d
+++ b/gas/testsuite/gas/arm/armv8_3-a-fp-bad.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.3-a+fp
-#error-output: armv8_3-a-fp-bad.l
+#error_output: armv8_3-a-fp-bad.l
diff --git a/gas/testsuite/gas/arm/armv8_3-a-simd-bad.d b/gas/testsuite/gas/arm/armv8_3-a-simd-bad.d
index b2060cd..017f5ff 100644
--- a/gas/testsuite/gas/arm/armv8_3-a-simd-bad.d
+++ b/gas/testsuite/gas/arm/armv8_3-a-simd-bad.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.3-a+fp16+simd
-#error-output: armv8_3-a-simd-bad.l
+#error_output: armv8_3-a-simd-bad.l
diff --git a/gas/testsuite/gas/arm/barrier-bad-thumb.d b/gas/testsuite/gas/arm/barrier-bad-thumb.d
index 44f8279..9b7fb1e 100644
--- a/gas/testsuite/gas/arm/barrier-bad-thumb.d
+++ b/gas/testsuite/gas/arm/barrier-bad-thumb.d
@@ -2,4 +2,4 @@
 #skip: *-*-pe *-*-wince
 #source: barrier-bad.s
 #as: -mthumb
-#error-output: barrier-bad.l
+#error_output: barrier-bad.l
diff --git a/gas/testsuite/gas/arm/barrier-bad.d b/gas/testsuite/gas/arm/barrier-bad.d
index 93bea8e..c5c680e 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: *-*-pe *-*-wince
-#error-output: barrier-bad.l
+#error_output: barrier-bad.l
diff --git a/gas/testsuite/gas/arm/bl-local-v4t.d b/gas/testsuite/gas/arm/bl-local-v4t.d
index 0262b7e..2985cee 100644
--- a/gas/testsuite/gas/arm/bl-local-v4t.d
+++ b/gas/testsuite/gas/arm/bl-local-v4t.d
@@ -2,7 +2,7 @@
 #objdump: -drw --prefix-addresses --show-raw-insn
 #target: *-*-*eabi* *-*-nacl*
 #as:
-# stderr: blx-local-thumb.l
+#warning_output: blx-local-thumb.l
 
 .*: +file format .*arm.*
 Disassembly of section .text:
diff --git a/gas/testsuite/gas/arm/blx-bl-convert.d b/gas/testsuite/gas/arm/blx-bl-convert.d
index 7d8c1e6..c3e0055 100644
--- a/gas/testsuite/gas/arm/blx-bl-convert.d
+++ b/gas/testsuite/gas/arm/blx-bl-convert.d
@@ -1,5 +1,5 @@
 #name: blx->bl convert under no -march/cpu
-#error-output: blx-bl-convert.l
+#warning_output: blx-bl-convert.l
 #objdump: -d
 #skip: *-*-pe *-wince-* *-*-vxworks *-*-netbsdelf *-*-nto*
 
diff --git a/gas/testsuite/gas/arm/blx-local.d b/gas/testsuite/gas/arm/blx-local.d
index d8ba40f..36cfd4f 100644
--- a/gas/testsuite/gas/arm/blx-local.d
+++ b/gas/testsuite/gas/arm/blx-local.d
@@ -2,7 +2,7 @@
 #objdump: -drw --prefix-addresses --show-raw-insn
 #target: *-*-*eabi* *-*-nacl*
 #as:
-# stderr: blx-local.l
+#warning_output: blx-local.l
 # Test assembler resolution of blx and bl instructions in ARM mode.
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/branch-reloc.d b/gas/testsuite/gas/arm/branch-reloc.d
index 8ef2110..4015955 100644
--- a/gas/testsuite/gas/arm/branch-reloc.d
+++ b/gas/testsuite/gas/arm/branch-reloc.d
@@ -3,7 +3,7 @@
 #target: *-*-*eabi* *-*-nacl*
 #as: -march=armv5t
 #objdump: -rd
-#stderr: branch-reloc.l
+#warning_output: branch-reloc.l
 
 # Test the generation of relocation for inter-section branches
 
diff --git a/gas/testsuite/gas/arm/copro-arm_v2plus-arm_v1.d b/gas/testsuite/gas/arm/copro-arm_v2plus-arm_v1.d
index b5f17d5..4ae22ee 100644
--- a/gas/testsuite/gas/arm/copro-arm_v2plus-arm_v1.d
+++ b/gas/testsuite/gas/arm/copro-arm_v2plus-arm_v1.d
@@ -2,4 +2,4 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: No ARMv2 ARM CoProcessor Instructions on ARMv1
 #as: -march=armv1 -EL
-#error-output: copro-arm_v2plus-thumb_v6t2plus-unavail.l
+#error_output: copro-arm_v2plus-thumb_v6t2plus-unavail.l
diff --git a/gas/testsuite/gas/arm/copro-arm_v5plus-arm_v4.d b/gas/testsuite/gas/arm/copro-arm_v5plus-arm_v4.d
index b5dc309..aea10d0 100644
--- a/gas/testsuite/gas/arm/copro-arm_v5plus-arm_v4.d
+++ b/gas/testsuite/gas/arm/copro-arm_v5plus-arm_v4.d
@@ -2,4 +2,4 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: No ARMv5 ARM CoProcessor Instructions on ARMv4
 #as: -march=armv4 -EL
-#error-output: copro-arm_v5plus-thumb_v6t2plus-unavail.l
+#error_output: copro-arm_v5plus-thumb_v6t2plus-unavail.l
diff --git a/gas/testsuite/gas/arm/copro-arm_v5teplus-arm_v5.d b/gas/testsuite/gas/arm/copro-arm_v5teplus-arm_v5.d
index d41c573..6e6c0c2 100644
--- a/gas/testsuite/gas/arm/copro-arm_v5teplus-arm_v5.d
+++ b/gas/testsuite/gas/arm/copro-arm_v5teplus-arm_v5.d
@@ -2,4 +2,4 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: No ARMv5TE ARM CoProcessor Instructions on ARMv5
 #as: -march=armv5 -EL
-#error-output: copro-arm_v5teplus-thumb_v6t2plus-unavail.l
+#error_output: copro-arm_v5teplus-thumb_v6t2plus-unavail.l
diff --git a/gas/testsuite/gas/arm/copro-arm_v6plus-arm_v5te.d b/gas/testsuite/gas/arm/copro-arm_v6plus-arm_v5te.d
index 4024f3f..e9315d8 100644
--- a/gas/testsuite/gas/arm/copro-arm_v6plus-arm_v5te.d
+++ b/gas/testsuite/gas/arm/copro-arm_v6plus-arm_v5te.d
@@ -2,4 +2,4 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: No ARMv6 ARM CoProcessor Instructions on ARMv5TE
 #as: -march=armv5te -EL
-#error-output: copro-arm_v6plus-thumb_v6t2plus-unavail.l
+#error_output: copro-arm_v6plus-thumb_v6t2plus-unavail.l
diff --git a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-1.d b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-1.d
index e7d528b..669bbf7 100644
--- a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-1.d
+++ b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-1.d
@@ -2,4 +2,4 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: No ARMv6T2 Thumb CoProcessor Instructions on ARMv4T (1)
 #as: -march=armv4t -mthumb -EL
-#error-output: copro-arm_v2plus-thumb_v6t2plus-unavail.l
+#error_output: copro-arm_v2plus-thumb_v6t2plus-unavail.l
diff --git a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-2.d b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-2.d
index 804115a..1c60af8 100644
--- a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-2.d
+++ b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-2.d
@@ -2,4 +2,4 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: No ARMv6T2 Thumb CoProcessor Instructions on ARMv4T (2)
 #as: -march=armv4t -mthumb -EL
-#error-output: copro-arm_v5plus-thumb_v6t2plus-unavail.l
+#error_output: copro-arm_v5plus-thumb_v6t2plus-unavail.l
diff --git a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-3.d b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-3.d
index 2fb0be0..790f9c0 100644
--- a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-3.d
+++ b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-3.d
@@ -2,4 +2,4 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: No ARMv6T2 Thumb CoProcessor Instructions on ARMv4T (3)
 #as: -march=armv4t -mthumb -EL
-#error-output: copro-arm_v5teplus-thumb_v6t2plus-unavail.l
+#error_output: copro-arm_v5teplus-thumb_v6t2plus-unavail.l
diff --git a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-4.d b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-4.d
index 6490fe9..7048d534 100644
--- a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-4.d
+++ b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v4t-4.d
@@ -2,4 +2,4 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: No ARMv6T2 Thumb CoProcessor Instructions on ARMv4T (4)
 #as: -march=armv4t -mthumb -EL
-#error-output: copro-arm_v6plus-thumb_v6t2plus-unavail.l
+#error_output: copro-arm_v6plus-thumb_v6t2plus-unavail.l
diff --git a/gas/testsuite/gas/arm/crc32-armv8-a-bad.d b/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
index 029aef4..638c972 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
@@ -2,7 +2,7 @@
 #name: Unpredictable ARMv8-A CRC32 instructions.
 #source: crc32-armv8-ar-bad.s
 #as: -march=armv8-a+crc
-#stderr: crc32-bad.l
+#warning_output: crc32-bad.l
 #notarget: *-*-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 e410555..5a00ffc 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
@@ -2,7 +2,7 @@
 #name: Unpredictable ARMv8-R CRC32 instructions.
 #source: crc32-armv8-ar-bad.s
 #as: -march=armv8-r+crc
-#stderr: crc32-bad.l
+#warning_output: crc32-bad.l
 #notarget: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/depr-swp.d b/gas/testsuite/gas/arm/depr-swp.d
index 40add70..a080334 100644
--- a/gas/testsuite/gas/arm/depr-swp.d
+++ b/gas/testsuite/gas/arm/depr-swp.d
@@ -1,3 +1,3 @@
 #name: Deprecated swp{b} instructions
 #source: depr-swp.s
-#error-output: depr-swp.l
+#warning_output: depr-swp.l
diff --git a/gas/testsuite/gas/arm/dest-unpredictable.d b/gas/testsuite/gas/arm/dest-unpredictable.d
index 129d08c..a934cfd 100644
--- a/gas/testsuite/gas/arm/dest-unpredictable.d
+++ b/gas/testsuite/gas/arm/dest-unpredictable.d
@@ -1,2 +1,2 @@
 # name: Unpredictable MRRC and MRRC2 instructions. - ARM
-# error-output: dest-unpredictable.l
+# error_output: dest-unpredictable.l
diff --git a/gas/testsuite/gas/arm/dotprod-illegal.d b/gas/testsuite/gas/arm/dotprod-illegal.d
index f75450c..8c0ec19 100644
--- a/gas/testsuite/gas/arm/dotprod-illegal.d
+++ b/gas/testsuite/gas/arm/dotprod-illegal.d
@@ -1,2 +1,2 @@
 #as: -march=armv8.2-a+dotprod -mfpu=neon-fp-armv8
-#error-output: dotprod-illegal.l
+#error_output: dotprod-illegal.l
diff --git a/gas/testsuite/gas/arm/dotprod-legacy-arch.d b/gas/testsuite/gas/arm/dotprod-legacy-arch.d
index 9f87503..02e0a02 100644
--- a/gas/testsuite/gas/arm/dotprod-legacy-arch.d
+++ b/gas/testsuite/gas/arm/dotprod-legacy-arch.d
@@ -1,3 +1,3 @@
 #as: -march=armv8.1-a+dotprod -mfpu=neon-fp-armv8
 #source: dotprod.s
-#error-output: dotprod-legacy-arch.l
+#error_output: dotprod-legacy-arch.l
diff --git a/gas/testsuite/gas/arm/forbid-armv7-idiv-ext.d b/gas/testsuite/gas/arm/forbid-armv7-idiv-ext.d
index 85c7dc3..05c172f 100644
--- a/gas/testsuite/gas/arm/forbid-armv7-idiv-ext.d
+++ b/gas/testsuite/gas/arm/forbid-armv7-idiv-ext.d
@@ -1,4 +1,4 @@
 # name: Forbidden idiv for ARMv7
 # source: blank.s
 # as: -march=armv7+idiv
-#error-output: forbid-armv7-idiv-ext.l
+# error_output: forbid-armv7-idiv-ext.l
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 29574f9..05dfcf2 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: *-*-pe *-*-wince *-*-vxworks
-#error-output: group-reloc-alu-encoding-bad.l
+#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 7201db1..5bf1b2a 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: *-*-pe *-*-wince
-#error-output: group-reloc-alu-parsing-bad.l
+#error_output: group-reloc-alu-parsing-bad.l
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 51d26a1..5444874 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: *-*-pe *-*-wince *-*-vxworks
-#error-output: group-reloc-ldc-encoding-bad.l
+#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 61f954c..05701d7 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: *-*-pe *-*-wince
-#error-output: group-reloc-ldc-parsing-bad.l
+#error_output: group-reloc-ldc-parsing-bad.l
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 d827db7..c0dfe8e 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: *-*-pe *-*-wince *-*-vxworks
-#error-output: group-reloc-ldr-encoding-bad.l
+#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 5a934ee..40112dd 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: *-*-pe *-*-wince
-#error-output: group-reloc-ldr-parsing-bad.l
+#error_output: group-reloc-ldr-parsing-bad.l
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 2aab90e..6eb25f3 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: *-*-pe *-*-wince *-*-vxworks
-#error-output: group-reloc-ldrs-encoding-bad.l
+#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 c28671e..76922ed 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: *-*-pe *-*-wince
-#error-output: group-reloc-ldrs-parsing-bad.l
+#error_output: group-reloc-ldrs-parsing-bad.l
diff --git a/gas/testsuite/gas/arm/insn-error-a.d b/gas/testsuite/gas/arm/insn-error-a.d
index 6072808..9f25927 100644
--- a/gas/testsuite/gas/arm/insn-error-a.d
+++ b/gas/testsuite/gas/arm/insn-error-a.d
@@ -3,4 +3,4 @@
 #name: invalid instruction recovery test - ARM version
 #objdump: -d --prefix-addresses --show-raw-insn
 #skip: *-*-pe *-*-wince
-#error-output: insn-error-a.l
+#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 4eead58..0647d01 100644
--- a/gas/testsuite/gas/arm/insn-error-t.d
+++ b/gas/testsuite/gas/arm/insn-error-t.d
@@ -3,4 +3,4 @@
 #name: invalid instruction recovery test - Thumb version
 #objdump: -d --prefix-addresses --show-raw-insn
 #skip: *-*-pe *-*-wince
-#error-output: insn-error-t.l
+#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 0d64413..230d5ff 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: *-*-pe *-*-wince
-#error-output: inst-po-2.l
+#error_output: inst-po-2.l
diff --git a/gas/testsuite/gas/arm/iwmmxt-bad.d b/gas/testsuite/gas/arm/iwmmxt-bad.d
index 6b44634..2e4ee20 100644
--- a/gas/testsuite/gas/arm/iwmmxt-bad.d
+++ b/gas/testsuite/gas/arm/iwmmxt-bad.d
@@ -1,3 +1,3 @@
 #name: iWMMXt errors
 #as: -mcpu=iwmmxt
-#error-output: iwmmxt-bad.l
+#error_output: iwmmxt-bad.l
diff --git a/gas/testsuite/gas/arm/iwmmxt-bad2.d b/gas/testsuite/gas/arm/iwmmxt-bad2.d
index c8587a4..8c13132 100644
--- a/gas/testsuite/gas/arm/iwmmxt-bad2.d
+++ b/gas/testsuite/gas/arm/iwmmxt-bad2.d
@@ -1,3 +1,3 @@
 #name: iWMMXt CoProcessor offset errors
 #as: -mcpu=iwmmxt
-#error-output: iwmmxt-bad2.l
+#error_output: iwmmxt-bad2.l
diff --git a/gas/testsuite/gas/arm/ld-sp-warn-cortex-m3.d b/gas/testsuite/gas/arm/ld-sp-warn-cortex-m3.d
index c1f89b4..9abc835 100644
--- a/gas/testsuite/gas/arm/ld-sp-warn-cortex-m3.d
+++ b/gas/testsuite/gas/arm/ld-sp-warn-cortex-m3.d
@@ -1,4 +1,4 @@
 # name: Erratum 752419: Warn Loads with writebacks to SP (cortex m3)
 # as: -mcpu=cortex-m3
 # source: ld-sp-warn.s
-# error-output: ld-sp-warn-cortex-m3.l
+# error_output: ld-sp-warn-cortex-m3.l
diff --git a/gas/testsuite/gas/arm/ld-sp-warn-cortex-m4.d b/gas/testsuite/gas/arm/ld-sp-warn-cortex-m4.d
index 0ae6d98..1d7da83 100644
--- a/gas/testsuite/gas/arm/ld-sp-warn-cortex-m4.d
+++ b/gas/testsuite/gas/arm/ld-sp-warn-cortex-m4.d
@@ -1,4 +1,4 @@
 # name: Erratum 752419: Warn Loads with writebacks to SP (cortex m4)
 # as: -mcpu=cortex-m4
 # source: ld-sp-warn.s
-# error-output: ld-sp-warn-cortex-m4.l
+# error_output: ld-sp-warn-cortex-m4.l
diff --git a/gas/testsuite/gas/arm/ld-sp-warn-v7.d b/gas/testsuite/gas/arm/ld-sp-warn-v7.d
index 4d3b0a5..32718b4 100644
--- a/gas/testsuite/gas/arm/ld-sp-warn-v7.d
+++ b/gas/testsuite/gas/arm/ld-sp-warn-v7.d
@@ -1,4 +1,4 @@
 # name: Erratum 752419: Warn Loads with writebacks to SP (v7)
 # as: -march=armv7
 # source: ld-sp-warn.s
-# error-output: ld-sp-warn-v7.l
+# error_output: ld-sp-warn-v7.l
diff --git a/gas/testsuite/gas/arm/ld-sp-warn-v7a.d b/gas/testsuite/gas/arm/ld-sp-warn-v7a.d
index 2f7dc8d..115680a 100644
--- a/gas/testsuite/gas/arm/ld-sp-warn-v7a.d
+++ b/gas/testsuite/gas/arm/ld-sp-warn-v7a.d
@@ -1,4 +1,4 @@
 # name: Erratum 752419: Warn Loads with writebacks to SP (v7a)
 # as: -march=armv7-a
 # source: ld-sp-warn.s
-# error-output: ld-sp-warn-v7a.l
+# error_output: ld-sp-warn-v7a.l
diff --git a/gas/testsuite/gas/arm/ld-sp-warn-v7em.d b/gas/testsuite/gas/arm/ld-sp-warn-v7em.d
index d69368e..a7d61b0 100644
--- a/gas/testsuite/gas/arm/ld-sp-warn-v7em.d
+++ b/gas/testsuite/gas/arm/ld-sp-warn-v7em.d
@@ -1,4 +1,4 @@
 # name: Erratum 752419: Warn Loads with writebacks to SP (v7em)
 # as: -march=armv7e-m
 # source: ld-sp-warn.s
-# error-output: ld-sp-warn-v7e-m.l
+# error_output: ld-sp-warn-v7e-m.l
diff --git a/gas/testsuite/gas/arm/ld-sp-warn-v7m.d b/gas/testsuite/gas/arm/ld-sp-warn-v7m.d
index f268357..c2ecb01 100644
--- a/gas/testsuite/gas/arm/ld-sp-warn-v7m.d
+++ b/gas/testsuite/gas/arm/ld-sp-warn-v7m.d
@@ -1,4 +1,4 @@
 # name: Erratum 752419: Warn Loads with writebacks to SP  (v7m)
 # as: -march=armv7m
 # source: ld-sp-warn.s
-# error-output: ld-sp-warn-v7m.l
+# error_output: ld-sp-warn-v7m.l
diff --git a/gas/testsuite/gas/arm/ld-sp-warn-v7r.d b/gas/testsuite/gas/arm/ld-sp-warn-v7r.d
index 59a5db4..61ab8af 100644
--- a/gas/testsuite/gas/arm/ld-sp-warn-v7r.d
+++ b/gas/testsuite/gas/arm/ld-sp-warn-v7r.d
@@ -1,4 +1,4 @@
 # name: Erratum 752419: Warn Loads with writebacks to SP  (v7r)
 # as: -march=armv7-r
 # source: ld-sp-warn.s
-# error-output: ld-sp-warn-v7r.l
+# error_output: ld-sp-warn-v7r.l
diff --git a/gas/testsuite/gas/arm/ld-sp-warn.d b/gas/testsuite/gas/arm/ld-sp-warn.d
index dcbbdd2..268b384 100644
--- a/gas/testsuite/gas/arm/ld-sp-warn.d
+++ b/gas/testsuite/gas/arm/ld-sp-warn.d
@@ -1,3 +1,3 @@
 # name: Erratum 752419: Warn Loads with writebacks to SP
 # source: ld-sp-warn.s
-# error-output: ld-sp-warn.l
+# error_output: ld-sp-warn.l
diff --git a/gas/testsuite/gas/arm/ldgesb-bad.d b/gas/testsuite/gas/arm/ldgesb-bad.d
index 1f4283c..411b493 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
+# error_output: ldgesb-bad.l
 # skip: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/ldgesh-bad.d b/gas/testsuite/gas/arm/ldgesh-bad.d
index 8268f7f..0bfaabb 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
+# error_output: ldgesh-bad.l
 # skip: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/ldr-bad.d b/gas/testsuite/gas/arm/ldr-bad.d
index 82a1718..b8747c6 100644
--- a/gas/testsuite/gas/arm/ldr-bad.d
+++ b/gas/testsuite/gas/arm/ldr-bad.d
@@ -1,3 +1,3 @@
 # name: Unpredictable operations - ldr - arm
-# error-output: ldr-bad.l
+# error_output: ldr-bad.l
 
diff --git a/gas/testsuite/gas/arm/ldr-t-bad.d b/gas/testsuite/gas/arm/ldr-t-bad.d
index 0c28a85..48f665f 100644
--- a/gas/testsuite/gas/arm/ldr-t-bad.d
+++ b/gas/testsuite/gas/arm/ldr-t-bad.d
@@ -1,3 +1,3 @@
 # name: Unpredictable operations - ldr - thumb
-# error-output: ldr-t-bad.l
+# error_output: ldr-t-bad.l
 
diff --git a/gas/testsuite/gas/arm/ldrd-unpredictable.d b/gas/testsuite/gas/arm/ldrd-unpredictable.d
index 10561b8..d622cab 100644
--- a/gas/testsuite/gas/arm/ldrd-unpredictable.d
+++ b/gas/testsuite/gas/arm/ldrd-unpredictable.d
@@ -1,2 +1,2 @@
 # name: Unpredictable LDRD and STRD instructions. - ARM
-# error-output: ldrd-unpredictable.l
+# warning_output: ldrd-unpredictable.l
diff --git a/gas/testsuite/gas/arm/ldsgeb.d b/gas/testsuite/gas/arm/ldsgeb.d
index 2c674aa..ed625e4 100644
--- a/gas/testsuite/gas/arm/ldsgeb.d
+++ b/gas/testsuite/gas/arm/ldsgeb.d
@@ -1,2 +1,2 @@
 # name: Accept lds<cc>sb mnemonics
-# error-output: ldsgeb.l
+# warning_output: ldsgeb.l
diff --git a/gas/testsuite/gas/arm/ldsgeh.d b/gas/testsuite/gas/arm/ldsgeh.d
index 293d761..16a020b 100644
--- a/gas/testsuite/gas/arm/ldsgeh.d
+++ b/gas/testsuite/gas/arm/ldsgeh.d
@@ -1,2 +1,2 @@
 # name: Accept lds<cc>sh mnemonics
-# error-output: ldsgeh.l
+# warning_output: ldsgeh.l
diff --git a/gas/testsuite/gas/arm/missing.d b/gas/testsuite/gas/arm/missing.d
index 6a0cbf2..b793919 100644
--- a/gas/testsuite/gas/arm/missing.d
+++ b/gas/testsuite/gas/arm/missing.d
@@ -1,3 +1,3 @@
 #name: missing operands
 #as: -march=armv5
-#error-output: missing.l
+#error_output: missing.l
diff --git a/gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.d b/gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.d
index e4cf35e..4487b3b 100644
--- a/gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.d
+++ b/gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.d
@@ -1,2 +1,2 @@
 # name: MRS/MSR negative test, architecture v7-A, ARM mode
-# error-output: mrs-msr-arm-v7-a-bad.l
+# error_output: mrs-msr-arm-v7-a-bad.l
diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.d b/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.d
index eef7f03..42569d6 100644
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.d
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.d
@@ -1,2 +1,2 @@
 # name: MRS/MSR negative test, architecture v7-M, Thumb mode
-# error-output: mrs-msr-thumb-v7-m-bad.l
+# error_output: mrs-msr-thumb-v7-m-bad.l
diff --git a/gas/testsuite/gas/arm/msr-imm-bad.d b/gas/testsuite/gas/arm/msr-imm-bad.d
index 94dc415..ec98fad 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: *-*-pe *-*-wince
-# error-output: msr-imm-bad.l
+# 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 1a5ca24..ef20169 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: *-*-pe *-*-wince
-# error-output: msr-reg-bad.l
+# error_output: msr-reg-bad.l
 # source: msr-reg.s
 # as: -march=armv7-m
diff --git a/gas/testsuite/gas/arm/mul-overlap.d b/gas/testsuite/gas/arm/mul-overlap.d
index 53406e3..f78c867 100644
--- a/gas/testsuite/gas/arm/mul-overlap.d
+++ b/gas/testsuite/gas/arm/mul-overlap.d
@@ -1,2 +1,2 @@
 # name: Overlapping multiplication operands without architecture specification
-# error-output: mul-overlap.l
+# warning_output: mul-overlap.l
diff --git a/gas/testsuite/gas/arm/neon-addressing-bad.d b/gas/testsuite/gas/arm/neon-addressing-bad.d
index 3e27426..41d5aba 100644
--- a/gas/testsuite/gas/arm/neon-addressing-bad.d
+++ b/gas/testsuite/gas/arm/neon-addressing-bad.d
@@ -1,3 +1,3 @@
 # name: Bad operand in Advanced SIMD Neon instructions
 # as: -mfpu=neon
-# error-output: neon-addressing-bad.l
+# error_output: neon-addressing-bad.l
diff --git a/gas/testsuite/gas/arm/neon-cond-bad.d b/gas/testsuite/gas/arm/neon-cond-bad.d
index 105ba4d..ae31085 100644
--- a/gas/testsuite/gas/arm/neon-cond-bad.d
+++ b/gas/testsuite/gas/arm/neon-cond-bad.d
@@ -1,3 +1,3 @@
 # name: Illegal conditions in Neon instructions, ARM mode
 # as: -mfpu=neon -I$srcdir/$subdir
-# error-output: neon-cond-bad.l
+# error_output: neon-cond-bad.l
diff --git a/gas/testsuite/gas/arm/neon-ldst-align-bad.d b/gas/testsuite/gas/arm/neon-ldst-align-bad.d
index 28ebb9d..cca9db3 100644
--- a/gas/testsuite/gas/arm/neon-ldst-align-bad.d
+++ b/gas/testsuite/gas/arm/neon-ldst-align-bad.d
@@ -1,3 +1,3 @@
 # name: Bad alignment in Advanced SIMD Neon instructions
 # as: -mfpu=neon
-# error-output: neon-ldst-align-bad.l
+# error_output: neon-ldst-align-bad.l
diff --git a/gas/testsuite/gas/arm/neon-ldst-es-bad.d b/gas/testsuite/gas/arm/neon-ldst-es-bad.d
index 576ee7a..0f4bf07 100644
--- a/gas/testsuite/gas/arm/neon-ldst-es-bad.d
+++ b/gas/testsuite/gas/arm/neon-ldst-es-bad.d
@@ -1,3 +1,3 @@
 # name: Bad element size combinations in Neon load/store instructions
 # as: -mfpu=neon
-# error-output: neon-ldst-es-bad.l
+# error_output: neon-ldst-es-bad.l
diff --git a/gas/testsuite/gas/arm/neon-suffix-bad.d b/gas/testsuite/gas/arm/neon-suffix-bad.d
index 36bb986..7e3bdfe 100644
--- a/gas/testsuite/gas/arm/neon-suffix-bad.d
+++ b/gas/testsuite/gas/arm/neon-suffix-bad.d
@@ -1,3 +1,3 @@
 # name: Bad suffix for non-Neon mnemonic
 # as: -mfpu=neon
-# error-output: neon-suffix-bad.l
+# error_output: neon-suffix-bad.l
diff --git a/gas/testsuite/gas/arm/neon-vmov-bad.d b/gas/testsuite/gas/arm/neon-vmov-bad.d
index 47ba4d8..3e4132d 100644
--- a/gas/testsuite/gas/arm/neon-vmov-bad.d
+++ b/gas/testsuite/gas/arm/neon-vmov-bad.d
@@ -1,3 +1,3 @@
 # name: Bad shape for vmov
 # as: -mfpu=neon
-# error-output: neon-vmov-bad.l
+# error_output: neon-vmov-bad.l
diff --git a/gas/testsuite/gas/arm/noarm.d b/gas/testsuite/gas/arm/noarm.d
index ae34f83..eb07566 100644
--- a/gas/testsuite/gas/arm/noarm.d
+++ b/gas/testsuite/gas/arm/noarm.d
@@ -1,3 +1,3 @@
 # name: Disallow ARM instructions on V7M
 # as: 
-# error-output: noarm.l
+# error_output: noarm.l
diff --git a/gas/testsuite/gas/arm/pr18256.d b/gas/testsuite/gas/arm/pr18256.d
index 0c5e514..aaa8585 100644
--- a/gas/testsuite/gas/arm/pr18256.d
+++ b/gas/testsuite/gas/arm/pr18256.d
@@ -1,6 +1,6 @@
 # name: PR18256 - Bad code triggers internal error
 #as:
-#error-output: pr18256.l
+#error_output: pr18256.l
 
 
 
diff --git a/gas/testsuite/gas/arm/pr18347.d b/gas/testsuite/gas/arm/pr18347.d
index b9f042a..064414b 100644
--- a/gas/testsuite/gas/arm/pr18347.d
+++ b/gas/testsuite/gas/arm/pr18347.d
@@ -1,3 +1,3 @@
 # name: PR18347 - GAS silently ignores a misconstructed LDR instruction
 #as:
-#error-output: pr18347.l
+#warning_output: pr18347.l
diff --git a/gas/testsuite/gas/arm/pr20429.d b/gas/testsuite/gas/arm/pr20429.d
index 8837537..fe42df3 100644
--- a/gas/testsuite/gas/arm/pr20429.d
+++ b/gas/testsuite/gas/arm/pr20429.d
@@ -1,3 +1,3 @@
 # name: PR 20429: Too many registers in VPUSH/VPOP
 # as: -mfpu=neon
-# error-output: pr20429.l
+# error_output: pr20429.l
diff --git a/gas/testsuite/gas/arm/pr22773.d b/gas/testsuite/gas/arm/pr22773.d
index adb9681..ac5ed3e 100644
--- a/gas/testsuite/gas/arm/pr22773.d
+++ b/gas/testsuite/gas/arm/pr22773.d
@@ -1,2 +1,2 @@
 # name: PR 22773: Invalid immediate constants produce incorrect instruction
-# error-output: pr22773.l
+# error_output: pr22773.l
diff --git a/gas/testsuite/gas/arm/r15-bad.d b/gas/testsuite/gas/arm/r15-bad.d
index ec7c305..ad8a63d 100644
--- a/gas/testsuite/gas/arm/r15-bad.d
+++ b/gas/testsuite/gas/arm/r15-bad.d
@@ -1,2 +1,2 @@
 #name: Invalid use of r15 errors
-#error-output: r15-bad.l
+#error_output: r15-bad.l
diff --git a/gas/testsuite/gas/arm/reloc-bad.d b/gas/testsuite/gas/arm/reloc-bad.d
index 95e5a6a..6eda200 100644
--- a/gas/testsuite/gas/arm/reloc-bad.d
+++ b/gas/testsuite/gas/arm/reloc-bad.d
@@ -1,3 +1,3 @@
 #name: Invalid relocations
-#error-output: reloc-bad.l
+#error_output: reloc-bad.l
 #notarget: *-*-vxworks
diff --git a/gas/testsuite/gas/arm/req.d b/gas/testsuite/gas/arm/req.d
index 41707ff..716df6d 100644
--- a/gas/testsuite/gas/arm/req.d
+++ b/gas/testsuite/gas/arm/req.d
@@ -1,3 +1,3 @@
 #name: .req errors
 #as: -mcpu=arm7m
-#error-output: req.l
+#error_output: req.l
diff --git a/gas/testsuite/gas/arm/shift-bad-pc.d b/gas/testsuite/gas/arm/shift-bad-pc.d
index 17edcd3..65e65a8 100644
--- a/gas/testsuite/gas/arm/shift-bad-pc.d
+++ b/gas/testsuite/gas/arm/shift-bad-pc.d
@@ -1,3 +1,3 @@
 # name: pc used in instructions with register-shifted register
 # as:
-# error-output: shift-bad-pc.l
+# warning_output: shift-bad-pc.l
diff --git a/gas/testsuite/gas/arm/shift-bad.d b/gas/testsuite/gas/arm/shift-bad.d
index 7d4cac1..f74afd9 100644
--- a/gas/testsuite/gas/arm/shift-bad.d
+++ b/gas/testsuite/gas/arm/shift-bad.d
@@ -1,3 +1,3 @@
 # name: PR 12854: Extraneous shifts
 # as:
-# error-output: shift-bad.l
+# error_output: shift-bad.l
diff --git a/gas/testsuite/gas/arm/simd_by_scalar_low_regbank.d b/gas/testsuite/gas/arm/simd_by_scalar_low_regbank.d
index 28b99f1..85d8c32 100644
--- a/gas/testsuite/gas/arm/simd_by_scalar_low_regbank.d
+++ b/gas/testsuite/gas/arm/simd_by_scalar_low_regbank.d
@@ -1,4 +1,4 @@
 #name: VMUL/VMLA/VMLS by scalar reg restriction
 #source: simd_by_scalar_low_regbank.s
 #as: -march=armv8.2-a+fp16 -mfpu=neon-fp-armv8
-#error-output: simd_by_scalar_low_regbank.l
+#error_output: simd_by_scalar_low_regbank.l
diff --git a/gas/testsuite/gas/arm/simd_by_scalar_low_regbank_thumb.d b/gas/testsuite/gas/arm/simd_by_scalar_low_regbank_thumb.d
index f4e1980..daaed73 100644
--- a/gas/testsuite/gas/arm/simd_by_scalar_low_regbank_thumb.d
+++ b/gas/testsuite/gas/arm/simd_by_scalar_low_regbank_thumb.d
@@ -1,4 +1,4 @@
 #name: VMUL/VMLA/VMLS by scalar reg restriction (Thumb)
 #source: simd_by_scalar_low_regbank.s
 #as: -march=armv8.2-a+fp16 -mfpu=neon-fp-armv8 -mthumb
-#error-output: simd_by_scalar_low_regbank.l
+#error_output: simd_by_scalar_low_regbank.l
diff --git a/gas/testsuite/gas/arm/sp-pc-validations-bad-t-v8a.d b/gas/testsuite/gas/arm/sp-pc-validations-bad-t-v8a.d
index c5996fb..8ca576b 100644
--- a/gas/testsuite/gas/arm/sp-pc-validations-bad-t-v8a.d
+++ b/gas/testsuite/gas/arm/sp-pc-validations-bad-t-v8a.d
@@ -1,4 +1,4 @@
 # as: -march=armv8-a
 # name: Invalid SP and PC operands test - THUMB (v8a)
 # source: sp-pc-validations-bad-t.s
-# error-output: sp-pc-validations-bad-t-v8a.l
+# error_output: sp-pc-validations-bad-t-v8a.l[...]

[diff truncated at 100000 bytes]


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]