This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
gas run_dump_test rename stderr and error-output
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Sat, 15 Sep 2018 17:00:53 +0930
- Subject: 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 --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 7954de9c6d..d1cd7536bb 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 ce7f637fe4..f76d06dca2 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 6b5e944621..829b04a396 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 098552b25f..2c00b65430 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 919969766b..502387b666 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 e0f9718b19..5cb6a765ad 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 e925739dab..a86618a7ff 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 5e9e5c2c21..3ec774d60c 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 ee52a9c600..297ca7999d 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 af94c51f95..c4b0fac251 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 000904b229..48e8da54dd 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 7aefc53701..6468aabdba 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 36e94dfb5b..77471b721b 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 ab2dc304e9..0415e362bf 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 bcb965e4b0..f1cca33467 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 89e0e89875..d2131d2769 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 669e85d38a..6568e15f03 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 b7b72eadd3..2eb70b48f2 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 5306efbb93..891f4f692b 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 309391bdcc..932eb54243 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 904eaced73..33bbb0c22e 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 79caca7682..2377da7d68 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 372b9d7f52..82ac6f39b2 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 1fd0d85d83..4e9a5b91d1 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 a60f987483..ebc919f72a 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 961b55d472..ca78608404 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 9bfe35046a..03a019b4b1 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 bea06780eb..bfe2d27d4d 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 2f52f36b4f..8389473e90 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 5e5f78a79a..41b17611e1 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 62f369997b..fd3c7dde43 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 983e6d6dae..960c4cfc1e 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 6295a970d5..aaac7dbd6d 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 d719403ac3..2aa0f7ba6d 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 3d932fc47e..13d30d1b9f 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 fd3c09a082..df887476e6 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 aa34c86034..55337c947a 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 9255a27516..5a8470d94b 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 fcbac17a70..3235c3f81a 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 29373a72e2..b16941a46c 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 b2f4a718d0..b442a52801 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 bdd7480917..56f855003a 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 46532f3636..a6b59169b4 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 d8043dc7bb..fd99e518fc 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 7cd11fc2f5..d62965c5cb 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 2ca6a126e4..1d9e97b1cb 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 a513c2823c..65de41f2be 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 b7a3336cb3..00515acadc 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 d50d34f633..f0d94503bc 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 9b8e1b9015..f1d7035c60 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 c3d73941b9..91119c3bd5 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 ea930593f2..87914e08cc 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 75e84b44e6..49c687b56b 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 9b160cf6a8..a0bedcb99f 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 29449b2219..18d04605aa 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 45f900ccb6..8da8cd96be 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 f6f1454bfc..d184bf2aa9 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 7899df759c..8b9759b961 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 c43ba962ed..be90b5f805 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 7a48bcdb9b..13eb7c759f 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 e78f080fe9..b6af4d419b 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 d39c36da1e..3b769ffd4a 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 6a1fd17570..ee1de5b8a4 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 14d6b48ed7..302658d7a1 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 208ae1b13d..43fc9f1c5b 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 332c791c39..150390b587 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 ae24051d55..5260ae004f 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 b5680874a4..567a74fa1a 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 a38f6e666c..5a5fb3fa81 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 b2060cdb36..017f5ff17c 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 44f8279eaa..9b7fb1ecca 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 93bea8e53b..c5c680e09b 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 0262b7ef24..2985ceee90 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 7d8c1e6db8..c3e00557b9 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 d8ba40f485..36cfd4f748 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 8ef2110669..4015955786 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 b5f17d5f65..4ae22ee915 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 b5dc309c26..aea10d0e33 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 d41c573796..6e6c0c2c2e 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 4024f3f9e4..e9315d8754 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 e7d528bfa5..669bbf730d 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 804115ae61..1c60af84fa 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 2fb0be0c33..790f9c0d90 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 6490fe9743..7048d534be 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 029aef4d44..638c972d8a 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 e41055518c..5a00ffcacc 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 40add70a84..a080334fd6 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 129d08c9c7..a934cfdd56 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 f75450cda3..8c0ec19603 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 9f8750361f..02e0a02115 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 85c7dc3dec..05c172fd3c 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 29574f92f5..05dfcf21c8 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 7201db13d8..5bf1b2a8f3 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 51d26a1b32..54448749df 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 61f954cdcc..05701d7c36 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 d827db79b5..c0dfe8e98a 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 5a934ee5f6..40112dd10e 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 2aab90ef16..6eb25f36f1 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 c28671e7a0..76922edffd 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 607280826d..9f25927103 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 4eead58e7d..0647d01719 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 0d64413ce8..230d5ffdc4 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 6b44634c33..2e4ee20436 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 c8587a4cc0..8c13132d80 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 c1f89b405c..9abc835b1b 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 0ae6d98eca..1d7da83b57 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 4d3b0a5b58..32718b456e 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 2f7dc8dc4f..115680a46d 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 d69368e26a..a7d61b07a5 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 f26835771d..c2ecb0149f 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 59a5db4ff2..61ab8af320 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 dcbbdd2649..268b384305 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 1f4283c3cb..411b493072 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 8268f7f47e..0bfaabb567 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 82a1718078..b8747c6626 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 0c28a85cbb..48f665fd83 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 10561b8253..d622cab8ab 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 2c674aa10c..ed625e4cb1 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 293d761ce7..16a020b2c8 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 6a0cbf2dbb..b793919b0a 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 e4cf35e1a7..4487b3b17d 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 eef7f03002..42569d6e01 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 94dc4153f9..ec98fad992 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 1a5ca24147..ef201697af 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 53406e3f41..f78c867520 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 3e27426d43..41d5aba6dd 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 105ba4d7f2..ae31085230 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 28ebb9d40b..cca9db3ba8 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 576ee7aa69..0f4bf07c81 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 36bb986092..7e3bdfea69 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 47ba4d84ba..3e4132ddec 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 ae34f8342f..eb075663ac 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 0c5e514049..aaa85853d0 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 b9f042a4c5..064414b06c 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 883753759e..fe42df3e6c 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 adb9681c92..ac5ed3e6af 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 ec7c305594..ad8a63d0f5 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 95e5a6ac0e..6eda200349 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 41707fffdd..716df6dbbc 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 17edcd3587..65e65a8942 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 7d4cac1979..f74afd99c5 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 28b99f1eb3..85d8c32846 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 f4e1980ef4..daaed73d24 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 c5996fbee2..8ca576b2b8 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 --git a/gas/testsuite/gas/arm/sp-pc-validations-bad-t.d b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.d
index 7c84944bfb..2245b47888 100644
--- a/gas/testsuite/gas/arm/sp-pc-validations-bad-t.d
+++ b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.d
@@ -1,3 +1,3 @@
# name: Invalid SP and PC operands test - THUMB (v7a)
# as: -march=armv7-a
-# error-output: sp-pc-validations-bad-t.l
+# error_output: sp-pc-validations-bad-t.l
diff --git a/gas/testsuite/gas/arm/sp-pc-validations-bad.d b/gas/testsuite/gas/arm/sp-pc-validations-bad.d
index 558a683dde..979e08ae62 100644
--- a/gas/testsuite/gas/arm/sp-pc-validations-bad.d
+++ b/gas/testsuite/gas/arm/sp-pc-validations-bad.d
@@ -1,2 +1,2 @@
# name: Invalid SP and PC operands test - ARM
-# error-output: sp-pc-validations-bad.l
+# error_output: sp-pc-validations-bad.l
diff --git a/gas/testsuite/gas/arm/sp-usage-thumb2-relax-on-v7.d b/gas/testsuite/gas/arm/sp-usage-thumb2-relax-on-v7.d
index 0707f0e25d..bf204b0601 100644
--- a/gas/testsuite/gas/arm/sp-usage-thumb2-relax-on-v7.d
+++ b/gas/testsuite/gas/arm/sp-usage-thumb2-relax-on-v7.d
@@ -1,4 +1,4 @@
#as: -march=armv7-a
#name: Invalid SP operands test - THUMB (v7a)
#source: sp-usage-thumb2-relax.s
-#error-output: sp-usage-thumb2-relax-on-v7.l
+#error_output: sp-usage-thumb2-relax-on-v7.l
diff --git a/gas/testsuite/gas/arm/srs-arm.d b/gas/testsuite/gas/arm/srs-arm.d
index 844c692dd9..b21d586ce7 100644
--- a/gas/testsuite/gas/arm/srs-arm.d
+++ b/gas/testsuite/gas/arm/srs-arm.d
@@ -1,2 +1,2 @@
# name: SRS instruction in ARM mode
-# error-output: srs-arm.l
+# error_output: srs-arm.l
diff --git a/gas/testsuite/gas/arm/srs-t2.d b/gas/testsuite/gas/arm/srs-t2.d
index dfa57dbd8a..72ab6619a6 100644
--- a/gas/testsuite/gas/arm/srs-t2.d
+++ b/gas/testsuite/gas/arm/srs-t2.d
@@ -1,2 +1,2 @@
# name: SRS instruction in Thumb-2 mode
-# error-output: srs-t2.l
+# error_output: srs-t2.l
diff --git a/gas/testsuite/gas/arm/strex-bad-t.d b/gas/testsuite/gas/arm/strex-bad-t.d
index 3640746b06..a92be0c9ba 100644
--- a/gas/testsuite/gas/arm/strex-bad-t.d
+++ b/gas/testsuite/gas/arm/strex-bad-t.d
@@ -1,4 +1,4 @@
# name: Bad addressing modes STREXH/STREXB. - THUMB
# as: -march=armv7-a
-# error-output: strex-bad-t.l
+# error_output: strex-bad-t.l
diff --git a/gas/testsuite/gas/arm/t16-bad.d b/gas/testsuite/gas/arm/t16-bad.d
index b5603addc0..e0bdd8639e 100644
--- a/gas/testsuite/gas/arm/t16-bad.d
+++ b/gas/testsuite/gas/arm/t16-bad.d
@@ -1,3 +1,3 @@
#name: Valid ARM, invalid Thumb
#as: -march=armv6k
-#error-output: t16-bad.l
+#error_output: t16-bad.l
diff --git a/gas/testsuite/gas/arm/thumb-b-bad.d b/gas/testsuite/gas/arm/thumb-b-bad.d
index f366827300..411e9e15fa 100644
--- a/gas/testsuite/gas/arm/thumb-b-bad.d
+++ b/gas/testsuite/gas/arm/thumb-b-bad.d
@@ -1,4 +1,4 @@
#name: Out of range Thumb branches (PR 12848)
#skip: *-*-pe *-*-wince
#as: -mthumb
-#error-output: thumb-b-bad.l
+#error_output: thumb-b-bad.l
diff --git a/gas/testsuite/gas/arm/thumb-w-bad.d b/gas/testsuite/gas/arm/thumb-w-bad.d
index c257c00f5f..ac4fe757e8 100644
--- a/gas/testsuite/gas/arm/thumb-w-bad.d
+++ b/gas/testsuite/gas/arm/thumb-w-bad.d
@@ -1,3 +1,3 @@
#name: Wide instruction rejected in non-Thumb2 cores.
#skip: *-*-pe *-*-wince
-#error-output: thumb-w-bad.l
+#error_output: thumb-w-bad.l
diff --git a/gas/testsuite/gas/arm/thumb2_bad_reg.d b/gas/testsuite/gas/arm/thumb2_bad_reg.d
index 87128559e6..4cbd1f4be2 100644
--- a/gas/testsuite/gas/arm/thumb2_bad_reg.d
+++ b/gas/testsuite/gas/arm/thumb2_bad_reg.d
@@ -1,3 +1,3 @@
#name: Invalid r13/r15 register usage
#as: -march=armv7r
-#error-output: thumb2_bad_reg.l
+#error_output: thumb2_bad_reg.l
diff --git a/gas/testsuite/gas/arm/thumb2_it_bad.d b/gas/testsuite/gas/arm/thumb2_it_bad.d
index 0b841ed185..87f4542a69 100644
--- a/gas/testsuite/gas/arm/thumb2_it_bad.d
+++ b/gas/testsuite/gas/arm/thumb2_it_bad.d
@@ -1,4 +1,4 @@
#name: Invalid IT instructions
#as:
-#error-output: thumb2_it_bad.l
+#error_output: thumb2_it_bad.l
# Modifications to this test shall be mirrored to thumb2_it_bad_auto.d.
diff --git a/gas/testsuite/gas/arm/thumb2_it_bad_auto.d b/gas/testsuite/gas/arm/thumb2_it_bad_auto.d
index 72743115fc..0b43a624fd 100644
--- a/gas/testsuite/gas/arm/thumb2_it_bad_auto.d
+++ b/gas/testsuite/gas/arm/thumb2_it_bad_auto.d
@@ -1,4 +1,4 @@
#name: Invalid IT instructions
#as: -mimplicit-it=always
#source: thumb2_it_bad.s
-#error-output: thumb2_it_bad.l
+#error_output: thumb2_it_bad.l
diff --git a/gas/testsuite/gas/arm/thumb2_ldmstm_bad.d b/gas/testsuite/gas/arm/thumb2_ldmstm_bad.d
index 05d5314452..35e60d54b5 100644
--- a/gas/testsuite/gas/arm/thumb2_ldmstm_bad.d
+++ b/gas/testsuite/gas/arm/thumb2_ldmstm_bad.d
@@ -1,3 +1,3 @@
#name: Invalid Thumb-2 LDM/STM instructions
#as: -march=armv6t2
-#error-output: thumb2_ldmstm_bad.l
+#error_output: thumb2_ldmstm_bad.l
diff --git a/gas/testsuite/gas/arm/thumb2_ldstd_unpredictable.d b/gas/testsuite/gas/arm/thumb2_ldstd_unpredictable.d
index 0f4293e173..bb22dc0bcd 100644
--- a/gas/testsuite/gas/arm/thumb2_ldstd_unpredictable.d
+++ b/gas/testsuite/gas/arm/thumb2_ldstd_unpredictable.d
@@ -1,2 +1,2 @@
# name: Unpredictable LDRD and STRD instructions. - Thumb-2
-# error-output: thumb2_ldstd_unpredictable.l
+# warning_output: thumb2_ldstd_unpredictable.l
diff --git a/gas/testsuite/gas/arm/thumb2_mul-bad.d b/gas/testsuite/gas/arm/thumb2_mul-bad.d
index c09bf42844..cb04f952f6 100644
--- a/gas/testsuite/gas/arm/thumb2_mul-bad.d
+++ b/gas/testsuite/gas/arm/thumb2_mul-bad.d
@@ -1,3 +1,3 @@
#name: Invalid Thumb-2 multiply instructions
#as: -march=armv6kt2
-#error-output: thumb2_mul-bad.l
+#error_output: thumb2_mul-bad.l
diff --git a/gas/testsuite/gas/arm/thumb2_str-bad.d b/gas/testsuite/gas/arm/thumb2_str-bad.d
index 6041643aaa..ecb780d3d2 100644
--- a/gas/testsuite/gas/arm/thumb2_str-bad.d
+++ b/gas/testsuite/gas/arm/thumb2_str-bad.d
@@ -1,3 +1,3 @@
#name: Invalid Thumb-2 str instructions
#as: -march=armv6kt2
-#error-output: thumb2_str-bad.l
+#error_output: thumb2_str-bad.l
diff --git a/gas/testsuite/gas/arm/thumb32.d b/gas/testsuite/gas/arm/thumb32.d
index 7693376c36..914a7de939 100644
--- a/gas/testsuite/gas/arm/thumb32.d
+++ b/gas/testsuite/gas/arm/thumb32.d
@@ -3,7 +3,7 @@
# objdump: -dr --prefix-addresses --show-raw-insn
# The arm-aout and arm-pe ports do not support Thumb branch relocations.
# notarget: *-*-pe
-# stderr: thumb32.l
+# warning_output: thumb32.l
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/udf-bad.d b/gas/testsuite/gas/arm/udf-bad.d
index 94706d109a..55b636885a 100644
--- a/gas/testsuite/gas/arm/udf-bad.d
+++ b/gas/testsuite/gas/arm/udf-bad.d
@@ -1,2 +1,2 @@
#name: Invalid UDF operands
-#error-output: udf-bad.l
+#error_output: udf-bad.l
diff --git a/gas/testsuite/gas/arm/udf.d b/gas/testsuite/gas/arm/udf.d
index 04e31451d6..c8777a9f05 100644
--- a/gas/testsuite/gas/arm/udf.d
+++ b/gas/testsuite/gas/arm/udf.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: UDF
#as: -march=armv8-a
-#error-output: udf.l
+#warning_output: udf.l
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/undefined.d b/gas/testsuite/gas/arm/undefined.d
index 897611359f..3a9be415ee 100644
--- a/gas/testsuite/gas/arm/undefined.d
+++ b/gas/testsuite/gas/arm/undefined.d
@@ -2,4 +2,4 @@
# COFF and aout based ports, except Windows CE,
# use a different naming convention for local labels.
#skip: *-unknown-pe *-*-vxworks
-#error-output: undefined.l
+#error_output: undefined.l
diff --git a/gas/testsuite/gas/arm/undefined_coff.d b/gas/testsuite/gas/arm/undefined_coff.d
index 4e405a629a..ebca22390d 100644
--- a/gas/testsuite/gas/arm/undefined_coff.d
+++ b/gas/testsuite/gas/arm/undefined_coff.d
@@ -2,4 +2,4 @@
# COFF and aout based ports, except Windows CE,
# use a different naming convention for local labels.
#noskip: *-unknown-pe
-#error-output: undefined_coff.l
+#error_output: undefined_coff.l
diff --git a/gas/testsuite/gas/arm/vcmp-zero-bad.d b/gas/testsuite/gas/arm/vcmp-zero-bad.d
index 806cf00f65..5f72f75337 100644
--- a/gas/testsuite/gas/arm/vcmp-zero-bad.d
+++ b/gas/testsuite/gas/arm/vcmp-zero-bad.d
@@ -1,4 +1,4 @@
# name: UAL vcmp with #0.0 bad instructions.
# as: -mfpu=vfpv3
# source: vcmp-zero-bad.s
-# error-output: vcmp-zero-bad.l
+# error_output: vcmp-zero-bad.l
diff --git a/gas/testsuite/gas/arm/vcvt-bad.d b/gas/testsuite/gas/arm/vcvt-bad.d
index d502a15462..0f0137d7f2 100644
--- a/gas/testsuite/gas/arm/vcvt-bad.d
+++ b/gas/testsuite/gas/arm/vcvt-bad.d
@@ -1,4 +1,4 @@
#name: Invalid Immediate field for VCVT (between floating-point and fixed-point, VFP)
#skip: *-*-pe *-*-wince
-#error-output: vcvt-bad.l
+#error_output: vcvt-bad.l
#as: -mcpu=cortex-a8 -mfpu=vfpv3
diff --git a/gas/testsuite/gas/arm/vfp-bad.d b/gas/testsuite/gas/arm/vfp-bad.d
index 760c4d5c32..354d81915b 100644
--- a/gas/testsuite/gas/arm/vfp-bad.d
+++ b/gas/testsuite/gas/arm/vfp-bad.d
@@ -1,3 +1,3 @@
#name: VFP errors
#as: -mfpu=vfp
-#error-output: vfp-bad.l
+#error_output: vfp-bad.l
diff --git a/gas/testsuite/gas/arm/vfp-bad_t2.d b/gas/testsuite/gas/arm/vfp-bad_t2.d
index 1ef83bab5d..87da2e6a46 100644
--- a/gas/testsuite/gas/arm/vfp-bad_t2.d
+++ b/gas/testsuite/gas/arm/vfp-bad_t2.d
@@ -1,3 +1,3 @@
#name: Thumb-2 VFP errors
#as: -mfpu=vfp
-#error-output: vfp-bad_t2.l
+#error_output: vfp-bad_t2.l
diff --git a/gas/testsuite/gas/arm/vfpv3-d16-bad.d b/gas/testsuite/gas/arm/vfpv3-d16-bad.d
index 0e26c7c3eb..74c920ecbf 100644
--- a/gas/testsuite/gas/arm/vfpv3-d16-bad.d
+++ b/gas/testsuite/gas/arm/vfpv3-d16-bad.d
@@ -1,4 +1,4 @@
# name: VFPv3-D16
# as: -mfpu=vfpv3-d16
-# error-output: vfpv3-d16-bad.l
+# error_output: vfpv3-d16-bad.l
# source: vfpv3-32drs.s
diff --git a/gas/testsuite/gas/arm/vldm-thumb-bad.d b/gas/testsuite/gas/arm/vldm-thumb-bad.d
index 2e2b8c3664..9200d68774 100644
--- a/gas/testsuite/gas/arm/vldm-thumb-bad.d
+++ b/gas/testsuite/gas/arm/vldm-thumb-bad.d
@@ -1,4 +1,4 @@
# name: VFP VLDM and VSTM, Thumb mode
# as: -mfpu=vfp3 -mthumb
# source: vldm.s
-# error-output: vldm-thumb-bad.l
+# error_output: vldm-thumb-bad.l
diff --git a/gas/testsuite/gas/arm/vldmw-arm-bad.d b/gas/testsuite/gas/arm/vldmw-arm-bad.d
index 1cbcf45415..2fb23a6e67 100644
--- a/gas/testsuite/gas/arm/vldmw-arm-bad.d
+++ b/gas/testsuite/gas/arm/vldmw-arm-bad.d
@@ -1,4 +1,4 @@
# name: VFP VLDM and VSTM with writeback, ARM mode
# as: -mfpu=vfp3
# source: vldmw-bad.s
-# error-output: vldmw-bad.l
+# error_output: vldmw-bad.l
diff --git a/gas/testsuite/gas/arm/vldmw-thumb-bad.d b/gas/testsuite/gas/arm/vldmw-thumb-bad.d
index aca12092aa..922293036f 100644
--- a/gas/testsuite/gas/arm/vldmw-thumb-bad.d
+++ b/gas/testsuite/gas/arm/vldmw-thumb-bad.d
@@ -1,4 +1,4 @@
# name: VFP VLDM and VSTM with writeback, Thumb mode
# as: -mfpu=vfp3 -mthumb
# source: vldmw-bad.s
-# error-output: vldmw-bad.l
+# error_output: vldmw-bad.l
diff --git a/gas/testsuite/gas/arm/vstr-arm-bad.d b/gas/testsuite/gas/arm/vstr-arm-bad.d
index 32a041f644..fbefe24f92 100644
--- a/gas/testsuite/gas/arm/vstr-arm-bad.d
+++ b/gas/testsuite/gas/arm/vstr-arm-bad.d
@@ -1,4 +1,4 @@
# name: VFP PC-relative VSTR arm mode
# as: -mfpu=vfp3 -mcpu=cortex-a8
# source: vstr-bad.s
-# error-output: vstr-arm-bad.l
+# warning_output: vstr-arm-bad.l
diff --git a/gas/testsuite/gas/arm/vstr-thumb-bad.d b/gas/testsuite/gas/arm/vstr-thumb-bad.d
index 354689f49a..7224910626 100644
--- a/gas/testsuite/gas/arm/vstr-thumb-bad.d
+++ b/gas/testsuite/gas/arm/vstr-thumb-bad.d
@@ -1,4 +1,4 @@
# name: VFP PC-relative VSTR thumb mode
# as: -mfpu=vfp -mthumb -mcpu=arm1156t2f-s
# source: vstr-bad.s
-# error-output: vstr-thumb-bad.l
+# error_output: vstr-thumb-bad.l
diff --git a/gas/testsuite/gas/arm/weakdef-2.d b/gas/testsuite/gas/arm/weakdef-2.d
index 21259705f1..3d29fc089b 100644
--- a/gas/testsuite/gas/arm/weakdef-2.d
+++ b/gas/testsuite/gas/arm/weakdef-2.d
@@ -1,5 +1,5 @@
# name: adr of weak
# as:
-# error-output: weakdef-2.l
+# error_output: weakdef-2.l
# This test is only valid on ELF based ports.
-#notarget: *-*-pe *-*-wince
+# notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/avr/pr21621.d b/gas/testsuite/gas/avr/pr21621.d
index 6354c85932..3be1ae0606 100644
--- a/gas/testsuite/gas/avr/pr21621.d
+++ b/gas/testsuite/gas/avr/pr21621.d
@@ -1,4 +1,4 @@
#name: PR 21621 (correct generation of skip warnings)
#as:
#target: avr-*-*
-#error-output: pr21621.l
+#warning_output: pr21621.l
diff --git a/gas/testsuite/gas/elf/bad-bss.d b/gas/testsuite/gas/elf/bad-bss.d
index 98721cf065..972a6ceb20 100644
--- a/gas/testsuite/gas/elf/bad-bss.d
+++ b/gas/testsuite/gas/elf/bad-bss.d
@@ -1,4 +1,4 @@
#name: bad .bss / .struct data allocation directives
#source: bss.s
-#error-output: bad-bss.err
+#error_output: bad-bss.err
#target: i?86-*-* x86_64-*-* ia64-*-* arm-*-* aarch64-*-*
diff --git a/gas/testsuite/gas/elf/bad-group.d b/gas/testsuite/gas/elf/bad-group.d
index ba3de046e9..5d85f6c267 100644
--- a/gas/testsuite/gas/elf/bad-group.d
+++ b/gas/testsuite/gas/elf/bad-group.d
@@ -1,2 +1,2 @@
#name: Check bad group
-#error-output: bad-group.err
+#error_output: bad-group.err
diff --git a/gas/testsuite/gas/elf/bad-group.err b/gas/testsuite/gas/elf/bad-group.err
index db5db2fc0f..156684c002 100644
--- a/gas/testsuite/gas/elf/bad-group.err
+++ b/gas/testsuite/gas/elf/bad-group.err
@@ -1,3 +1,3 @@
-.*bad-group\.s: Assembler messages:
-.*bad-group\.s:10: Error: .*
+.*: Assembler messages:
+.*:10: Error: .*
#pass
diff --git a/gas/testsuite/gas/elf/bad-section-flag.d b/gas/testsuite/gas/elf/bad-section-flag.d
index 98cbac8dd3..d840417f88 100644
--- a/gas/testsuite/gas/elf/bad-section-flag.d
+++ b/gas/testsuite/gas/elf/bad-section-flag.d
@@ -1,2 +1,2 @@
#name: Check bad section flag
-#error-output: bad-section-flag.err
+#error_output: bad-section-flag.err
diff --git a/gas/testsuite/gas/elf/bad-section-flag.err b/gas/testsuite/gas/elf/bad-section-flag.err
index 0af9b693ba..6099c4f5f6 100644
--- a/gas/testsuite/gas/elf/bad-section-flag.err
+++ b/gas/testsuite/gas/elf/bad-section-flag.err
@@ -1,2 +1,2 @@
-.*bad-section-flag\.s: Assembler messages:
-.*bad-section-flag\.s:1: Fatal error: .*
+.*: Assembler messages:
+.*:1: Fatal error: .*
diff --git a/gas/testsuite/gas/elf/bad-size.d b/gas/testsuite/gas/elf/bad-size.d
index a313293c56..0a7a6e7256 100644
--- a/gas/testsuite/gas/elf/bad-size.d
+++ b/gas/testsuite/gas/elf/bad-size.d
@@ -1,2 +1,2 @@
#name: Check bad size directive
-#error-output: bad-size.err
+#error_output: bad-size.err
diff --git a/gas/testsuite/gas/elf/bad-size.err b/gas/testsuite/gas/elf/bad-size.err
index 513d250c2c..d28bba0e86 100644
--- a/gas/testsuite/gas/elf/bad-size.err
+++ b/gas/testsuite/gas/elf/bad-size.err
@@ -1,3 +1,3 @@
-.*bad-size\.s: Assembler messages:
+.*: Assembler messages:
#...
-.*bad-size\.s:.* Error: \.size expression .* does not evaluate to a constant
+.*:.* Error: \.size expression .* does not evaluate to a constant
diff --git a/gas/testsuite/gas/elf/common1.d b/gas/testsuite/gas/elf/common1.d
index 26175f20d1..72cc37dccd 100644
--- a/gas/testsuite/gas/elf/common1.d
+++ b/gas/testsuite/gas/elf/common1.d
@@ -1,2 +1,2 @@
#name: weak and common directives
-#error-output: common1.l
+#error_output: common1.l
diff --git a/gas/testsuite/gas/elf/common2.d b/gas/testsuite/gas/elf/common2.d
index 70943b4747..6bc8a1be6a 100644
--- a/gas/testsuite/gas/elf/common2.d
+++ b/gas/testsuite/gas/elf/common2.d
@@ -1,2 +1,2 @@
#name: common and weak directives
-#error-output: common2.l
+#error_output: common2.l
diff --git a/gas/testsuite/gas/elf/common5a.d b/gas/testsuite/gas/elf/common5a.d
index c42197d4e0..ec136b4824 100644
--- a/gas/testsuite/gas/elf/common5a.d
+++ b/gas/testsuite/gas/elf/common5a.d
@@ -1,5 +1,5 @@
#source: common5a.s
#as:
-#error-output: common5a.l
+#error_output: common5a.l
#notarget: alpha-*-*
# The Alpha target uses its own .set pseudo-insn.
diff --git a/gas/testsuite/gas/elf/common5b.d b/gas/testsuite/gas/elf/common5b.d
index 2b03e0eb78..9369c2df12 100644
--- a/gas/testsuite/gas/elf/common5b.d
+++ b/gas/testsuite/gas/elf/common5b.d
@@ -1,5 +1,5 @@
#source: common5b.s
#as:
-#error-output: common5b.l
+#error_output: common5b.l
#notarget: alpha-*-*
# The Alpha target uses its own .set pseudo-insn.
diff --git a/gas/testsuite/gas/elf/common5c.d b/gas/testsuite/gas/elf/common5c.d
index eeeebbf728..cbb3fc6810 100644
--- a/gas/testsuite/gas/elf/common5c.d
+++ b/gas/testsuite/gas/elf/common5c.d
@@ -1,5 +1,5 @@
#source: common5c.s
#as:
-#error-output: common5a.l
+#error_output: common5a.l
#notarget: alpha-*-*
# The Alpha target uses its own .set pseudo-insn.
diff --git a/gas/testsuite/gas/elf/common5d.d b/gas/testsuite/gas/elf/common5d.d
index 8aa83dc2b4..7b11fa2430 100644
--- a/gas/testsuite/gas/elf/common5d.d
+++ b/gas/testsuite/gas/elf/common5d.d
@@ -1,5 +1,5 @@
#source: common5d.s
#as:
-#error-output: common5b.l
+#error_output: common5b.l
#notarget: alpha-*-*
# The Alpha target uses its own .set pseudo-insn.
diff --git a/gas/testsuite/gas/elf/dwarf2-10.d b/gas/testsuite/gas/elf/dwarf2-10.d
index 35f7a7ae59..9943d9eaee 100644
--- a/gas/testsuite/gas/elf/dwarf2-10.d
+++ b/gas/testsuite/gas/elf/dwarf2-10.d
@@ -1,6 +1,6 @@
#as:
#name: DWARF2 10
-#error-output: dwarf2-10.l
+#error_output: dwarf2-10.l
# The mep target tries to relay code sections which breaks symbolic view computations.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
#notarget: mep-* tile*-*
diff --git a/gas/testsuite/gas/elf/dwarf2-8.d b/gas/testsuite/gas/elf/dwarf2-8.d
index a82f5dbaa3..037da8716e 100644
--- a/gas/testsuite/gas/elf/dwarf2-8.d
+++ b/gas/testsuite/gas/elf/dwarf2-8.d
@@ -1,5 +1,5 @@
#as:
#name: DWARF2 8
-#error-output: dwarf2-8.l
+#error_output: dwarf2-8.l
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
#notarget: tile*-*
diff --git a/gas/testsuite/gas/elf/dwarf2-9.d b/gas/testsuite/gas/elf/dwarf2-9.d
index 3cb9b960d7..2493f806b2 100644
--- a/gas/testsuite/gas/elf/dwarf2-9.d
+++ b/gas/testsuite/gas/elf/dwarf2-9.d
@@ -1,5 +1,5 @@
#as:
#name: DWARF2 9
-#error-output: dwarf2-9.l
+#error_output: dwarf2-9.l
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
#notarget: tile*-*
diff --git a/gas/testsuite/gas/elf/pr21661.d b/gas/testsuite/gas/elf/pr21661.d
index a16e410810..081f3af11c 100644
--- a/gas/testsuite/gas/elf/pr21661.d
+++ b/gas/testsuite/gas/elf/pr21661.d
@@ -1,2 +1,2 @@
#name: unsupported .symver with common symbol
-#error-output: pr21661.l
+#error_output: pr21661.l
diff --git a/gas/testsuite/gas/elf/pseudo.d b/gas/testsuite/gas/elf/pseudo.d
index 59d48016a3..7a5a396703 100644
--- a/gas/testsuite/gas/elf/pseudo.d
+++ b/gas/testsuite/gas/elf/pseudo.d
@@ -1,2 +1,2 @@
#name: Ill-formed directives
-#error-output: pseudo.l
+#error_output: pseudo.l
diff --git a/gas/testsuite/gas/elf/section13.d b/gas/testsuite/gas/elf/section13.d
index 3ee7c821ac..940ccec295 100644
--- a/gas/testsuite/gas/elf/section13.d
+++ b/gas/testsuite/gas/elf/section13.d
@@ -1,2 +1,2 @@
#name: mbind sections without SHF_ALLOC
-#error-output: section13.l
+#error_output: section13.l
diff --git a/gas/testsuite/gas/i386/bad-size.d b/gas/testsuite/gas/i386/bad-size.d
index 0bcf38159e..7200ccfb9b 100644
--- a/gas/testsuite/gas/i386/bad-size.d
+++ b/gas/testsuite/gas/i386/bad-size.d
@@ -1,7 +1,7 @@
#as: --size-check=warning
#objdump: -dw
#name: Check bad size directive
-#error-output: bad-size.warn
+#warning_output: bad-size.warn
.*: +file format .*
diff --git a/gas/testsuite/gas/i386/bundle-bad.d b/gas/testsuite/gas/i386/bundle-bad.d
index ba56f32b1e..824e8ca6bd 100644
--- a/gas/testsuite/gas/i386/bundle-bad.d
+++ b/gas/testsuite/gas/i386/bundle-bad.d
@@ -1,2 +1,2 @@
#name: .bundle_align_mode diagnostics
-#error-output: bundle-bad.l
+#error_output: bundle-bad.l
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-sse-check-warn.d b/gas/testsuite/gas/i386/ilp32/x86-64-sse-check-warn.d
index b5914883b9..8248fd9ab4 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-sse-check-warn.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-sse-check-warn.d
@@ -1,5 +1,5 @@
#source: ../sse-check.s
-#stderr: ../sse-check-warn.e
+#warning_output: ../sse-check-warn.e
#as: -msse-check=warning
#objdump: -dw
#name: x86-64 (ILP32) SSE check (warning)
diff --git a/gas/testsuite/gas/i386/intel-intel.d b/gas/testsuite/gas/i386/intel-intel.d
index eb45f2c6fc..d9d9b8c752 100644
--- a/gas/testsuite/gas/i386/intel-intel.d
+++ b/gas/testsuite/gas/i386/intel-intel.d
@@ -2,7 +2,7 @@
#objdump: -dwMintel
#name: i386 intel
#source: intel.s
-#stderr: intel.e
+#warning_output: intel.e
.*: +file format .*
diff --git a/gas/testsuite/gas/i386/intel.d b/gas/testsuite/gas/i386/intel.d
index 4d6c4b1f5c..309d264a09 100644
--- a/gas/testsuite/gas/i386/intel.d
+++ b/gas/testsuite/gas/i386/intel.d
@@ -1,7 +1,7 @@
#as: -J
#objdump: -dw
#name: i386 intel
-#stderr: intel.e
+#warning_output: intel.e
.*: +file format .*
diff --git a/gas/testsuite/gas/i386/intelok.d b/gas/testsuite/gas/i386/intelok.d
index 41e65b3984..f078027109 100644
--- a/gas/testsuite/gas/i386/intelok.d
+++ b/gas/testsuite/gas/i386/intelok.d
@@ -1,7 +1,7 @@
#as: -J --divide
#objdump: -dwMintel
#name: i386 intel-ok
-#stderr: intelok.e
+#warning_output: intelok.e
.*: +file format .*
diff --git a/gas/testsuite/gas/i386/mpx-add-bnd-prefix.d b/gas/testsuite/gas/i386/mpx-add-bnd-prefix.d
index 30f6502b08..780f3710ec 100644
--- a/gas/testsuite/gas/i386/mpx-add-bnd-prefix.d
+++ b/gas/testsuite/gas/i386/mpx-add-bnd-prefix.d
@@ -1,5 +1,5 @@
#as: -madd-bnd-prefix
-#stderr: mpx-add-bnd-prefix.e
+#warning_output: mpx-add-bnd-prefix.e
#objdump: -drw
#name: Check -madd-bnd-prefix
diff --git a/gas/testsuite/gas/i386/sse-check-warn.d b/gas/testsuite/gas/i386/sse-check-warn.d
index 694310e508..e98117796a 100644
--- a/gas/testsuite/gas/i386/sse-check-warn.d
+++ b/gas/testsuite/gas/i386/sse-check-warn.d
@@ -1,6 +1,6 @@
#source: sse-check.s
#as: -msse-check=warning
-#stderr: sse-check-warn.e
+#warning_output: sse-check-warn.e
#objdump: -dw
#name: i386 SSE check (warning)
#dump: sse-check.d
diff --git a/gas/testsuite/gas/i386/string-ok.d b/gas/testsuite/gas/i386/string-ok.d
index ddaad5872a..358596a25f 100644
--- a/gas/testsuite/gas/i386/string-ok.d
+++ b/gas/testsuite/gas/i386/string-ok.d
@@ -1,7 +1,7 @@
#as: -J
#objdump: -dw -mi386
#name: string insn operands
-#stderr: string-ok.e
+#warning_output: string-ok.e
.*: +file format .*
Disassembly of section .text:
diff --git a/gas/testsuite/gas/i386/vgather-check-warn.d b/gas/testsuite/gas/i386/vgather-check-warn.d
index 532c4d82b9..e074338a6a 100644
--- a/gas/testsuite/gas/i386/vgather-check-warn.d
+++ b/gas/testsuite/gas/i386/vgather-check-warn.d
@@ -1,5 +1,5 @@
#source: vgather-check.s
-#stderr: vgather-check-warn.e
+#warning_output: vgather-check-warn.e
#objdump: -dw
#name: i386 vgather check (warning)
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d b/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
index 139faae7dc..fe3e53aa27 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
+++ b/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
@@ -1,5 +1,5 @@
#as: -madd-bnd-prefix
-#stderr: x86-64-mpx-add-bnd-prefix.e
+#warning_output: x86-64-mpx-add-bnd-prefix.e
#objdump: -drw
#name: Check -madd-bnd-prefix (x86-64)
diff --git a/gas/testsuite/gas/i386/x86-64-sse-check-warn.d b/gas/testsuite/gas/i386/x86-64-sse-check-warn.d
index 8719815e08..4012514da0 100644
--- a/gas/testsuite/gas/i386/x86-64-sse-check-warn.d
+++ b/gas/testsuite/gas/i386/x86-64-sse-check-warn.d
@@ -1,6 +1,6 @@
#source: sse-check.s
#as: -msse-check=warning
-#stderr: sse-check-warn.e
+#warning_output: sse-check-warn.e
#objdump: -dw
#name: x86-64 SSE check (warning)
#dump: sse-check.d
diff --git a/gas/testsuite/gas/i386/x86-64-vgather-check-warn.d b/gas/testsuite/gas/i386/x86-64-vgather-check-warn.d
index c89020976d..8c1b0abd95 100644
--- a/gas/testsuite/gas/i386/x86-64-vgather-check-warn.d
+++ b/gas/testsuite/gas/i386/x86-64-vgather-check-warn.d
@@ -1,5 +1,5 @@
#source: x86-64-vgather-check.s
-#stderr: x86-64-vgather-check-warn.e
+#warning_output: x86-64-vgather-check-warn.e
#objdump: -dw
#name: x86-64 vgather check (warning)
diff --git a/gas/testsuite/gas/mips/addiu-error.d b/gas/testsuite/gas/mips/addiu-error.d
index 13a99ac154..67f2e1f6a1 100644
--- a/gas/testsuite/gas/mips/addiu-error.d
+++ b/gas/testsuite/gas/mips/addiu-error.d
@@ -1,3 +1,3 @@
#name: MIPS ADDIU errors
#as: -32
-#error-output: addiu-error.l
+#error_output: addiu-error.l
diff --git a/gas/testsuite/gas/mips/branch-extern-3.d b/gas/testsuite/gas/mips/branch-extern-3.d
index eb83f1724e..37f536e709 100644
--- a/gas/testsuite/gas/mips/branch-extern-3.d
+++ b/gas/testsuite/gas/mips/branch-extern-3.d
@@ -2,7 +2,7 @@
#name: MIPS relaxed branch to an external symbol
#as: -32 -KPIC -mips1 --relax-branch
#source: branch-extern.s
-#stderr: branch-extern.l
+#warning_output: branch-extern.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/branch-extern-4.d b/gas/testsuite/gas/mips/branch-extern-4.d
index f3b1df3cb2..7aa73566e0 100644
--- a/gas/testsuite/gas/mips/branch-extern-4.d
+++ b/gas/testsuite/gas/mips/branch-extern-4.d
@@ -2,7 +2,7 @@
#name: microMIPS relaxed branch to an external symbol
#as: -32 -KPIC -mmicromips --relax-branch
#source: branch-extern.s
-#stderr: branch-extern.l
+#warning_output: branch-extern.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/branch-local-2.d b/gas/testsuite/gas/mips/branch-local-2.d
index 46b58b977e..e11569610a 100644
--- a/gas/testsuite/gas/mips/branch-local-2.d
+++ b/gas/testsuite/gas/mips/branch-local-2.d
@@ -1,3 +1,3 @@
#name: MIPS branch local symbol relocation 2
#as: -32
-#error-output: branch-local-2.l
+#error_output: branch-local-2.l
diff --git a/gas/testsuite/gas/mips/branch-local-3.d b/gas/testsuite/gas/mips/branch-local-3.d
index f750e33aea..4dc3a59059 100644
--- a/gas/testsuite/gas/mips/branch-local-3.d
+++ b/gas/testsuite/gas/mips/branch-local-3.d
@@ -1,3 +1,3 @@
#name: MIPS branch local symbol relocation 3
#as: -32
-#error-output: branch-local-3.l
+#error_output: branch-local-3.l
diff --git a/gas/testsuite/gas/mips/branch-local-5.d b/gas/testsuite/gas/mips/branch-local-5.d
index 8033cede6f..252defb891 100644
--- a/gas/testsuite/gas/mips/branch-local-5.d
+++ b/gas/testsuite/gas/mips/branch-local-5.d
@@ -1,3 +1,3 @@
#name: MIPS branch local symbol relocation 5
#as: -32
-#error-output: branch-local-5.l
+#error_output: branch-local-5.l
diff --git a/gas/testsuite/gas/mips/branch-local-6.d b/gas/testsuite/gas/mips/branch-local-6.d
index 45a0ede4fd..dd7c980987 100644
--- a/gas/testsuite/gas/mips/branch-local-6.d
+++ b/gas/testsuite/gas/mips/branch-local-6.d
@@ -1,3 +1,3 @@
#name: MIPS branch local symbol relocation 6
#as: -32
-#error-output: branch-local-6.l
+#error_output: branch-local-6.l
diff --git a/gas/testsuite/gas/mips/branch-local-n32-2.d b/gas/testsuite/gas/mips/branch-local-n32-2.d
index 025a12ce49..9e5d3ae4c4 100644
--- a/gas/testsuite/gas/mips/branch-local-n32-2.d
+++ b/gas/testsuite/gas/mips/branch-local-n32-2.d
@@ -1,3 +1,3 @@
#name: MIPS branch local symbol relocation 2 (n32)
#as: -n32 -march=from-abi
-#error-output: branch-local-2.l
+#error_output: branch-local-2.l
diff --git a/gas/testsuite/gas/mips/branch-local-n32-3.d b/gas/testsuite/gas/mips/branch-local-n32-3.d
index 9d84b80634..ff2ba93ce8 100644
--- a/gas/testsuite/gas/mips/branch-local-n32-3.d
+++ b/gas/testsuite/gas/mips/branch-local-n32-3.d
@@ -1,3 +1,3 @@
#name: MIPS branch local symbol relocation 3 (n32)
#as: -n32 -march=from-abi
-#error-output: branch-local-3.l
+#error_output: branch-local-3.l
diff --git a/gas/testsuite/gas/mips/branch-local-n32-5.d b/gas/testsuite/gas/mips/branch-local-n32-5.d
index ac1f73e3a9..7419b75e0b 100644
--- a/gas/testsuite/gas/mips/branch-local-n32-5.d
+++ b/gas/testsuite/gas/mips/branch-local-n32-5.d
@@ -1,4 +1,4 @@
#name: MIPS branch local symbol relocation 5 (n32)
#as: -n32 -march=from-abi
-#error-output: branch-local-5.l
+#error_output: branch-local-5.l
#source: branch-local-5.s
diff --git a/gas/testsuite/gas/mips/branch-local-n32-6.d b/gas/testsuite/gas/mips/branch-local-n32-6.d
index de3fc98523..8e51db8b3b 100644
--- a/gas/testsuite/gas/mips/branch-local-n32-6.d
+++ b/gas/testsuite/gas/mips/branch-local-n32-6.d
@@ -1,4 +1,4 @@
#name: MIPS branch local symbol relocation 6 (n32)
#as: -n32 -march=from-abi
-#error-output: branch-local-6.l
+#error_output: branch-local-6.l
#source: branch-local-6.s
diff --git a/gas/testsuite/gas/mips/branch-local-n64-2.d b/gas/testsuite/gas/mips/branch-local-n64-2.d
index 46c48ffb34..f78e8876ed 100644
--- a/gas/testsuite/gas/mips/branch-local-n64-2.d
+++ b/gas/testsuite/gas/mips/branch-local-n64-2.d
@@ -1,3 +1,3 @@
#name: MIPS branch local symbol relocation 2 (n64)
#as: -64 -march=from-abi
-#error-output: branch-local-2.l
+#error_output: branch-local-2.l
diff --git a/gas/testsuite/gas/mips/branch-local-n64-3.d b/gas/testsuite/gas/mips/branch-local-n64-3.d
index f588beaef3..b1381eda27 100644
--- a/gas/testsuite/gas/mips/branch-local-n64-3.d
+++ b/gas/testsuite/gas/mips/branch-local-n64-3.d
@@ -1,3 +1,3 @@
#name: MIPS branch local symbol relocation 3 (n64)
#as: -64 -march=from-abi
-#error-output: branch-local-3.l
+#error_output: branch-local-3.l
diff --git a/gas/testsuite/gas/mips/branch-local-n64-5.d b/gas/testsuite/gas/mips/branch-local-n64-5.d
index 05a396ee95..284aeb6827 100644
--- a/gas/testsuite/gas/mips/branch-local-n64-5.d
+++ b/gas/testsuite/gas/mips/branch-local-n64-5.d
@@ -1,4 +1,4 @@
#name: MIPS branch local symbol relocation 5 (n64)
#as: -64 -march=from-abi
-#error-output: branch-local-5.l
+#error_output: branch-local-5.l
#source: branch-local-5.s
diff --git a/gas/testsuite/gas/mips/branch-local-n64-6.d b/gas/testsuite/gas/mips/branch-local-n64-6.d
index 3cd8a331ab..beba139bc6 100644
--- a/gas/testsuite/gas/mips/branch-local-n64-6.d
+++ b/gas/testsuite/gas/mips/branch-local-n64-6.d
@@ -1,4 +1,4 @@
#name: MIPS branch local symbol relocation 6 (n64)
#as: -64 -march=from-abi
-#error-output: branch-local-6.l
+#error_output: branch-local-6.l
#source: branch-local-6.s
diff --git a/gas/testsuite/gas/mips/branch-section-3.d b/gas/testsuite/gas/mips/branch-section-3.d
index 63b42b59fe..b10fcde731 100644
--- a/gas/testsuite/gas/mips/branch-section-3.d
+++ b/gas/testsuite/gas/mips/branch-section-3.d
@@ -2,7 +2,7 @@
#name: MIPS relaxed branch to a different section
#as: -32 --relax-branch
#source: branch-section.s
-#stderr: branch-section.l
+#warning_output: branch-section.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/branch-section-4.d b/gas/testsuite/gas/mips/branch-section-4.d
index 4626da0c04..b6ad0bba6b 100644
--- a/gas/testsuite/gas/mips/branch-section-4.d
+++ b/gas/testsuite/gas/mips/branch-section-4.d
@@ -2,7 +2,7 @@
#name: microMIPS relaxed branch to a different section
#as: -32 -mmicromips --relax-branch
#source: branch-section.s
-#stderr: branch-section.l
+#warning_output: branch-section.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/branch-weak-3.d b/gas/testsuite/gas/mips/branch-weak-3.d
index 93e06f5940..8e6e8cfe4f 100644
--- a/gas/testsuite/gas/mips/branch-weak-3.d
+++ b/gas/testsuite/gas/mips/branch-weak-3.d
@@ -2,7 +2,7 @@
#name: MIPS relaxed branch to a weak symbol
#as: -32 --relax-branch --defsym align=12
#source: branch-weak.s
-#stderr: branch-weak.l
+#warning_output: branch-weak.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/branch-weak-4.d b/gas/testsuite/gas/mips/branch-weak-4.d
index c8a2a4b907..d21e1477b0 100644
--- a/gas/testsuite/gas/mips/branch-weak-4.d
+++ b/gas/testsuite/gas/mips/branch-weak-4.d
@@ -2,7 +2,7 @@
#name: microMIPS relaxed branch to a weak symbol
#as: -32 -mmicromips --relax-branch --defsym align=12
#source: branch-weak.s
-#stderr: branch-weak.l
+#warning_output: branch-weak.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/break-error.d b/gas/testsuite/gas/mips/break-error.d
index 2110814262..9155fd4092 100644
--- a/gas/testsuite/gas/mips/break-error.d
+++ b/gas/testsuite/gas/mips/break-error.d
@@ -1,3 +1,3 @@
#name: MIPS BREAK errors
#as: -32
-#error-output: break-error.l
+#error_output: break-error.l
diff --git a/gas/testsuite/gas/mips/crc-err.d b/gas/testsuite/gas/mips/crc-err.d
index 88d61d3cd5..4b577c7797 100644
--- a/gas/testsuite/gas/mips/crc-err.d
+++ b/gas/testsuite/gas/mips/crc-err.d
@@ -1,3 +1,3 @@
#name: MIPS CRC instruction errors
#as: -32 -mcrc
-#error-output: crc-err.l
+#error_output: crc-err.l
diff --git a/gas/testsuite/gas/mips/crc64-err.d b/gas/testsuite/gas/mips/crc64-err.d
index 93e6a5456c..9a7483cbb5 100644
--- a/gas/testsuite/gas/mips/crc64-err.d
+++ b/gas/testsuite/gas/mips/crc64-err.d
@@ -1,3 +1,3 @@
#name: MIPS CRC64 instruction errors
#as: -mcrc
-#error-output: crc64-err.l
+#error_output: crc64-err.l
diff --git a/gas/testsuite/gas/mips/ginv-err.d b/gas/testsuite/gas/mips/ginv-err.d
index 68c4096976..4cd945510a 100644
--- a/gas/testsuite/gas/mips/ginv-err.d
+++ b/gas/testsuite/gas/mips/ginv-err.d
@@ -1,3 +1,3 @@
#name: MIPS GINV instruction errors
#as: -32 -mginv
-#error-output: ginv-err.l
+#error_output: ginv-err.l
diff --git a/gas/testsuite/gas/mips/interaptiv-mr2@isa-override-1.d b/gas/testsuite/gas/mips/interaptiv-mr2@isa-override-1.d
index 7e8b7ce8e3..a37f584fc3 100644
--- a/gas/testsuite/gas/mips/interaptiv-mr2@isa-override-1.d
+++ b/gas/testsuite/gas/mips/interaptiv-mr2@isa-override-1.d
@@ -2,5 +2,5 @@
#name: MIPS ISA override code generation
#as: -32
#source: isa-override-1.s
-#stderr: interaptiv-mr2@isa-override-1.l
+#warning_output: interaptiv-mr2@isa-override-1.l
#dump: mips32r2@isa-override-1.d
diff --git a/gas/testsuite/gas/mips/interaptiv-mr2@isa-override-2.d b/gas/testsuite/gas/mips/interaptiv-mr2@isa-override-2.d
index 9ebb60cdf2..2c1a8a8b43 100644
--- a/gas/testsuite/gas/mips/interaptiv-mr2@isa-override-2.d
+++ b/gas/testsuite/gas/mips/interaptiv-mr2@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: interaptiv-mr2@isa-override-2.l
+#error_output: interaptiv-mr2@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/isa-override-2.d b/gas/testsuite/gas/mips/isa-override-2.d
index 8ad46efa11..d1a3a3745e 100644
--- a/gas/testsuite/gas/mips/isa-override-2.d
+++ b/gas/testsuite/gas/mips/isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: isa-override-2.l
+#error_output: isa-override-2.l
diff --git a/gas/testsuite/gas/mips/lui-1.d b/gas/testsuite/gas/mips/lui-1.d
index 135828ed61..a318803548 100644
--- a/gas/testsuite/gas/mips/lui-1.d
+++ b/gas/testsuite/gas/mips/lui-1.d
@@ -1,3 +1,3 @@
#name: MIPS LUI errors 1
#as: -32
-#error-output: lui-1.l
+#error_output: lui-1.l
diff --git a/gas/testsuite/gas/mips/lui-2.d b/gas/testsuite/gas/mips/lui-2.d
index 1faa5cec92..b8ec690175 100644
--- a/gas/testsuite/gas/mips/lui-2.d
+++ b/gas/testsuite/gas/mips/lui-2.d
@@ -1,3 +1,3 @@
#name: MIPS LUI errors 2
#as: -32
-#error-output: lui-2.l
+#error_output: lui-2.l
diff --git a/gas/testsuite/gas/mips/macro-warn-1-n32.d b/gas/testsuite/gas/mips/macro-warn-1-n32.d
index 60c10d1f8f..34fabd9f9c 100644
--- a/gas/testsuite/gas/mips/macro-warn-1-n32.d
+++ b/gas/testsuite/gas/mips/macro-warn-1-n32.d
@@ -1,5 +1,5 @@
#as: -march=from-abi -n32 -KPIC
#source: macro-warn-1.s
-#stderr: macro-warn-1-n32.l
+#warning_output: macro-warn-1-n32.l
#objdump: -p
#pass
diff --git a/gas/testsuite/gas/mips/macro-warn-1.d b/gas/testsuite/gas/mips/macro-warn-1.d
index d4d709d685..5853ae92e7 100644
--- a/gas/testsuite/gas/mips/macro-warn-1.d
+++ b/gas/testsuite/gas/mips/macro-warn-1.d
@@ -1,5 +1,5 @@
#as: -32 -KPIC
#source: macro-warn-1.s
-#stderr: macro-warn-1.l
+#warning_output: macro-warn-1.l
#objdump: -p
#pass
diff --git a/gas/testsuite/gas/mips/macro-warn-2.d b/gas/testsuite/gas/mips/macro-warn-2.d
index 5f7a9e5ee8..83b0c681f6 100644
--- a/gas/testsuite/gas/mips/macro-warn-2.d
+++ b/gas/testsuite/gas/mips/macro-warn-2.d
@@ -1,5 +1,5 @@
#as: -32 -KPIC
#source: macro-warn-2.s
-#stderr: macro-warn-2.l
+#warning_output: macro-warn-2.l
#objdump: -p
#pass
diff --git a/gas/testsuite/gas/mips/macro-warn-3.d b/gas/testsuite/gas/mips/macro-warn-3.d
index 10935f9960..cd844783f1 100644
--- a/gas/testsuite/gas/mips/macro-warn-3.d
+++ b/gas/testsuite/gas/mips/macro-warn-3.d
@@ -1,5 +1,5 @@
#as: -32
#source: macro-warn-3.s
-#stderr: macro-warn-3.l
+#warning_output: macro-warn-3.l
#objdump: -p
#pass
diff --git a/gas/testsuite/gas/mips/macro-warn-4.d b/gas/testsuite/gas/mips/macro-warn-4.d
index a52e09c400..f41b480dcb 100644
--- a/gas/testsuite/gas/mips/macro-warn-4.d
+++ b/gas/testsuite/gas/mips/macro-warn-4.d
@@ -1,5 +1,5 @@
#as: -32
#source: macro-warn-4.s
-#stderr: macro-warn-4.l
+#warning_output: macro-warn-4.l
#objdump: -p
#pass
diff --git a/gas/testsuite/gas/mips/micromips-branch-delay.d b/gas/testsuite/gas/mips/micromips-branch-delay.d
index 5509934bfb..7e2019af43 100644
--- a/gas/testsuite/gas/mips/micromips-branch-delay.d
+++ b/gas/testsuite/gas/mips/micromips-branch-delay.d
@@ -2,7 +2,7 @@
#name: microMIPS branch delay
#as: -32 -march=mips64 -mmicromips
#source: micromips-branch-delay.s
-#stderr: micromips-branch-delay.l
+#warning_output: micromips-branch-delay.l
# Test microMIPS branch delay slots.
diff --git a/gas/testsuite/gas/mips/micromips-branch-relax-insn32-pic.d b/gas/testsuite/gas/mips/micromips-branch-relax-insn32-pic.d
index 07551e3abb..c0ccb29bae 100644
--- a/gas/testsuite/gas/mips/micromips-branch-relax-insn32-pic.d
+++ b/gas/testsuite/gas/mips/micromips-branch-relax-insn32-pic.d
@@ -1,7 +1,7 @@
#objdump: -dr --show-raw-insn
#name: Relax microMIPS branches (insn32 mode, pic)
#as: -mips32r2 -32 -relax-branch -KPIC -minsn32 --defsym insn32=1
-#stderr: micromips-branch-relax-insn32-pic.l
+#warning_output: micromips-branch-relax-insn32-pic.l
#source: micromips-branch-relax.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips-branch-relax-insn32.d b/gas/testsuite/gas/mips/micromips-branch-relax-insn32.d
index 89dfb34d66..ea0108d655 100644
--- a/gas/testsuite/gas/mips/micromips-branch-relax-insn32.d
+++ b/gas/testsuite/gas/mips/micromips-branch-relax-insn32.d
@@ -1,7 +1,7 @@
#objdump: -dr --show-raw-insn
#name: Relax microMIPS branches (insn32 mode)
#as: -mips32r2 -32 -relax-branch -minsn32 --defsym insn32=1
-#stderr: micromips-branch-relax-insn32.l
+#warning_output: micromips-branch-relax-insn32.l
#source: micromips-branch-relax.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips-branch-relax-pic.d b/gas/testsuite/gas/mips/micromips-branch-relax-pic.d
index 5ccf7d9777..444a52cb04 100644
--- a/gas/testsuite/gas/mips/micromips-branch-relax-pic.d
+++ b/gas/testsuite/gas/mips/micromips-branch-relax-pic.d
@@ -1,7 +1,7 @@
#objdump: -dr --show-raw-insn
#name: Relax microMIPS branches (pic)
#as: -mips32r2 -32 -relax-branch -KPIC
-#stderr: micromips-branch-relax-pic.l
+#warning_output: micromips-branch-relax-pic.l
#source: micromips-branch-relax.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips-branch-relax.d b/gas/testsuite/gas/mips/micromips-branch-relax.d
index 66cc9ab670..12d16e0e8e 100644
--- a/gas/testsuite/gas/mips/micromips-branch-relax.d
+++ b/gas/testsuite/gas/mips/micromips-branch-relax.d
@@ -1,7 +1,7 @@
#objdump: -dr --show-raw-insn
#name: Relax microMIPS branches
#as: -mips32r2 -32 -relax-branch
-#stderr: micromips-branch-relax.l
+#warning_output: micromips-branch-relax.l
#source: micromips-branch-relax.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips-compact.d b/gas/testsuite/gas/mips/micromips-compact.d
index a66c72f6ad..c0fc89c48e 100644
--- a/gas/testsuite/gas/mips/micromips-compact.d
+++ b/gas/testsuite/gas/mips/micromips-compact.d
@@ -1,7 +1,7 @@
#objdump: -dr --show-raw-insn
#name: microMIPS for MIPS32r2 (with branch compaction)
#as: -mips32r2 -32 -mfp64 -EB --defsym compact=1
-#stderr: micromips-warn.l
+#warning_output: micromips-warn.l
#source: micromips.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips-insn32.d b/gas/testsuite/gas/mips/micromips-insn32.d
index 04abdd2f72..c8998c6478 100644
--- a/gas/testsuite/gas/mips/micromips-insn32.d
+++ b/gas/testsuite/gas/mips/micromips-insn32.d
@@ -1,7 +1,7 @@
#objdump: -drz --show-raw-insn
#name: microMIPS for MIPS32r2 (insn32 mode)
#as: -mips32r2 -32 -mfp64 -minsn32 -EB --defsym insn32=1
-#stderr: micromips-warn.l
+#warning_output: micromips-warn.l
#source: micromips.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips-noinsn32.d b/gas/testsuite/gas/mips/micromips-noinsn32.d
index 4322e4b9de..2258cb9637 100644
--- a/gas/testsuite/gas/mips/micromips-noinsn32.d
+++ b/gas/testsuite/gas/mips/micromips-noinsn32.d
@@ -1,7 +1,7 @@
#objdump: -dr --show-raw-insn
#name: microMIPS for MIPS32r2 (instructions valid in insn32 mode)
#as: -mips32r2 -32 -mfp64 -EB --defsym insn32=1
-#stderr: micromips-warn.l
+#warning_output: micromips-warn.l
#source: micromips.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips-size-1.d b/gas/testsuite/gas/mips/micromips-size-1.d
index 1fd93bea25..d59069b927 100644
--- a/gas/testsuite/gas/mips/micromips-size-1.d
+++ b/gas/testsuite/gas/mips/micromips-size-1.d
@@ -2,7 +2,7 @@
#name: microMIPS instruction size 1
#as: -32 -march=mips64 -mmicromips
#source: micromips-size-1.s
-#stderr: micromips-size-1.l
+#warning_output: micromips-size-1.l
# Test microMIPS instruction size overrides (#1).
diff --git a/gas/testsuite/gas/mips/micromips-trap.d b/gas/testsuite/gas/mips/micromips-trap.d
index bf011d026b..e96c449389 100644
--- a/gas/testsuite/gas/mips/micromips-trap.d
+++ b/gas/testsuite/gas/mips/micromips-trap.d
@@ -1,7 +1,7 @@
#objdump: -dr --show-raw-insn
#name: microMIPS for MIPS32r2 (w/traps)
#as: -mips32r2 -32 -trap -mfp64 -EB
-#stderr: micromips-warn.l
+#warning_output: micromips-warn.l
#source: micromips.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips-warn-branch-delay.d b/gas/testsuite/gas/mips/micromips-warn-branch-delay.d
index 936dab7f1e..c30edc62d7 100644
--- a/gas/testsuite/gas/mips/micromips-warn-branch-delay.d
+++ b/gas/testsuite/gas/mips/micromips-warn-branch-delay.d
@@ -2,7 +2,7 @@
#name: microMIPS fixed-size branch delay slots
#as: -mmicromips
#source: micromips-warn-branch-delay.s
-#stderr: micromips-warn-branch-delay.l
+#warning_output: micromips-warn-branch-delay.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips.d b/gas/testsuite/gas/mips/micromips.d
index 05175a6ddb..7c24c35cc7 100644
--- a/gas/testsuite/gas/mips/micromips.d
+++ b/gas/testsuite/gas/mips/micromips.d
@@ -1,7 +1,7 @@
#objdump: -dr --show-raw-insn
#name: microMIPS for MIPS32r2
#as: -mips32r2 -32 -mfp64 -EB
-#stderr: micromips-warn.l
+#warning_output: micromips-warn.l
#source: micromips.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips@addiu-error.d b/gas/testsuite/gas/mips/micromips@addiu-error.d
index 0313261e0e..3e4567fe89 100644
--- a/gas/testsuite/gas/mips/micromips@addiu-error.d
+++ b/gas/testsuite/gas/mips/micromips@addiu-error.d
@@ -1,4 +1,4 @@
#name: MIPS ADDIU errors
#as: -32
-#error-output: micromips@addiu-error.l
+#error_output: micromips@addiu-error.l
#source: addiu-error.s
diff --git a/gas/testsuite/gas/mips/micromips@mips5-fp.d b/gas/testsuite/gas/mips/micromips@mips5-fp.d
index f9afb62a88..ff1e084040 100644
--- a/gas/testsuite/gas/mips/micromips@mips5-fp.d
+++ b/gas/testsuite/gas/mips/micromips@mips5-fp.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: MIPS mips5 instructions
#source: mips5-fp.s
-#stderr: mips5-fp.l
+#warning_output: mips5-fp.l
# Check MIPS V instruction assembly (microMIPS).
diff --git a/gas/testsuite/gas/mips/micromips@msa-relax.d b/gas/testsuite/gas/mips/micromips@msa-relax.d
index cf49e20fbe..8d38ff633d 100644
--- a/gas/testsuite/gas/mips/micromips@msa-relax.d
+++ b/gas/testsuite/gas/mips/micromips@msa-relax.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn -Mmsa
#name: MSA relax
#as: -32 -mmsa -relax-branch
-#stderr: msa-relax.l
+#warning_output: msa-relax.l
#source: msa-relax.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips@relax-at.d b/gas/testsuite/gas/mips/micromips@relax-at.d
index 2a4ab46aa9..c8711f0eaa 100644
--- a/gas/testsuite/gas/mips/micromips@relax-at.d
+++ b/gas/testsuite/gas/mips/micromips@relax-at.d
@@ -1,7 +1,7 @@
#as: -KPIC -32 -relax-branch --defsym atk0=1
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS relax with .set at
-#stderr: relax.l
+#warning_output: relax.l
#source: relax.s
# Test relaxation with .set at (microMIPS).
diff --git a/gas/testsuite/gas/mips/micromips@relax-offset.d b/gas/testsuite/gas/mips/micromips@relax-offset.d
index 95fbf119cf..cc3c571bec 100644
--- a/gas/testsuite/gas/mips/micromips@relax-offset.d
+++ b/gas/testsuite/gas/mips/micromips@relax-offset.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS PIC branch relaxation with offset
#as: -32 -relax-branch
-#stderr: relax-offset.l
+#warning_output: relax-offset.l
#source: relax-offset.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips@relax.d b/gas/testsuite/gas/mips/micromips@relax.d
index bbc8670de5..91fc6ddfa9 100644
--- a/gas/testsuite/gas/mips/micromips@relax.d
+++ b/gas/testsuite/gas/mips/micromips@relax.d
@@ -1,7 +1,7 @@
#as: -KPIC -32 -relax-branch
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS relax
-#stderr: relax.l
+#warning_output: relax.l
#source: relax.s
# Test relaxation (microMIPS).
diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
index 1e4606c894..2b498428a6 100644
--- a/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
@@ -1,7 +1,7 @@
#objdump: -d -mmips:8000
#as: -32 -march=8000 -EB -mgp32 -mfp64 -KPIC
#name: MIPS -mgp32 -mfp64 (SVR4 PIC)
-#stderr: mips-gp32-fp64.l
+#warning_output: mips-gp32-fp64.l
.*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64.d b/gas/testsuite/gas/mips/mips-gp32-fp64.d
index 6d0b19ecfe..b1685775a1 100644
--- a/gas/testsuite/gas/mips/mips-gp32-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64.d
@@ -1,7 +1,7 @@
#objdump: -d -mmips:8000
#as: -32 -march=8000 -EB -mgp32 -mfp64
#name: MIPS -mgp32 -mfp64
-#stderr: mips-gp32-fp64.l
+#warning_output: mips-gp32-fp64.l
.*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
index d83d7f92ef..968bda21d7 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
@@ -1,7 +1,7 @@
#objdump: -d -mmips:8000
#as: -mabi=o64 -march=8000 -EB -mfp32 -KPIC
#name: MIPS -mgp64 -mfp32 (SVR4 PIC)
-#stderr: mips-gp64-fp32-pic.l
+#warning_output: mips-gp64-fp32-pic.l
.*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32.d b/gas/testsuite/gas/mips/mips-gp64-fp32.d
index 035cfd6f89..084de57b22 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32.d
@@ -1,7 +1,7 @@
#objdump: -d -mmips:8000
#as: -mabi=o64 -march=8000 -EB -mfp32
#name: MIPS -mgp64 -mfp32
-#stderr: mips-gp64-fp32.l
+#warning_output: mips-gp64-fp32.l
.*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64.d b/gas/testsuite/gas/mips/mips-gp64-fp64.d
index f5fe15f940..6690157b3e 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64.d
@@ -1,7 +1,7 @@
#objdump: -d -mmips:8000
#as: -mabi=o64 -march=8000 -EB
#name: MIPS -mgp64 -mfp64
-#stderr: mips-gp64-fp64.l
+#warning_output: mips-gp64-fp64.l
.*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-insn-e.d b/gas/testsuite/gas/mips/mips16-32@mips16-insn-e.d
index 28e2f32670..693bad409c 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-insn-e.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-insn-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended instructions
-#error-output: mips16-32@mips16-insn-e.l
+#error_output: mips16-32@mips16-insn-e.l
#source: mips16-insn-e.s
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-insn-t.d b/gas/testsuite/gas/mips/mips16-32@mips16-insn-t.d
index 499e6aa5dc..707b2b5e5b 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-insn-t.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-insn-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended instructions
-#error-output: mips16-32@mips16-insn-t.l
+#error_output: mips16-32@mips16-insn-t.l
#source: mips16-insn-t.s
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-macro-e.d b/gas/testsuite/gas/mips/mips16-32@mips16-macro-e.d
index e227e25a56..c6b0f98ae4 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-macro-e.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-macro-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended macros
#source: mips16-macro-e.s
-#error-output: mips16-32@mips16-macro-e.l
+#error_output: mips16-32@mips16-macro-e.l
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-macro-t.d b/gas/testsuite/gas/mips/mips16-32@mips16-macro-t.d
index eec0fb19d9..afa9387b66 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-macro-t.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-macro-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended macros
#source: mips16-macro-t.s
-#error-output: mips16-32@mips16-macro-t.l
+#error_output: mips16-32@mips16-macro-t.l
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-macro.d b/gas/testsuite/gas/mips/mips16-32@mips16-macro.d
index aae5dd6496..a735857e13 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-macro.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-macro.d
@@ -2,4 +2,4 @@
#as: -32
#name: MIPS16 macros
#source: mips16-macro.s
-#error-output: mips16-32@mips16-macro.l
+#error_output: mips16-32@mips16-macro.l
diff --git a/gas/testsuite/gas/mips/mips16-64@mips16-insn-e.d b/gas/testsuite/gas/mips/mips16-64@mips16-insn-e.d
index 7b1814d427..20489c8e95 100644
--- a/gas/testsuite/gas/mips/mips16-64@mips16-insn-e.d
+++ b/gas/testsuite/gas/mips/mips16-64@mips16-insn-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended instructions
-#error-output: mips16-64@mips16-insn-e.l
+#error_output: mips16-64@mips16-insn-e.l
#source: mips16-insn-e.s
diff --git a/gas/testsuite/gas/mips/mips16-64@mips16-insn-t.d b/gas/testsuite/gas/mips/mips16-64@mips16-insn-t.d
index 57ea2be40b..346b46c494 100644
--- a/gas/testsuite/gas/mips/mips16-64@mips16-insn-t.d
+++ b/gas/testsuite/gas/mips/mips16-64@mips16-insn-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended instructions
-#error-output: mips16-64@mips16-insn-t.l
+#error_output: mips16-64@mips16-insn-t.l
#source: mips16-insn-t.s
diff --git a/gas/testsuite/gas/mips/mips16-absolute-reloc-2.d b/gas/testsuite/gas/mips/mips16-absolute-reloc-2.d
index 29b2cda97d..4f00861a8d 100644
--- a/gas/testsuite/gas/mips/mips16-absolute-reloc-2.d
+++ b/gas/testsuite/gas/mips/mips16-absolute-reloc-2.d
@@ -1,3 +1,3 @@
#name: MIPS16 absolute relocation 2
#as: -32
-#error-output: mips16-absolute-reloc-2.l
+#error_output: mips16-absolute-reloc-2.l
diff --git a/gas/testsuite/gas/mips/mips16-absolute-reloc-3.d b/gas/testsuite/gas/mips/mips16-absolute-reloc-3.d
index e099ed0d7a..daf43df822 100644
--- a/gas/testsuite/gas/mips/mips16-absolute-reloc-3.d
+++ b/gas/testsuite/gas/mips/mips16-absolute-reloc-3.d
@@ -1,3 +1,3 @@
#name: MIPS16 absolute relocation 3
#as: -32 -mips3
-#error-output: mips16-absolute-reloc-3.l
+#error_output: mips16-absolute-reloc-3.l
diff --git a/gas/testsuite/gas/mips/mips16-branch-addend-5.d b/gas/testsuite/gas/mips/mips16-branch-addend-5.d
index 47c1134c10..6b922350f9 100644
--- a/gas/testsuite/gas/mips/mips16-branch-addend-5.d
+++ b/gas/testsuite/gas/mips/mips16-branch-addend-5.d
@@ -1,4 +1,4 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16 branch relocation with addend 5
#as: -32
-#error-output: mips16-branch-addend-5.l
+#error_output: mips16-branch-addend-5.l
diff --git a/gas/testsuite/gas/mips/mips16-branch-unextended-1.d b/gas/testsuite/gas/mips/mips16-branch-unextended-1.d
index 9bccd027d5..a398156016 100644
--- a/gas/testsuite/gas/mips/mips16-branch-unextended-1.d
+++ b/gas/testsuite/gas/mips/mips16-branch-unextended-1.d
@@ -1,3 +1,3 @@
#name: MIPS16 unextended branch instructions with relocation 1
#as: -32
-#error-output: mips16-branch-unextended.l
+#error_output: mips16-branch-unextended.l
diff --git a/gas/testsuite/gas/mips/mips16-branch-unextended-2.d b/gas/testsuite/gas/mips/mips16-branch-unextended-2.d
index b64ee5a282..008bfb137d 100644
--- a/gas/testsuite/gas/mips/mips16-branch-unextended-2.d
+++ b/gas/testsuite/gas/mips/mips16-branch-unextended-2.d
@@ -1,3 +1,3 @@
#name: MIPS16 unextended branch instructions with relocation 2
#as: -32
-#error-output: mips16-branch-unextended.l
+#error_output: mips16-branch-unextended.l
diff --git a/gas/testsuite/gas/mips/mips16-insn-e.d b/gas/testsuite/gas/mips/mips16-insn-e.d
index 5a28fead8e..5801e3be60 100644
--- a/gas/testsuite/gas/mips/mips16-insn-e.d
+++ b/gas/testsuite/gas/mips/mips16-insn-e.d
@@ -1,3 +1,3 @@
#as: -32
#name: MIPS16 explicit extended instructions
-#error-output: mips16-insn-e.l
+#error_output: mips16-insn-e.l
diff --git a/gas/testsuite/gas/mips/mips16-insn-t.d b/gas/testsuite/gas/mips/mips16-insn-t.d
index a0b7e64886..ce18062edf 100644
--- a/gas/testsuite/gas/mips/mips16-insn-t.d
+++ b/gas/testsuite/gas/mips/mips16-insn-t.d
@@ -1,3 +1,3 @@
#as: -32
#name: MIPS16 explicit unextended instructions
-#error-output: mips16-insn-t.l
+#error_output: mips16-insn-t.l
diff --git a/gas/testsuite/gas/mips/mips16-jal-t.d b/gas/testsuite/gas/mips/mips16-jal-t.d
index 287f78dbf9..adb9856c62 100644
--- a/gas/testsuite/gas/mips/mips16-jal-t.d
+++ b/gas/testsuite/gas/mips/mips16-jal-t.d
@@ -1,3 +1,3 @@
#name: MIPS16 explicit unextended JAL instructions
#as: -32
-#error-output: mips16-jal-t.l
+#error_output: mips16-jal-t.l
diff --git a/gas/testsuite/gas/mips/mips16-macro-e.d b/gas/testsuite/gas/mips/mips16-macro-e.d
index 464bac2b03..394c8135c1 100644
--- a/gas/testsuite/gas/mips/mips16-macro-e.d
+++ b/gas/testsuite/gas/mips/mips16-macro-e.d
@@ -1,3 +1,3 @@
#as: -32
#name: MIPS16 explicit extended macros
-#error-output: mips16-macro-e.l
+#error_output: mips16-macro-e.l
diff --git a/gas/testsuite/gas/mips/mips16-macro-t.d b/gas/testsuite/gas/mips/mips16-macro-t.d
index 104094d5fd..26cd5f63b2 100644
--- a/gas/testsuite/gas/mips/mips16-macro-t.d
+++ b/gas/testsuite/gas/mips/mips16-macro-t.d
@@ -1,3 +1,3 @@
#as: -32
#name: MIPS16 explicit unextended macros
-#error-output: mips16-macro-t.l
+#error_output: mips16-macro-t.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-2.d b/gas/testsuite/gas/mips/mips16-pcrel-2.d
index e2547f5f3d..846959d5e3 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-2.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-2.d
@@ -1,5 +1,5 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16 PC-relative operations 2
#as: -32
-#stderr: mips16-pcrel-2.l
+#warning_output: mips16-pcrel-2.l
#dump: mips16-pcrel-0.d
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-3.d b/gas/testsuite/gas/mips/mips16-pcrel-3.d
index 235ccf4131..c2d061cefe 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-3.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-3.d
@@ -1,3 +1,3 @@
#name: MIPS16 PC-relative operations 3
#as: -32
-#error-output: mips16-pcrel-3.l
+#error_output: mips16-pcrel-3.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-4.d b/gas/testsuite/gas/mips/mips16-pcrel-4.d
index ba17f92853..8369cf662e 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-4.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-4.d
@@ -1,3 +1,3 @@
#name: MIPS16 PC-relative operations 4
#as: -32
-#error-output: mips16-pcrel-4.l
+#error_output: mips16-pcrel-4.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-5.d b/gas/testsuite/gas/mips/mips16-pcrel-5.d
index 748ddc084b..8d2f53b94c 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-5.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-5.d
@@ -1,3 +1,3 @@
#name: MIPS16 PC-relative operations 5
#as: -32
-#error-output: mips16-pcrel-5.l
+#error_output: mips16-pcrel-5.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-absolute-n64-4.d b/gas/testsuite/gas/mips/mips16-pcrel-absolute-n64-4.d
index e160527707..a7be33fe78 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-absolute-n64-4.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-absolute-n64-4.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative reference to absolute expression 4 (n64)
#as: -64
#source: mips16-pcrel-absolute-4.s
-#error-output: mips16-pcrel-absolute-4.l
+#error_output: mips16-pcrel-absolute-4.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-absolute-n64-6.d b/gas/testsuite/gas/mips/mips16-pcrel-absolute-n64-6.d
index f2e5df2960..54d0138134 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-absolute-n64-6.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-absolute-n64-6.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative reference to absolute expression 6 (n64)
#as: -64
#source: mips16-pcrel-absolute-6.s
-#error-output: mips16-pcrel-absolute-6.l
+#error_output: mips16-pcrel-absolute-6.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-4.d b/gas/testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-4.d
index 97ebf7d8ef..a32a909b91 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-4.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-4.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative reference to absolute expression 4 (PIC, n64)
#as: -64 -call_shared
#source: mips16-pcrel-absolute-4.s
-#error-output: mips16-pcrel-absolute-4.l
+#error_output: mips16-pcrel-absolute-4.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-6.d b/gas/testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-6.d
index 2d29b1dc44..0f86f41d62 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-6.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-absolute-pic-n64-6.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative reference to absolute expression 6 (PIC, n64)
#as: -64 -call_shared
#source: mips16-pcrel-absolute-6.s
-#error-output: mips16-pcrel-absolute-6.l
+#error_output: mips16-pcrel-absolute-6.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-addend-n64-8.d b/gas/testsuite/gas/mips/mips16-pcrel-addend-n64-8.d
index d43e8f1411..b4fdc8ebb8 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-addend-n64-8.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-addend-n64-8.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative relocation with addend 8 (n64)
#as: -64
#source: mips16-pcrel-addend-8.s
-#error-output: mips16-pcrel-addend-8.l
+#error_output: mips16-pcrel-addend-8.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-addend-n64-9.d b/gas/testsuite/gas/mips/mips16-pcrel-addend-n64-9.d
index 11f7257f9d..89617d0306 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-addend-n64-9.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-addend-n64-9.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative relocation with addend 9 (n64)
#as: -64
#source: mips16-pcrel-addend-9.s
-#error-output: mips16-pcrel-addend-9.l
+#error_output: mips16-pcrel-addend-9.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-addend-pic-8.d b/gas/testsuite/gas/mips/mips16-pcrel-addend-pic-8.d
index f3e435cd26..455d8659d2 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-addend-pic-8.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-addend-pic-8.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative relocation with addend 8 (PIC)
#as: -32 -call_shared
#source: mips16-pcrel-addend-8.s
-#error-output: mips16-pcrel-addend-8.l
+#error_output: mips16-pcrel-addend-8.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-addend-pic-9.d b/gas/testsuite/gas/mips/mips16-pcrel-addend-pic-9.d
index 53711f0241..1488337397 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-addend-pic-9.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-addend-pic-9.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative relocation with addend 9 (PIC)
#as: -32 -call_shared
#source: mips16-pcrel-addend-9.s
-#error-output: mips16-pcrel-addend-9.l
+#error_output: mips16-pcrel-addend-9.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-delay-0.d b/gas/testsuite/gas/mips/mips16-pcrel-delay-0.d
index 545a6c7082..221787593e 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-delay-0.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-delay-0.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16 PC-relative operation in delay slot 0
#as: -32
-#stderr: mips16-pcrel-delay-0.l
+#warning_output: mips16-pcrel-delay-0.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-delay-1.d b/gas/testsuite/gas/mips/mips16-pcrel-delay-1.d
index 00522cf156..af3b262fd2 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-delay-1.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-delay-1.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16 PC-relative operation in delay slot 1
#as: -32
-#stderr: mips16-pcrel-delay-1.l
+#warning_output: mips16-pcrel-delay-1.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-n64-0.d b/gas/testsuite/gas/mips/mips16-pcrel-n64-0.d
index a45a493ab1..b307ee7102 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-n64-0.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-n64-0.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative operations 0 (n64)
#as: -64
#source: mips16-pcrel-0.s
-#error-output: mips16-pcrel-0.l
+#error_output: mips16-pcrel-0.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-n64-1.d b/gas/testsuite/gas/mips/mips16-pcrel-n64-1.d
index 8ca70a1085..80c9e37c69 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-n64-1.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-n64-1.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative operations 1 (n64)
#as: -64
#source: mips16-pcrel-1.s
-#error-output: mips16-pcrel-1.l
+#error_output: mips16-pcrel-1.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-pic-0.d b/gas/testsuite/gas/mips/mips16-pcrel-pic-0.d
index 5911b95275..0647188f05 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-pic-0.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-pic-0.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative operations 0 (PIC)
#as: -32 -call_shared
#source: mips16-pcrel-0.s
-#error-output: mips16-pcrel-0.l
+#error_output: mips16-pcrel-0.l
diff --git a/gas/testsuite/gas/mips/mips16-pcrel-pic-1.d b/gas/testsuite/gas/mips/mips16-pcrel-pic-1.d
index a4cf559114..dbfd100200 100644
--- a/gas/testsuite/gas/mips/mips16-pcrel-pic-1.d
+++ b/gas/testsuite/gas/mips/mips16-pcrel-pic-1.d
@@ -1,4 +1,4 @@
#name: MIPS16 PC-relative operations 1 (PIC)
#as: -32 -call_shared
#source: mips16-pcrel-1.s
-#error-output: mips16-pcrel-1.l
+#error_output: mips16-pcrel-1.l
diff --git a/gas/testsuite/gas/mips/mips16-reg-error.d b/gas/testsuite/gas/mips/mips16-reg-error.d
index 9ef6064b4f..9921139a54 100644
--- a/gas/testsuite/gas/mips/mips16-reg-error.d
+++ b/gas/testsuite/gas/mips/mips16-reg-error.d
@@ -1,3 +1,3 @@
#name: MIPS16 register errors
#as: -32 -mips64r2
-#error-output: mips16-reg-error.l
+#error_output: mips16-reg-error.l
diff --git a/gas/testsuite/gas/mips/mips16-relax-unextended-1.d b/gas/testsuite/gas/mips/mips16-relax-unextended-1.d
index dc7a85ef08..bfa9a869f8 100644
--- a/gas/testsuite/gas/mips/mips16-relax-unextended-1.d
+++ b/gas/testsuite/gas/mips/mips16-relax-unextended-1.d
@@ -1,3 +1,3 @@
#name: MIPS16 relaxation with unextended instructions forced 1
#as: -32
-#error-output: mips16-relax-unextended-1.l
+#error_output: mips16-relax-unextended-1.l
diff --git a/gas/testsuite/gas/mips/mips16-relax-unextended-2.d b/gas/testsuite/gas/mips/mips16-relax-unextended-2.d
index 5e1682032a..cd2daa1be0 100644
--- a/gas/testsuite/gas/mips/mips16-relax-unextended-2.d
+++ b/gas/testsuite/gas/mips/mips16-relax-unextended-2.d
@@ -1,3 +1,3 @@
#name: MIPS16 relaxation with unextended instructions forced 2
#as: -32
-#error-output: mips16-relax-unextended-2.l
+#error_output: mips16-relax-unextended-2.l
diff --git a/gas/testsuite/gas/mips/mips16-reloc-error.d b/gas/testsuite/gas/mips/mips16-reloc-error.d
index 1129a65edd..0a8f723971 100644
--- a/gas/testsuite/gas/mips/mips16-reloc-error.d
+++ b/gas/testsuite/gas/mips/mips16-reloc-error.d
@@ -1,3 +1,3 @@
#name: MIPS16 relocation errors
#as: -32 -mips64r2
-#error-output: mips16-reloc-error.l
+#error_output: mips16-reloc-error.l
diff --git a/gas/testsuite/gas/mips/mips16-sdrasp.d b/gas/testsuite/gas/mips/mips16-sdrasp.d
index f82e2c6aa1..97d8a458a0 100644
--- a/gas/testsuite/gas/mips/mips16-sdrasp.d
+++ b/gas/testsuite/gas/mips/mips16-sdrasp.d
@@ -1,3 +1,3 @@
#name: MIPS16 SDRASP opcode with 32-bit ISA
#as: -32 -march=mips1
-#error-output: mips16-sdrasp.l
+#error_output: mips16-sdrasp.l
diff --git a/gas/testsuite/gas/mips/mips16@addiu-error.d b/gas/testsuite/gas/mips/mips16@addiu-error.d
index 67b4611e75..6689c44013 100644
--- a/gas/testsuite/gas/mips/mips16@addiu-error.d
+++ b/gas/testsuite/gas/mips/mips16@addiu-error.d
@@ -1,4 +1,4 @@
#name: MIPS ADDIU errors
#as: -32
-#error-output: mips16@addiu-error.l
+#error_output: mips16@addiu-error.l
#source: addiu-error.s
diff --git a/gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.d b/gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.d
index 1f5edee2e9..8bdf3f86b1 100644
--- a/gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.d
+++ b/gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended instructions
-#error-output: mips16e-32@mips16-insn-e.l
+#error_output: mips16e-32@mips16-insn-e.l
#source: mips16-insn-e.s
diff --git a/gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.d b/gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.d
index 3c677cf808..5bc93c243b 100644
--- a/gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.d
+++ b/gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended instructions
-#error-output: mips16e-32@mips16-insn-t.l
+#error_output: mips16e-32@mips16-insn-t.l
#source: mips16-insn-t.s
diff --git a/gas/testsuite/gas/mips/mips16e-32@mips16-macro-e.d b/gas/testsuite/gas/mips/mips16e-32@mips16-macro-e.d
index 96c3764687..1de1c0c568 100644
--- a/gas/testsuite/gas/mips/mips16e-32@mips16-macro-e.d
+++ b/gas/testsuite/gas/mips/mips16e-32@mips16-macro-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended macros
#source: mips16-macro-e.s
-#error-output: mips16e-32@mips16-macro-e.l
+#error_output: mips16e-32@mips16-macro-e.l
diff --git a/gas/testsuite/gas/mips/mips16e-32@mips16-macro-t.d b/gas/testsuite/gas/mips/mips16e-32@mips16-macro-t.d
index a5006788f7..3653a6aa28 100644
--- a/gas/testsuite/gas/mips/mips16e-32@mips16-macro-t.d
+++ b/gas/testsuite/gas/mips/mips16e-32@mips16-macro-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended macros
#source: mips16-macro-t.s
-#error-output: mips16e-32@mips16-macro-t.l
+#error_output: mips16e-32@mips16-macro-t.l
diff --git a/gas/testsuite/gas/mips/mips16e-32@mips16-macro.d b/gas/testsuite/gas/mips/mips16e-32@mips16-macro.d
index 8987054c6d..2279fc7c00 100644
--- a/gas/testsuite/gas/mips/mips16e-32@mips16-macro.d
+++ b/gas/testsuite/gas/mips/mips16e-32@mips16-macro.d
@@ -2,4 +2,4 @@
#as: -32
#name: MIPS16 macros
#source: mips16-macro.s
-#error-output: mips16e-32@mips16-macro.l
+#error_output: mips16e-32@mips16-macro.l
diff --git a/gas/testsuite/gas/mips/mips16e-32@mips16e-64.d b/gas/testsuite/gas/mips/mips16e-32@mips16e-64.d
index 825ad41e11..396aea92ca 100644
--- a/gas/testsuite/gas/mips/mips16e-32@mips16e-64.d
+++ b/gas/testsuite/gas/mips/mips16e-32@mips16e-64.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16e-64
#source: mips16e-64.s
-#error-output: mips16e-32@mips16e-64.l
+#error_output: mips16e-32@mips16e-64.l
diff --git a/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.d b/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.d
index 7df2bf7472..fd2b831ede 100644
--- a/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.d
+++ b/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended instructions
-#error-output: mips16e2-32@mips16-insn-e.l
+#error_output: mips16e2-32@mips16-insn-e.l
#source: mips16-insn-e.s
diff --git a/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.d b/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.d
index 4c08d73a68..a23109f4a7 100644
--- a/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.d
+++ b/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended instructions
-#error-output: mips16e2-32@mips16-insn-t.l
+#error_output: mips16e2-32@mips16-insn-t.l
#source: mips16-insn-t.s
diff --git a/gas/testsuite/gas/mips/mips16e2-32@mips16-macro-e.d b/gas/testsuite/gas/mips/mips16e2-32@mips16-macro-e.d
index 0d5d7fa1c0..42157fcd63 100644
--- a/gas/testsuite/gas/mips/mips16e2-32@mips16-macro-e.d
+++ b/gas/testsuite/gas/mips/mips16e2-32@mips16-macro-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended macros
#source: mips16-macro-e.s
-#error-output: mips16e2-32@mips16-macro-e.l
+#error_output: mips16e2-32@mips16-macro-e.l
diff --git a/gas/testsuite/gas/mips/mips16e2-32@mips16-macro-t.d b/gas/testsuite/gas/mips/mips16e2-32@mips16-macro-t.d
index 204c34b52e..447a9c0d94 100644
--- a/gas/testsuite/gas/mips/mips16e2-32@mips16-macro-t.d
+++ b/gas/testsuite/gas/mips/mips16e2-32@mips16-macro-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended macros
#source: mips16-macro-t.s
-#error-output: mips16e2-32@mips16-macro-t.l
+#error_output: mips16e2-32@mips16-macro-t.l
diff --git a/gas/testsuite/gas/mips/mips16e2-32@mips16-macro.d b/gas/testsuite/gas/mips/mips16e2-32@mips16-macro.d
index ebcb745a84..428a99fd7d 100644
--- a/gas/testsuite/gas/mips/mips16e2-32@mips16-macro.d
+++ b/gas/testsuite/gas/mips/mips16e2-32@mips16-macro.d
@@ -2,4 +2,4 @@
#as: -32
#name: MIPS16 macros
#source: mips16-macro.s
-#error-output: mips16e2-32@mips16-macro.l
+#error_output: mips16e2-32@mips16-macro.l
diff --git a/gas/testsuite/gas/mips/mips16e2-32@mips16e-64.d b/gas/testsuite/gas/mips/mips16e2-32@mips16e-64.d
index 825ad41e11..396aea92ca 100644
--- a/gas/testsuite/gas/mips/mips16e2-32@mips16e-64.d
+++ b/gas/testsuite/gas/mips/mips16e2-32@mips16e-64.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16e-64
#source: mips16e-64.s
-#error-output: mips16e-32@mips16e-64.l
+#error_output: mips16e-32@mips16e-64.l
diff --git a/gas/testsuite/gas/mips/mips16e2-copy-err.d b/gas/testsuite/gas/mips/mips16e2-copy-err.d
index 31a9df55e9..c3e1353388 100644
--- a/gas/testsuite/gas/mips/mips16e2-copy-err.d
+++ b/gas/testsuite/gas/mips/mips16e2-copy-err.d
@@ -1,3 +1,3 @@
#name: MIPS16e2 interAptiv MR2 COPYW/UCOPYW ASMACRO instruction errors
#as: -32 -mips16 -march=interaptiv-mr2
-#error-output: mips16e2-copy-err.l
+#error_output: mips16e2-copy-err.l
diff --git a/gas/testsuite/gas/mips/mips16e2-imm-error.d b/gas/testsuite/gas/mips/mips16e2-imm-error.d
index 7a0bfb4ddb..4a6c8b2caf 100644
--- a/gas/testsuite/gas/mips/mips16e2-imm-error.d
+++ b/gas/testsuite/gas/mips/mips16e2-imm-error.d
@@ -1,4 +1,4 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16e2 ASE immediates
#as: -32 -mips32r2 -mmips16e2
-#error-output: mips16e2-imm-error.l
+#error_output: mips16e2-imm-error.l
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.d
index 3b44fda48d..e4496f2da2 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended instructions
-#error-output: mips16e2-interaptiv-mr2@mips16-insn-e.l
+#error_output: mips16e2-interaptiv-mr2@mips16-insn-e.l
#source: mips16-insn-e.s
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.d
index e8cc855b8b..35e28d6b36 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended instructions
-#error-output: mips16e2-interaptiv-mr2@mips16-insn-t.l
+#error_output: mips16e2-interaptiv-mr2@mips16-insn-t.l
#source: mips16-insn-t.s
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-e.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-e.d
index 0d96c4f92b..be3108eb00 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-e.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-e.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit extended macros
#source: mips16-macro-e.s
-#error-output: mips16e2-interaptiv-mr2@mips16-macro-e.l
+#error_output: mips16e2-interaptiv-mr2@mips16-macro-e.l
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-t.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-t.d
index 13e996406a..0634fc4a62 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-t.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro-t.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16 explicit unextended macros
#source: mips16-macro-t.s
-#error-output: mips16e2-interaptiv-mr2@mips16-macro-t.l
+#error_output: mips16e2-interaptiv-mr2@mips16-macro-t.l
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro.d
index ea57db148d..f5ddc4f3e0 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-macro.d
@@ -2,4 +2,4 @@
#as: -32
#name: MIPS16 macros
#source: mips16-macro.s
-#error-output: mips16e2-interaptiv-mr2@mips16-macro.l
+#error_output: mips16e2-interaptiv-mr2@mips16-macro.l
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-sub.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-sub.d
index 1f45b8a36f..bbc2248bb2 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-sub.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-sub.d
@@ -2,5 +2,5 @@
#as: -32 -I$srcdir/$subdir
#name: MIPS16 ISA subset disassembly
#source: mips16-sub.s
-#stderr: mips16e2-interaptiv-mr2@mips16-sub.l
+#warning_output: mips16e2-interaptiv-mr2@mips16-sub.l
#dump: mips16-32@mips16-sub.d
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64-sub.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64-sub.d
index 38b369a1e6..6ce17ec154 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64-sub.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64-sub.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-address --show-raw-insn
#as: -32 -I$srcdir/$subdir
#name: MIPS16e 64-bit ISA subset disassembly
-#stderr: mips16e2-interaptiv-mr2@mips16e-64-sub.l
+#warning_output: mips16e2-interaptiv-mr2@mips16e-64-sub.l
#source: mips16e-64-sub.s
#dump: mips16-32@mips16e-64-sub.d
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64.d
index 825ad41e11..396aea92ca 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-64.d
@@ -1,4 +1,4 @@
#as: -32
#name: MIPS16e-64
#source: mips16e-64.s
-#error-output: mips16e-32@mips16e-64.l
+#error_output: mips16e-32@mips16e-64.l
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-sub.d b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-sub.d
index 2322b3c62c..1755420a4b 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-sub.d
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16e-sub.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-address --show-raw-insn
#as: -32 -I$srcdir/$subdir
#name: MIPS16e ISA subset disassembly
-#stderr: mips16e2-interaptiv-mr2@mips16e-sub.l
+#warning_output: mips16e2-interaptiv-mr2@mips16e-sub.l
#source: mips16e-sub.s
#dump: mips16e-sub.d
diff --git a/gas/testsuite/gas/mips/mips16e2-mt-err.d b/gas/testsuite/gas/mips/mips16e2-mt-err.d
index 4dc0e99970..a37b75bc35 100644
--- a/gas/testsuite/gas/mips/mips16e2-mt-err.d
+++ b/gas/testsuite/gas/mips/mips16e2-mt-err.d
@@ -1,3 +1,3 @@
#name: MIPS16e2 MT ASE instruction errors
#as: -32 -mips16 -mips32r2 -mmips16e2 -mmt
-#error-output: mips16e2-mt-err.l
+#error_output: mips16e2-mt-err.l
diff --git a/gas/testsuite/gas/mips/mips16e2-reloc-error.d b/gas/testsuite/gas/mips/mips16e2-reloc-error.d
index 705fff2b94..b46ad7c7cc 100644
--- a/gas/testsuite/gas/mips/mips16e2-reloc-error.d
+++ b/gas/testsuite/gas/mips/mips16e2-reloc-error.d
@@ -1,4 +1,4 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16e2 relocation errors
#as: -32 -mips64r2 -mmips16e2
-#error-output: mips16e2-reloc-error.l
+#error_output: mips16e2-reloc-error.l
diff --git a/gas/testsuite/gas/mips/mips16e2@lui-2.d b/gas/testsuite/gas/mips/mips16e2@lui-2.d
index e030ec2734..0d636c300f 100644
--- a/gas/testsuite/gas/mips/mips16e2@lui-2.d
+++ b/gas/testsuite/gas/mips/mips16e2@lui-2.d
@@ -1,4 +1,4 @@
#name: MIPS LUI errors 2
#as: -32
-#error-output: mips16e2@lui-2.l
+#error_output: mips16e2@lui-2.l
#source: lui-2.s
diff --git a/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-2.d b/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-2.d
index c8840da86f..36143433a2 100644
--- a/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-2.d
+++ b/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-2.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16 PC-relative operations 2
#as: -32
-#stderr: mips16-pcrel-2.l
+#warning_output: mips16-pcrel-2.l
#source: mips16-pcrel-2.s
#dump: mips16e2@mips16-pcrel-0.d
diff --git a/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-delay-0.d b/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-delay-0.d
index 3acce26324..25e503bb16 100644
--- a/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-delay-0.d
+++ b/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-delay-0.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16 PC-relative operation in delay slot 0
#as: -32
-#stderr: mips16-pcrel-delay-0.l
+#warning_output: mips16-pcrel-delay-0.l
#source: mips16-pcrel-delay-0.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-delay-1.d b/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-delay-1.d
index 5c66a379d8..c5b16153ea 100644
--- a/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-delay-1.d
+++ b/gas/testsuite/gas/mips/mips16e2@mips16-pcrel-delay-1.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS16 PC-relative operation in delay slot 1
#as: -32
-#stderr: mips16-pcrel-delay-1.l
+#warning_output: mips16-pcrel-delay-1.l
#source: mips16-pcrel-delay-1.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips1@isa-override-2.d b/gas/testsuite/gas/mips/mips1@isa-override-2.d
index 63f6b390ff..01a9f8b5e4 100644
--- a/gas/testsuite/gas/mips/mips1@isa-override-2.d
+++ b/gas/testsuite/gas/mips/mips1@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: mips1@isa-override-2.l
+#error_output: mips1@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips1@relax-offset.d b/gas/testsuite/gas/mips/mips1@relax-offset.d
index bd384100a0..02207a168e 100644
--- a/gas/testsuite/gas/mips/mips1@relax-offset.d
+++ b/gas/testsuite/gas/mips/mips1@relax-offset.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS PIC branch relaxation with offset
#as: -32 -relax-branch
-#stderr: relax-offset.l
+#warning_output: relax-offset.l
#source: relax-offset.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips2@isa-override-2.d b/gas/testsuite/gas/mips/mips2@isa-override-2.d
index 457ef82dea..54f4330c7b 100644
--- a/gas/testsuite/gas/mips/mips2@isa-override-2.d
+++ b/gas/testsuite/gas/mips/mips2@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: mips2@isa-override-2.l
+#error_output: mips2@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32-mt.d b/gas/testsuite/gas/mips/mips32-mt.d
index f2807f9abf..b5140216da 100644
--- a/gas/testsuite/gas/mips/mips32-mt.d
+++ b/gas/testsuite/gas/mips/mips32-mt.d
@@ -1,7 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -M cp0-names=mips32
#name: MIPS MT ASE for MIPS32
#as: -mmt -mips32r2 -32
-#stderr: mips32-mt.l
# Check MIPS MT ASE for MIPS32 Instruction Assembly
diff --git a/gas/testsuite/gas/mips/mips32@isa-override-2.d b/gas/testsuite/gas/mips/mips32@isa-override-2.d
index 76b2d46bd7..f502cc1207 100644
--- a/gas/testsuite/gas/mips/mips32@isa-override-2.d
+++ b/gas/testsuite/gas/mips/mips32@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: mips32@isa-override-2.l
+#error_output: mips32@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32r2@isa-override-2.d b/gas/testsuite/gas/mips/mips32r2@isa-override-2.d
index 3625719f2d..dcf8859dc2 100644
--- a/gas/testsuite/gas/mips/mips32r2@isa-override-2.d
+++ b/gas/testsuite/gas/mips/mips32r2@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: mips32r2@isa-override-2.l
+#error_output: mips32r2@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32r3@isa-override-2.d b/gas/testsuite/gas/mips/mips32r3@isa-override-2.d
index fe6298ea08..0584afb61e 100644
--- a/gas/testsuite/gas/mips/mips32r3@isa-override-2.d
+++ b/gas/testsuite/gas/mips/mips32r3@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: mips32r3@isa-override-2.l
+#error_output: mips32r3@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32r5@isa-override-2.d b/gas/testsuite/gas/mips/mips32r5@isa-override-2.d
index f9f7d14cea..9eb3191919 100644
--- a/gas/testsuite/gas/mips/mips32r5@isa-override-2.d
+++ b/gas/testsuite/gas/mips/mips32r5@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: mips32r5@isa-override-2.l
+#error_output: mips32r5@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32r6@isa-override-2.d b/gas/testsuite/gas/mips/mips32r6@isa-override-2.d
index c80e6cb151..6d6fe33f01 100644
--- a/gas/testsuite/gas/mips/mips32r6@isa-override-2.d
+++ b/gas/testsuite/gas/mips/mips32r6@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: mips32r6@isa-override-2.l
+#error_output: mips32r6@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips5-fp.d b/gas/testsuite/gas/mips/mips5-fp.d
index a114a0b910..e273a5e67a 100644
--- a/gas/testsuite/gas/mips/mips5-fp.d
+++ b/gas/testsuite/gas/mips/mips5-fp.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: MIPS mips5 instructions
-#stderr: mips5-fp.l
+#warning_output: mips5-fp.l
# Check MIPS V instruction assembly
diff --git a/gas/testsuite/gas/mips/mips64-mips3d-incl.d b/gas/testsuite/gas/mips/mips64-mips3d-incl.d
index a64a529003..e3186dd36c 100644
--- a/gas/testsuite/gas/mips/mips64-mips3d-incl.d
+++ b/gas/testsuite/gas/mips/mips64-mips3d-incl.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS MIPS64 MIPS-3D ASE instructions
#source: mips64-mips3d.s
-#stderr: mips64-mips3d.l
+#warning_output: mips64-mips3d.l
#as: -64
# Check MIPS64 MIPS-3D ASE instruction assembly and disassembly
diff --git a/gas/testsuite/gas/mips/mips64-mips3d.d b/gas/testsuite/gas/mips/mips64-mips3d.d
index eb4b87f101..938ff3a6fe 100644
--- a/gas/testsuite/gas/mips/mips64-mips3d.d
+++ b/gas/testsuite/gas/mips/mips64-mips3d.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa64
#name: MIPS MIPS64 MIPS-3D ASE instructions (-mips3d flag)
#as: -mips64 -mips3d
-#stderr: mips64-mips3d.l
+#warning_output: mips64-mips3d.l
# Check MIPS64 MIPS-3D ASE instruction assembly and disassembly
diff --git a/gas/testsuite/gas/mips/mipsr6@mips5-fp.d b/gas/testsuite/gas/mips/mipsr6@mips5-fp.d
index 77244fb850..0ae9b52a77 100644
--- a/gas/testsuite/gas/mips/mipsr6@mips5-fp.d
+++ b/gas/testsuite/gas/mips/mipsr6@mips5-fp.d
@@ -1,6 +1,5 @@
#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
#name: MIPS mips5 instructions
-#stderr: mipsr6@mips5-fp.l
# Check MIPS V instruction assembly
diff --git a/gas/testsuite/gas/mips/msa-relax.d b/gas/testsuite/gas/mips/msa-relax.d
index 5dcfbb4b17..a132675cfb 100644
--- a/gas/testsuite/gas/mips/msa-relax.d
+++ b/gas/testsuite/gas/mips/msa-relax.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn -Mmsa
#name: MSA relax
#as: -32 -mmsa -relax-branch
-#stderr: msa-relax.l
+#warning_output: msa-relax.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/octeon3@isa-override-1.d b/gas/testsuite/gas/mips/octeon3@isa-override-1.d
index dc3e9c56dc..d4c9b85dc8 100644
--- a/gas/testsuite/gas/mips/octeon3@isa-override-1.d
+++ b/gas/testsuite/gas/mips/octeon3@isa-override-1.d
@@ -2,5 +2,5 @@
#name: MIPS ISA override code generation
#as: -32
#source: isa-override-1.s
-#stderr: octeon3@isa-override-1.l
+#warning_output: octeon3@isa-override-1.l
#dump: mips64r2@isa-override-1.d
diff --git a/gas/testsuite/gas/mips/octeon3@isa-override-2.d b/gas/testsuite/gas/mips/octeon3@isa-override-2.d
index bb4e0a9d25..53be99ecf0 100644
--- a/gas/testsuite/gas/mips/octeon3@isa-override-2.d
+++ b/gas/testsuite/gas/mips/octeon3@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: octeon3@isa-override-2.l
+#error_output: octeon3@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/option-pic-relax-2.d b/gas/testsuite/gas/mips/option-pic-relax-2.d
index 6c2d9f4d29..3cd0ae8437 100644
--- a/gas/testsuite/gas/mips/option-pic-relax-2.d
+++ b/gas/testsuite/gas/mips/option-pic-relax-2.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS `.option picX' with relaxation 2
#as: -32 -mips2 --relax-branch
-#stderr: option-pic-relax-2.l
+#warning_output: option-pic-relax-2.l
# Verify that relaxation is done according to the `.option picX' setting
# at the time the relevant instruction was assembled rather than at
diff --git a/gas/testsuite/gas/mips/option-pic-relax-3.d b/gas/testsuite/gas/mips/option-pic-relax-3.d
index 46f90a642a..30f9c5fae4 100644
--- a/gas/testsuite/gas/mips/option-pic-relax-3.d
+++ b/gas/testsuite/gas/mips/option-pic-relax-3.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS `.option picX' with relaxation 3
#as: -32 --relax-branch
-#stderr: option-pic-relax-3.l
+#warning_output: option-pic-relax-3.l
# Verify that relaxation is done according to the `.option picX' setting
# at the time the relevant instruction was assembled rather than at
diff --git a/gas/testsuite/gas/mips/option-pic-relax-4.d b/gas/testsuite/gas/mips/option-pic-relax-4.d
index c46f42e79d..15adf1155c 100644
--- a/gas/testsuite/gas/mips/option-pic-relax-4.d
+++ b/gas/testsuite/gas/mips/option-pic-relax-4.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS `.option picX' with relaxation 4
#as: -32 -mmicromips --relax-branch
-#stderr: option-pic-relax-4.l
+#warning_output: option-pic-relax-4.l
# Verify that relaxation is done according to the `.option picX' setting
# at the time the relevant instruction was assembled rather than at
diff --git a/gas/testsuite/gas/mips/option-pic-relax-5.d b/gas/testsuite/gas/mips/option-pic-relax-5.d
index 43e5796022..948f3299ab 100644
--- a/gas/testsuite/gas/mips/option-pic-relax-5.d
+++ b/gas/testsuite/gas/mips/option-pic-relax-5.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS `.option picX' with relaxation 5
#as: -32 -mmicromips --relax-branch
-#stderr: option-pic-relax-5.l
+#warning_output: option-pic-relax-5.l
# Verify that relaxation is done according to the `.option picX' setting
# at the time the relevant instruction was assembled rather than at
diff --git a/gas/testsuite/gas/mips/org-1.d b/gas/testsuite/gas/mips/org-1.d
index 824d6fff0c..b21951f8c1 100644
--- a/gas/testsuite/gas/mips/org-1.d
+++ b/gas/testsuite/gas/mips/org-1.d
@@ -1,7 +1,7 @@
#nm: -g --defined-only
#as: --relax-branch
#name: MIPS .org test 1
-#stderr: org-1.l
+#warning_output: org-1.l
0+100000 . bar
0+000000 . foo
diff --git a/gas/testsuite/gas/mips/org-10.d b/gas/testsuite/gas/mips/org-10.d
index 520e779810..0670988ead 100644
--- a/gas/testsuite/gas/mips/org-10.d
+++ b/gas/testsuite/gas/mips/org-10.d
@@ -1,7 +1,7 @@
#nm: -g --defined-only
#as: --relax-branch
#name: MIPS .org test 10
-#stderr: org-10.l
+#warning_output: org-10.l
0+100000 . bar
0+000000 . foo
diff --git a/gas/testsuite/gas/mips/org-4.d b/gas/testsuite/gas/mips/org-4.d
index 9d6af7ac15..a1603ebb81 100644
--- a/gas/testsuite/gas/mips/org-4.d
+++ b/gas/testsuite/gas/mips/org-4.d
@@ -1,3 +1,3 @@
#as: --relax-branch
#name: MIPS .org test 4
-#error-output: org-4.l
+#error_output: org-4.l
diff --git a/gas/testsuite/gas/mips/org-5.d b/gas/testsuite/gas/mips/org-5.d
index b8dca13655..b63fcca097 100644
--- a/gas/testsuite/gas/mips/org-5.d
+++ b/gas/testsuite/gas/mips/org-5.d
@@ -1,3 +1,3 @@
#as: -32
#name: MIPS .org test 5
-#error-output: org-5.l
+#error_output: org-5.l
diff --git a/gas/testsuite/gas/mips/org-6.d b/gas/testsuite/gas/mips/org-6.d
index 9bc6ce7ee5..887cb32666 100644
--- a/gas/testsuite/gas/mips/org-6.d
+++ b/gas/testsuite/gas/mips/org-6.d
@@ -1,2 +1,2 @@
#name: MIPS .org test 6
-#error-output: org-6.l
+#error_output: org-6.l
diff --git a/gas/testsuite/gas/mips/r3000@isa-override-2.d b/gas/testsuite/gas/mips/r3000@isa-override-2.d
index 63f6b390ff..01a9f8b5e4 100644
--- a/gas/testsuite/gas/mips/r3000@isa-override-2.d
+++ b/gas/testsuite/gas/mips/r3000@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: mips1@isa-override-2.l
+#error_output: mips1@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/r3000@relax-offset.d b/gas/testsuite/gas/mips/r3000@relax-offset.d
index d726d324a1..54e2802995 100644
--- a/gas/testsuite/gas/mips/r3000@relax-offset.d
+++ b/gas/testsuite/gas/mips/r3000@relax-offset.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS PIC branch relaxation with offset
#as: -32 -relax-branch
-#stderr: relax-offset.l
+#warning_output: relax-offset.l
#source: relax-offset.s
#dump: mips1@relax-offset.d
diff --git a/gas/testsuite/gas/mips/r3900@isa-override-2.d b/gas/testsuite/gas/mips/r3900@isa-override-2.d
index 2ee8b7d47a..e9de561a0a 100644
--- a/gas/testsuite/gas/mips/r3900@isa-override-2.d
+++ b/gas/testsuite/gas/mips/r3900@isa-override-2.d
@@ -1,4 +1,4 @@
#name: MIPS ISA override code generation 2
#as: -32
#source: isa-override-2.s
-#error-output: r3900@isa-override-2.l
+#error_output: r3900@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/r3900@relax-offset.d b/gas/testsuite/gas/mips/r3900@relax-offset.d
index d726d324a1..54e2802995 100644
--- a/gas/testsuite/gas/mips/r3900@relax-offset.d
+++ b/gas/testsuite/gas/mips/r3900@relax-offset.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS PIC branch relaxation with offset
#as: -32 -relax-branch
-#stderr: relax-offset.l
+#warning_output: relax-offset.l
#source: relax-offset.s
#dump: mips1@relax-offset.d
diff --git a/gas/testsuite/gas/mips/reginfo-2-n32.d b/gas/testsuite/gas/mips/reginfo-2-n32.d
index 572c076b49..d46b7224f6 100644
--- a/gas/testsuite/gas/mips/reginfo-2-n32.d
+++ b/gas/testsuite/gas/mips/reginfo-2-n32.d
@@ -1,4 +1,4 @@
#name: MIPS assembled .reginfo section size (n32)
#as: -n32 -mips3 --no-pad-sections
#source: reginfo-2.s
-#error-output: reginfo-2.l
+#error_output: reginfo-2.l
diff --git a/gas/testsuite/gas/mips/reginfo-2.d b/gas/testsuite/gas/mips/reginfo-2.d
index 7bfe7f9ef9..177a44896f 100644
--- a/gas/testsuite/gas/mips/reginfo-2.d
+++ b/gas/testsuite/gas/mips/reginfo-2.d
@@ -1,3 +1,3 @@
#name: MIPS assembled .reginfo section size
#as: -32
-#error-output: reginfo-2.l
+#error_output: reginfo-2.l
diff --git a/gas/testsuite/gas/mips/relax-at.d b/gas/testsuite/gas/mips/relax-at.d
index fdb6ef533c..5f5ea728f9 100644
--- a/gas/testsuite/gas/mips/relax-at.d
+++ b/gas/testsuite/gas/mips/relax-at.d
@@ -1,7 +1,7 @@
#as: -KPIC -32 -relax-branch --defsym atk0=1
#objdump: -dr --prefix-addresses
#name: MIPS relax with .set at
-#stderr: relax.l
+#warning_output: relax.l
#source: relax.s
# Test relaxation with .set at.
diff --git a/gas/testsuite/gas/mips/relax-offset.d b/gas/testsuite/gas/mips/relax-offset.d
index e7f36e2878..73175009a9 100644
--- a/gas/testsuite/gas/mips/relax-offset.d
+++ b/gas/testsuite/gas/mips/relax-offset.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS PIC branch relaxation with offset
#as: -32 -relax-branch
-#stderr: relax-offset.l
+#warning_output: relax-offset.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/relax-swap1-mips1.d b/gas/testsuite/gas/mips/relax-swap1-mips1.d
index 4a0f7b35e1..e76c651bd9 100644
--- a/gas/testsuite/gas/mips/relax-swap1-mips1.d
+++ b/gas/testsuite/gas/mips/relax-swap1-mips1.d
@@ -2,7 +2,7 @@
#name: MIPS1 branch relaxation with swapping
#as: -32 -mips1 -KPIC -relax-branch
#source: relax-swap1.s
-#stderr: relax-swap1.l
+#warning_output: relax-swap1.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/relax-swap1-mips2.d b/gas/testsuite/gas/mips/relax-swap1-mips2.d
index 17d010b91b..6318318f0b 100644
--- a/gas/testsuite/gas/mips/relax-swap1-mips2.d
+++ b/gas/testsuite/gas/mips/relax-swap1-mips2.d
@@ -2,7 +2,7 @@
#name: MIPS2 branch relaxation with swapping
#as: -32 -mips2 -KPIC -relax-branch
#source: relax-swap1.s
-#stderr: relax-swap1.l
+#warning_output: relax-swap1.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/relax-swap2.d b/gas/testsuite/gas/mips/relax-swap2.d
index c533708c7f..1b63a8abe9 100644
--- a/gas/testsuite/gas/mips/relax-swap2.d
+++ b/gas/testsuite/gas/mips/relax-swap2.d
@@ -2,7 +2,7 @@
#name: MIPS2 branch likely relaxation with swapping
#as: -32 -mips2 -KPIC -relax-branch
#source: relax-swap2.s
-#stderr: relax-swap2.l
+#warning_output: relax-swap2.l
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/relax.d b/gas/testsuite/gas/mips/relax.d
index d5e40eb0db..590794b02a 100644
--- a/gas/testsuite/gas/mips/relax.d
+++ b/gas/testsuite/gas/mips/relax.d
@@ -1,7 +1,7 @@
#as: -KPIC -32 -relax-branch
#objdump: -dr --prefix-addresses
#name: MIPS relax
-#stderr: relax.l
+#warning_output: relax.l
# Test relaxation.
diff --git a/gas/testsuite/gas/mips/save-err.d b/gas/testsuite/gas/mips/save-err.d
index 735bfe7cfc..ac78ecfac4 100644
--- a/gas/testsuite/gas/mips/save-err.d
+++ b/gas/testsuite/gas/mips/save-err.d
@@ -1,3 +1,3 @@
#name: SAVE/RESTORE instruction errors
#as: -32
-#error-output: save-err.l
+#error_output: save-err.l
diff --git a/gas/testsuite/gas/mips/set-arch.d b/gas/testsuite/gas/mips/set-arch.d
index a53ab7a412..0505950894 100644
--- a/gas/testsuite/gas/mips/set-arch.d
+++ b/gas/testsuite/gas/mips/set-arch.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn -mmips:sb1 -M gpr-names=32
#name: .set arch=FOO
-#stderr: set-arch.l
+#warning_output: set-arch.l
dump\.o: file format .*
diff --git a/gas/testsuite/gas/mips/xpa-err.d b/gas/testsuite/gas/mips/xpa-err.d
index 772bd4980b..e836312c48 100644
--- a/gas/testsuite/gas/mips/xpa-err.d
+++ b/gas/testsuite/gas/mips/xpa-err.d
@@ -1,3 +1,3 @@
#name: MIPS XPA instruction errors
#as: -32 -mxpa
-#error-output: xpa-err.l
+#error_output: xpa-err.l
diff --git a/gas/testsuite/gas/mips/xpa-virt-err.d b/gas/testsuite/gas/mips/xpa-virt-err.d
index bc51319266..90282db4b5 100644
--- a/gas/testsuite/gas/mips/xpa-virt-err.d
+++ b/gas/testsuite/gas/mips/xpa-virt-err.d
@@ -1,3 +1,3 @@
#name: MIPS XPA Virtualization ASE instruction errors
#as: -32 -mxpa -mvirt
-#error-output: xpa-virt-err.l
+#error_output: xpa-virt-err.l
diff --git a/gas/testsuite/gas/msp430/bad.d b/gas/testsuite/gas/msp430/bad.d
index 749759ec8c..c643fd025b 100644
--- a/gas/testsuite/gas/msp430/bad.d
+++ b/gas/testsuite/gas/msp430/bad.d
@@ -1,4 +1,4 @@
#name: Diagnostics Quality
#source: bad.s
#as: -my
-#error-output: bad.l
+#error_output: bad.l
diff --git a/gas/testsuite/gas/msp430/errata_warns.d b/gas/testsuite/gas/msp430/errata_warns.d
index eef8c2e22f..ebe6519631 100644
--- a/gas/testsuite/gas/msp430/errata_warns.d
+++ b/gas/testsuite/gas/msp430/errata_warns.d
@@ -1,4 +1,4 @@
#name: Warning Messages for Silicon Errata
#source: errata_warns.s
#as: -msilicon-errata-warn=cpu4,cpu8,cpu11,cpu12,cpu13,cpu19
-#error-output: errata_warns.l
+#warning_output: errata_warns.l
diff --git a/gas/testsuite/gas/msp430/pr22133.d b/gas/testsuite/gas/msp430/pr22133.d
index c8a4b39412..ec99673d68 100644
--- a/gas/testsuite/gas/msp430/pr22133.d
+++ b/gas/testsuite/gas/msp430/pr22133.d
@@ -1,4 +1,4 @@
#name: Extraneous extra text at the end of operands
#source: pr22133.s
#as:
-#error-output: pr22133.l
+#error_output: pr22133.l
diff --git a/gas/testsuite/gas/ppc/lsp-checks.d b/gas/testsuite/gas/ppc/lsp-checks.d
index 39581e9734..d74151f148 100644
--- a/gas/testsuite/gas/ppc/lsp-checks.d
+++ b/gas/testsuite/gas/ppc/lsp-checks.d
@@ -1,3 +1,3 @@
#name: Test LSP operands checks
#as: -a32 -mbig -mvle
-#error-output: lsp-checks.l
+#error_output: lsp-checks.l
diff --git a/gas/testsuite/gas/ppc/misalign.d b/gas/testsuite/gas/ppc/misalign.d
index c004b172f4..a310723ffc 100644
--- a/gas/testsuite/gas/ppc/misalign.d
+++ b/gas/testsuite/gas/ppc/misalign.d
@@ -1,2 +1,2 @@
#as:
-#error-output: misalign.l
+#error_output: misalign.l
diff --git a/gas/testsuite/gas/ppc/spe2-checks.d b/gas/testsuite/gas/ppc/spe2-checks.d
index 0acc27fa87..048c4f705c 100644
--- a/gas/testsuite/gas/ppc/spe2-checks.d
+++ b/gas/testsuite/gas/ppc/spe2-checks.d
@@ -1,3 +1,3 @@
#as: -a32 -mbig -mvle -mspe2
#name: Test SPE2 operands checks
-#error-output: spe2-checks.l
+#error_output: spe2-checks.l
diff --git a/gas/testsuite/gas/riscv/bad-csr.d b/gas/testsuite/gas/riscv/bad-csr.d
index b4f0c38c2b..68631230d4 100644
--- a/gas/testsuite/gas/riscv/bad-csr.d
+++ b/gas/testsuite/gas/riscv/bad-csr.d
@@ -1,3 +1,3 @@
#as:
#source: bad-csr.s
-#error-output: bad-csr.l
+#error_output: bad-csr.l
diff --git a/gas/testsuite/gas/riscv/c-addi16sp-fail.d b/gas/testsuite/gas/riscv/c-addi16sp-fail.d
index cc20923daf..78325d6be7 100644
--- a/gas/testsuite/gas/riscv/c-addi16sp-fail.d
+++ b/gas/testsuite/gas/riscv/c-addi16sp-fail.d
@@ -1,3 +1,3 @@
#as: -march=rv32ic
#source: c-addi16sp-fail.s
-#error-output: c-addi16sp-fail.l
+#error_output: c-addi16sp-fail.l
diff --git a/gas/testsuite/gas/riscv/c-addi4spn-fail.d b/gas/testsuite/gas/riscv/c-addi4spn-fail.d
index b3c0af44c9..d0f48704ba 100644
--- a/gas/testsuite/gas/riscv/c-addi4spn-fail.d
+++ b/gas/testsuite/gas/riscv/c-addi4spn-fail.d
@@ -1,3 +1,3 @@
#as: -march=rv32ic
#source: c-addi4spn-fail.s
-#error-output: c-addi4spn-fail.l
+#error_output: c-addi4spn-fail.l
diff --git a/gas/testsuite/gas/riscv/c-fld-fsd-fail.d b/gas/testsuite/gas/riscv/c-fld-fsd-fail.d
index a90f7b4f4a..794c3a325b 100644
--- a/gas/testsuite/gas/riscv/c-fld-fsd-fail.d
+++ b/gas/testsuite/gas/riscv/c-fld-fsd-fail.d
@@ -1,3 +1,3 @@
#as: -march=rv32ic
#source: c-fld-fsd-fail.s
-#error-output: c-fld-fsd-fail.l
+#error_output: c-fld-fsd-fail.l
diff --git a/gas/testsuite/gas/riscv/c-lui-fail.d b/gas/testsuite/gas/riscv/c-lui-fail.d
index 03e4596d21..86cc92fe4d 100644
--- a/gas/testsuite/gas/riscv/c-lui-fail.d
+++ b/gas/testsuite/gas/riscv/c-lui-fail.d
@@ -1,3 +1,3 @@
#as: -march=rv32ic
#source: c-lui-fail.s
-#error-output: c-lui-fail.l
+#error_output: c-lui-fail.l
diff --git a/gas/testsuite/gas/riscv/c-nonzero-imm.d b/gas/testsuite/gas/riscv/c-nonzero-imm.d
index 2c62290904..e053533e8b 100644
--- a/gas/testsuite/gas/riscv/c-nonzero-imm.d
+++ b/gas/testsuite/gas/riscv/c-nonzero-imm.d
@@ -1,3 +1,3 @@
#as:
#objdump: -dr
-#error-output: c-nonzero-imm.l
+#error_output: c-nonzero-imm.l
diff --git a/gas/testsuite/gas/riscv/c-nonzero-reg.d b/gas/testsuite/gas/riscv/c-nonzero-reg.d
index 39a65b53eb..4275e5dfa4 100644
--- a/gas/testsuite/gas/riscv/c-nonzero-reg.d
+++ b/gas/testsuite/gas/riscv/c-nonzero-reg.d
@@ -1,3 +1,3 @@
#as: -march=rv64gc
#objdump: -dr
-#error-output: c-nonzero-reg.l
+#error_output: c-nonzero-reg.l
diff --git a/gas/testsuite/gas/riscv/fence-fail.d b/gas/testsuite/gas/riscv/fence-fail.d
index 05b158fd75..703518b4cf 100644
--- a/gas/testsuite/gas/riscv/fence-fail.d
+++ b/gas/testsuite/gas/riscv/fence-fail.d
@@ -1,3 +1,3 @@
#as: -march=rv32i
#source: fence-fail.s
-#error-output: fence-fail.l
+#error_output: fence-fail.l
diff --git a/gas/testsuite/gas/riscv/lla64-fail.d b/gas/testsuite/gas/riscv/lla64-fail.d
index 97b2e105c8..730ae2b738 100644
--- a/gas/testsuite/gas/riscv/lla64-fail.d
+++ b/gas/testsuite/gas/riscv/lla64-fail.d
@@ -1,3 +1,3 @@
#as: -march=rv64i -mabi=lp64
#source: lla64-fail.s
-#error-output: lla64-fail.l
+#error_output: lla64-fail.l
diff --git a/gas/testsuite/gas/riscv/rouding-fail.d b/gas/testsuite/gas/riscv/rouding-fail.d
index 3544507e8b..9827b11446 100644
--- a/gas/testsuite/gas/riscv/rouding-fail.d
+++ b/gas/testsuite/gas/riscv/rouding-fail.d
@@ -1,3 +1,3 @@
#as: -march=rv32ifd
#source: rouding-fail.s
-#error-output: rouding-fail.l
+#error_output: rouding-fail.l
diff --git a/gas/testsuite/gas/sh/pcrel-hms.d b/gas/testsuite/gas/sh/pcrel-hms.d
index 233886d885..da704e1d9e 100644
--- a/gas/testsuite/gas/sh/pcrel-hms.d
+++ b/gas/testsuite/gas/sh/pcrel-hms.d
@@ -2,7 +2,7 @@
#source: pcrel.s
#objdump: -d -EB
#name: PC-relative loads
-#stderr: pcrel.l
+#warning_output: pcrel.l
.*: file format .*sh.*
diff --git a/gas/testsuite/gas/sh/pcrel.d b/gas/testsuite/gas/sh/pcrel.d
index b9f8fcd556..fff9e89822 100644
--- a/gas/testsuite/gas/sh/pcrel.d
+++ b/gas/testsuite/gas/sh/pcrel.d
@@ -1,7 +1,7 @@
#as: -big
#objdump: -d
#name: PC-relative loads
-#stderr: pcrel.l
+#warning_output: pcrel.l
.*: file format .*sh.*
diff --git a/gas/testsuite/gas/sparc/dcti-couples-v8.d b/gas/testsuite/gas/sparc/dcti-couples-v8.d
index 606ce7b966..3784da5d7b 100644
--- a/gas/testsuite/gas/sparc/dcti-couples-v8.d
+++ b/gas/testsuite/gas/sparc/dcti-couples-v8.d
@@ -1,4 +1,4 @@
#as: -Av8 --dcti-couples-detect
#name: dcti couples (v8)
#source: dcti-couples.s
-#error-output: dcti-couples-v8.l
+#warning_output: dcti-couples-v8.l
diff --git a/gas/testsuite/gas/sparc/dcti-couples-v9c.d b/gas/testsuite/gas/sparc/dcti-couples-v9c.d
index 1e1b6259f7..f9daad9cda 100644
--- a/gas/testsuite/gas/sparc/dcti-couples-v9c.d
+++ b/gas/testsuite/gas/sparc/dcti-couples-v9c.d
@@ -1,4 +1,4 @@
#as: -Av9c --dcti-couples-detect
#name: dcti couples (v9c+)
#source: dcti-couples.s
-#error-output: dcti-couples-v9c.l
+#warning_output: dcti-couples-v9c.l
diff --git a/gas/testsuite/gas/tic6x/arch-invalid-1.d b/gas/testsuite/gas/tic6x/arch-invalid-1.d
index 63745b28b5..a8b493eab7 100644
--- a/gas/testsuite/gas/tic6x/arch-invalid-1.d
+++ b/gas/testsuite/gas/tic6x/arch-invalid-1.d
@@ -1,4 +1,4 @@
#name: C6X invalid -march
#as: -march=invalid
#source: dummy.s
-#error-output: arch-invalid-1.l
+#error_output: arch-invalid-1.l
diff --git a/gas/testsuite/gas/tic6x/arch-invalid-2.d b/gas/testsuite/gas/tic6x/arch-invalid-2.d
index adad8e5d6d..7a6915db04 100644
--- a/gas/testsuite/gas/tic6x/arch-invalid-2.d
+++ b/gas/testsuite/gas/tic6x/arch-invalid-2.d
@@ -1,2 +1,2 @@
#name: C6X invalid .arch
-#error-output: arch-invalid-2.l
+#error_output: arch-invalid-2.l
diff --git a/gas/testsuite/gas/tic6x/dir-junk.d b/gas/testsuite/gas/tic6x/dir-junk.d
index 098e598266..e5ba41c428 100644
--- a/gas/testsuite/gas/tic6x/dir-junk.d
+++ b/gas/testsuite/gas/tic6x/dir-junk.d
@@ -1,2 +1,2 @@
#name: C6X junk after directives
-#error-output: dir-junk.l
+#error_output: dir-junk.l
diff --git a/gas/testsuite/gas/tic6x/insns-bad-1.d b/gas/testsuite/gas/tic6x/insns-bad-1.d
index cfb896050c..f1fe29ef29 100644
--- a/gas/testsuite/gas/tic6x/insns-bad-1.d
+++ b/gas/testsuite/gas/tic6x/insns-bad-1.d
@@ -1,2 +1,2 @@
#name: C6X bad instructions 1
-#error-output: insns-bad-1.l
+#error_output: insns-bad-1.l
diff --git a/gas/testsuite/gas/tic6x/insns-bad-2.d b/gas/testsuite/gas/tic6x/insns-bad-2.d
index ba3848e039..b281df7c07 100644
--- a/gas/testsuite/gas/tic6x/insns-bad-2.d
+++ b/gas/testsuite/gas/tic6x/insns-bad-2.d
@@ -1,3 +1,3 @@
#name: C6X bad instructions 2
#as: -march=c62x
-#error-output: insns-bad-2.l
+#error_output: insns-bad-2.l
diff --git a/gas/testsuite/gas/tic6x/parallel-bad-1.d b/gas/testsuite/gas/tic6x/parallel-bad-1.d
index 0a7cac0d79..8a9c07bb30 100644
--- a/gas/testsuite/gas/tic6x/parallel-bad-1.d
+++ b/gas/testsuite/gas/tic6x/parallel-bad-1.d
@@ -1,2 +1,2 @@
#name: C6X bad parallel syntax
-#error-output: parallel-bad-1.l
+#error_output: parallel-bad-1.l
diff --git a/gas/testsuite/gas/tic6x/parallel-bad-2.d b/gas/testsuite/gas/tic6x/parallel-bad-2.d
index c32ef44e11..3afc6f485a 100644
--- a/gas/testsuite/gas/tic6x/parallel-bad-2.d
+++ b/gas/testsuite/gas/tic6x/parallel-bad-2.d
@@ -1,2 +1,2 @@
#name: C6X bad parallel positioning
-#error-output: parallel-bad-2.l
+#error_output: parallel-bad-2.l
diff --git a/gas/testsuite/gas/tic6x/parallel-bad-3.d b/gas/testsuite/gas/tic6x/parallel-bad-3.d
index b1f3e0e634..788c3bc33c 100644
--- a/gas/testsuite/gas/tic6x/parallel-bad-3.d
+++ b/gas/testsuite/gas/tic6x/parallel-bad-3.d
@@ -1,2 +1,2 @@
#name: C6X too many parallel instructions
-#error-output: parallel-bad-3.l
+#error_output: parallel-bad-3.l
diff --git a/gas/testsuite/gas/tic6x/parallel-bad-4.d b/gas/testsuite/gas/tic6x/parallel-bad-4.d
index 9acb32c2fa..ba2de4de98 100644
--- a/gas/testsuite/gas/tic6x/parallel-bad-4.d
+++ b/gas/testsuite/gas/tic6x/parallel-bad-4.d
@@ -1,2 +1,2 @@
#name: C6X too many parallel instructions, multiple sections
-#error-output: parallel-bad-4.l
+#error_output: parallel-bad-4.l
diff --git a/gas/testsuite/gas/tic6x/predicate-bad-1.d b/gas/testsuite/gas/tic6x/predicate-bad-1.d
index 664024633a..6ad54635a1 100644
--- a/gas/testsuite/gas/tic6x/predicate-bad-1.d
+++ b/gas/testsuite/gas/tic6x/predicate-bad-1.d
@@ -1,2 +1,2 @@
#name: C6X bad predicate syntax
-#error-output: predicate-bad-1.l
+#error_output: predicate-bad-1.l
diff --git a/gas/testsuite/gas/tic6x/predicate-bad-2.d b/gas/testsuite/gas/tic6x/predicate-bad-2.d
index ec592ec598..22e0119bbf 100644
--- a/gas/testsuite/gas/tic6x/predicate-bad-2.d
+++ b/gas/testsuite/gas/tic6x/predicate-bad-2.d
@@ -1,3 +1,3 @@
#name: C6X bad predicates for architecture
#as: -march=c62x
-#error-output: predicate-bad-2.l
+#error_output: predicate-bad-2.l
diff --git a/gas/testsuite/gas/tic6x/predicate-bad-3.d b/gas/testsuite/gas/tic6x/predicate-bad-3.d
index 2aad845410..1db02d5d7c 100644
--- a/gas/testsuite/gas/tic6x/predicate-bad-3.d
+++ b/gas/testsuite/gas/tic6x/predicate-bad-3.d
@@ -1,3 +1,3 @@
#name: C6X bad predicates for instructions
#as: -march=c674x
-#error-output: predicate-bad-3.l
+#error_output: predicate-bad-3.l
diff --git a/gas/testsuite/gas/tic6x/reloc-bad-1.d b/gas/testsuite/gas/tic6x/reloc-bad-1.d
index deb05c356a..b3131c3ba4 100644
--- a/gas/testsuite/gas/tic6x/reloc-bad-1.d
+++ b/gas/testsuite/gas/tic6x/reloc-bad-1.d
@@ -1,2 +1,2 @@
#name: C6X bad relocations 1
-#error-output: reloc-bad-1.l
+#error_output: reloc-bad-1.l
diff --git a/gas/testsuite/gas/tic6x/reloc-bad-2.d b/gas/testsuite/gas/tic6x/reloc-bad-2.d
index 7c691ca790..f3f085317f 100644
--- a/gas/testsuite/gas/tic6x/reloc-bad-2.d
+++ b/gas/testsuite/gas/tic6x/reloc-bad-2.d
@@ -1,2 +1,2 @@
#name: C6X bad relocations 2
-#error-output: reloc-bad-2.l
+#error_output: reloc-bad-2.l
diff --git a/gas/testsuite/gas/tic6x/reloc-bad-3.d b/gas/testsuite/gas/tic6x/reloc-bad-3.d
index ce3e43e5b8..27b3c1a99c 100644
--- a/gas/testsuite/gas/tic6x/reloc-bad-3.d
+++ b/gas/testsuite/gas/tic6x/reloc-bad-3.d
@@ -1,2 +1,2 @@
#name: C6X bad relocations 3
-#error-output: reloc-bad-3.l
+#error_output: reloc-bad-3.l
diff --git a/gas/testsuite/gas/tic6x/reloc-bad-4.d b/gas/testsuite/gas/tic6x/reloc-bad-4.d
index e8bf588c17..0743e29c1e 100644
--- a/gas/testsuite/gas/tic6x/reloc-bad-4.d
+++ b/gas/testsuite/gas/tic6x/reloc-bad-4.d
@@ -1,2 +1,2 @@
#name: C6X bad relocations 4
-#error-output: reloc-bad-4.l
+#error_output: reloc-bad-4.l
diff --git a/gas/testsuite/gas/tic6x/reloc-bad-5.d b/gas/testsuite/gas/tic6x/reloc-bad-5.d
index 7e02926e76..d2d64cfc73 100644
--- a/gas/testsuite/gas/tic6x/reloc-bad-5.d
+++ b/gas/testsuite/gas/tic6x/reloc-bad-5.d
@@ -1,2 +1,2 @@
#name: C6X bad relocations 5
-#error-output: reloc-bad-5.l
+#error_output: reloc-bad-5.l
diff --git a/gas/testsuite/gas/tic6x/reloc-bad-6.d b/gas/testsuite/gas/tic6x/reloc-bad-6.d
index 96eeef419d..46b8946194 100644
--- a/gas/testsuite/gas/tic6x/reloc-bad-6.d
+++ b/gas/testsuite/gas/tic6x/reloc-bad-6.d
@@ -1,2 +1,2 @@
#name: C6X bad relocations 6
-#error-output: reloc-bad-6.l
+#error_output: reloc-bad-6.l
diff --git a/gas/testsuite/gas/tic6x/resource-func-unit-1.d b/gas/testsuite/gas/tic6x/resource-func-unit-1.d
index 154323340c..dcf183ffaf 100644
--- a/gas/testsuite/gas/tic6x/resource-func-unit-1.d
+++ b/gas/testsuite/gas/tic6x/resource-func-unit-1.d
@@ -1,2 +1,2 @@
#name: C6X parallel instructions on same functional unit
-#error-output: resource-func-unit-1.l
+#error_output: resource-func-unit-1.l
diff --git a/gas/testsuite/gas/tic6x/resource-func-unit-2.d b/gas/testsuite/gas/tic6x/resource-func-unit-2.d
index 38929f700c..f5e232c999 100644
--- a/gas/testsuite/gas/tic6x/resource-func-unit-2.d
+++ b/gas/testsuite/gas/tic6x/resource-func-unit-2.d
@@ -1,2 +1,2 @@
#name: C6X parallel instructions on same functional unit, multiple sections
-#error-output: resource-func-unit-2.l
+#error_output: resource-func-unit-2.l
diff --git a/gas/testsuite/gas/tic6x/sploop-bad-1.d b/gas/testsuite/gas/tic6x/sploop-bad-1.d
index b487ee441a..dfa69d8eee 100644
--- a/gas/testsuite/gas/tic6x/sploop-bad-1.d
+++ b/gas/testsuite/gas/tic6x/sploop-bad-1.d
@@ -1,2 +1,2 @@
#name: C6X bad SPLOOP instructions 1
-#error-output: sploop-bad-1.l
+#error_output: sploop-bad-1.l
diff --git a/gas/testsuite/gas/tic6x/sploop-bad-2.d b/gas/testsuite/gas/tic6x/sploop-bad-2.d
index e2749441ce..e65f0855b6 100644
--- a/gas/testsuite/gas/tic6x/sploop-bad-2.d
+++ b/gas/testsuite/gas/tic6x/sploop-bad-2.d
@@ -1,2 +1,2 @@
#name: C6X bad SPLOOP instructions 2
-#error-output: sploop-bad-2.l
+#error_output: sploop-bad-2.l
diff --git a/gas/testsuite/gas/tic6x/sploop-bad-3.d b/gas/testsuite/gas/tic6x/sploop-bad-3.d
index 572fe55f80..7f535ded33 100644
--- a/gas/testsuite/gas/tic6x/sploop-bad-3.d
+++ b/gas/testsuite/gas/tic6x/sploop-bad-3.d
@@ -1,2 +1,2 @@
#name: C6X bad SPLOOP instructions 3
-#error-output: sploop-bad-3.l
+#error_output: sploop-bad-3.l
diff --git a/gas/testsuite/gas/tic6x/sploop-bad-4.d b/gas/testsuite/gas/tic6x/sploop-bad-4.d
index e927fee794..c6001b3da7 100644
--- a/gas/testsuite/gas/tic6x/sploop-bad-4.d
+++ b/gas/testsuite/gas/tic6x/sploop-bad-4.d
@@ -1,2 +1,2 @@
#name: C6X bad SPLOOP instructions 4
-#error-output: sploop-bad-4.l
+#error_output: sploop-bad-4.l
diff --git a/gas/testsuite/gas/tic6x/sploop-bad-5.d b/gas/testsuite/gas/tic6x/sploop-bad-5.d
index 791a4ae17f..0ca44296aa 100644
--- a/gas/testsuite/gas/tic6x/sploop-bad-5.d
+++ b/gas/testsuite/gas/tic6x/sploop-bad-5.d
@@ -1,2 +1,2 @@
#name: C6X bad SPLOOP instructions 5
-#error-output: sploop-bad-5.l
+#error_output: sploop-bad-5.l
diff --git a/gas/testsuite/gas/tic6x/sploop-bad-6.d b/gas/testsuite/gas/tic6x/sploop-bad-6.d
index 647a6b6a7f..0b687e9eba 100644
--- a/gas/testsuite/gas/tic6x/sploop-bad-6.d
+++ b/gas/testsuite/gas/tic6x/sploop-bad-6.d
@@ -1,2 +1,2 @@
#name: C6X bad SPLOOP instructions 6
-#error-output: sploop-bad-6.l
+#error_output: sploop-bad-6.l
diff --git a/gas/testsuite/gas/tic6x/sploop-bad-7.d b/gas/testsuite/gas/tic6x/sploop-bad-7.d
index d150b6f034..578d958c81 100644
--- a/gas/testsuite/gas/tic6x/sploop-bad-7.d
+++ b/gas/testsuite/gas/tic6x/sploop-bad-7.d
@@ -1,2 +1,2 @@
#name: C6X bad SPLOOP instructions 7
-#error-output: sploop-bad-7.l
+#error_output: sploop-bad-7.l
diff --git a/gas/testsuite/gas/tic6x/unwind-bad-1.d b/gas/testsuite/gas/tic6x/unwind-bad-1.d
index 077062d934..8f4974fd5c 100644
--- a/gas/testsuite/gas/tic6x/unwind-bad-1.d
+++ b/gas/testsuite/gas/tic6x/unwind-bad-1.d
@@ -1,3 +1,3 @@
#name: C6X unwinding directive errors
-#error-output: unwind-bad-1.l
+#error_output: unwind-bad-1.l
diff --git a/gas/testsuite/gas/tic6x/unwind-bad-2.d b/gas/testsuite/gas/tic6x/unwind-bad-2.d
index 5f8899ed3e..e8b927bf2c 100644
--- a/gas/testsuite/gas/tic6x/unwind-bad-2.d
+++ b/gas/testsuite/gas/tic6x/unwind-bad-2.d
@@ -1,3 +1,3 @@
#name: C6X unwinding bad frame layouts
-#error-output: unwind-bad-2.l
+#error_output: unwind-bad-2.l
diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index e040e947a9..2d7d38eca7 100644
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -420,13 +420,13 @@ proc run_dump_tests { testcases {extra_options {}} } {
# Expect a gas warning matching REGEX. It is an error to issue
# both "error" and "warning".
#
-# stderr: FILE
+# warning_output: FILE
# FILE contains regexp lines to be matched against the diagnostic
# output of the assembler. This does not preclude the use of
# PROG, addr2line, nm, objdump, or readelf.
#
-# error-output: FILE
-# Means the same as 'stderr', but also indicates that the assembler
+# error_output: FILE
+# Means the same as 'warning_output', but also indicates that the assembler
# is expected to exit unsuccessfully (therefore PROG, addr2line, nm,
# objdump, and readelf have no meaning and should not be supplied).
#
@@ -469,9 +469,9 @@ proc run_dump_test { name {extra_options {}} } {
set opts(PROG) {}
set opts(source) {}
set opts(dump) {}
- set opts(stderr) {}
+ set opts(warning_output) {}
set opts(error) {}
- set opts(error-output) {}
+ set opts(error_output) {}
set opts(warning) {}
set opts(target) {}
set opts(notarget) {}
@@ -523,22 +523,22 @@ proc run_dump_test { name {extra_options {}} } {
verbose "Testing $testname"
if { (($opts(warning) != "") && ($opts(error) != "")) \
- || (($opts(warning) != "") && ($opts(stderr) != "")) \
- || (($opts(error-output) != "") && ($opts(stderr) != "")) \
- || (($opts(error-output) != "") && ($opts(error) != "")) \
- || (($opts(error-output) != "") && ($opts(warning) != "")) } {
- perror "$testname: bad mix of stderr, error-output, error, and warning test-directives"
+ || (($opts(warning) != "") && ($opts(warning_output) != "")) \
+ || (($opts(error_output) != "") && ($opts(warning_output) != "")) \
+ || (($opts(error_output) != "") && ($opts(error) != "")) \
+ || (($opts(error_output) != "") && ($opts(warning) != "")) } {
+ perror "$testname: bad mix of warning_output, error_output, error, and warning test-directives"
unresolved $testname
return
}
- if { $opts(error-output) != "" } then {
- set opts(stderr) $opts(error-output)
+ if { $opts(error_output) != "" } then {
+ set opts(warning_output) $opts(error_output)
}
set program ""
# It's meaningless to require an output-testing method when we
# expect an error.
- if { $opts(error) == "" && $opts(error-output) == "" } {
+ if { $opts(error) == "" && $opts(error_output) == "" } {
if {$opts(PROG) != ""} {
switch -- $opts(PROG) {
addr2line { set program addr2line }
@@ -665,7 +665,7 @@ proc run_dump_test { name {extra_options {}} } {
send_log "$comp_output\n"
verbose "$comp_output" 3
- if { $opts(stderr) == "" } then {
+ if { $opts(warning_output) == "" } then {
if { [regexp $expmsg $comp_output] \
&& (($cmdret == 0) == ($opts(warning) != "")) } {
# We have the expected output from gas.
@@ -690,7 +690,7 @@ proc run_dump_test { name {extra_options {}} } {
fail $testname
return
}
- set stderrfile $srcdir/$subdir/$opts(stderr)
+ set stderrfile $srcdir/$subdir/$opts(warning_output)
verbose "wrote pruned stderr to dump.stderr" 3
if { [regexp_diff "dump.stderr" "$stderrfile"] } then {
if { $opts(error) != "" } {
@@ -703,13 +703,13 @@ proc run_dump_test { name {extra_options {}} } {
fail $testname
verbose "pruned stderr is [file_contents "dump.stderr"]" 2
return
- } elseif { $opts(error-output) != "" } then {
+ } elseif { $opts(error_output) != "" } then {
pass $testname
return
}
}
} else {
- if { $opts(error) != "" || $opts(error-output) != "" } {
+ if { $opts(error) != "" || $opts(error_output) != "" } {
fail $testname
}
}
@@ -781,8 +781,8 @@ proc slurp_options { file } {
set ws {[ ]*}
set nws {[^ ]*}
# whitespace is ignored anywhere except within the options list;
- # option names are alphabetic plus dash
- set pat "^#${ws}(\[a-zA-Z0-9-\]*)$ws:${ws}(.*)$ws\$"
+ # option names are alphanumeric plus underscore.
+ set pat "^#${ws}(\[a-zA-Z0-9_\]*)$ws:${ws}(.*)$ws\$"
while { [gets $f line] != -1 } {
set line [string trim $line]
# Whitespace here is space-tab.
--
Alan Modra
Australia Development Lab, IBM