This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
gas run_dump_test rename not-target and not-skip
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Sat, 15 Sep 2018 17:00:08 +0930
- Subject: gas run_dump_test rename not-target and not-skip
Use notarget and noskip, like the ld testsuite.
* testsuite/gas/aarch64/codealign.d,
* testsuite/gas/aarch64/litpool.d,
* testsuite/gas/aarch64/mapmisc.d,
* testsuite/gas/aarch64/mapping.d,
* testsuite/gas/aarch64/mapping2.d,
* testsuite/gas/aarch64/mapping3.d,
* testsuite/gas/aarch64/mapping4.d,
* testsuite/gas/all/align.d,
* testsuite/gas/all/fill-1.d,
* testsuite/gas/all/incbin.d,
* testsuite/gas/all/redef2.d,
* testsuite/gas/all/redef3.d,
* testsuite/gas/all/relax.d,
* testsuite/gas/all/sleb128-2.d,
* testsuite/gas/all/sleb128-4.d,
* testsuite/gas/all/sleb128-5.d,
* testsuite/gas/all/sleb128-7.d,
* testsuite/gas/all/sleb128-9.d,
* testsuite/gas/all/weakref1.d,
* testsuite/gas/all/weakref1g.d,
* testsuite/gas/all/weakref1l.d,
* testsuite/gas/all/weakref1u.d,
* testsuite/gas/all/weakref1w.d,
* testsuite/gas/arm/abs12.d,
* testsuite/gas/arm/arch4t.d,
* testsuite/gas/arm/arch7.d,
* testsuite/gas/arm/arch7a-mp.d,
* testsuite/gas/arm/arch7em.d,
* testsuite/gas/arm/archv8m-main-dsp-5.d,
* testsuite/gas/arm/armv8a-automatic-hlt.d,
* testsuite/gas/arm/armv8a-automatic-lda.d,
* testsuite/gas/arm/attr-syntax.d,
* testsuite/gas/arm/automatic-bw.d,
* testsuite/gas/arm/automatic-cbz.d,
* testsuite/gas/arm/automatic-clrex.d,
* testsuite/gas/arm/automatic-lda.d,
* testsuite/gas/arm/automatic-ldaex.d,
* testsuite/gas/arm/automatic-ldaexb.d,
* testsuite/gas/arm/automatic-ldrex.d,
* testsuite/gas/arm/automatic-ldrexd.d,
* testsuite/gas/arm/automatic-movw.d,
* testsuite/gas/arm/automatic-sdiv.d,
* testsuite/gas/arm/automatic-strexb.d,
* testsuite/gas/arm/barrier-thumb.d,
* testsuite/gas/arm/barrier.d,
* testsuite/gas/arm/bignum1.d,
* testsuite/gas/arm/blx-bad.d,
* testsuite/gas/arm/blx-local.s,
* testsuite/gas/arm/crc32-armv8-a-bad.d,
* testsuite/gas/arm/crc32-armv8-a.d,
* testsuite/gas/arm/crc32-armv8-r-bad.d,
* testsuite/gas/arm/crc32-armv8-r.d,
* testsuite/gas/arm/eabi_attr_1.d,
* testsuite/gas/arm/fp-save.d,
* testsuite/gas/arm/local_function.d,
* testsuite/gas/arm/local_label_coff.d,
* testsuite/gas/arm/local_label_wince.d,
* testsuite/gas/arm/mapping.d,
* testsuite/gas/arm/mapping2.d,
* testsuite/gas/arm/mapping3.d,
* testsuite/gas/arm/mapping4.d,
* testsuite/gas/arm/mapshort-elf.d,
* testsuite/gas/arm/mask_1-armv8-a.d,
* testsuite/gas/arm/mask_1-armv8-r.d,
* testsuite/gas/arm/mrs-msr-thumb-v6t2.d,
* testsuite/gas/arm/mrs-msr-thumb-v7-m.d,
* testsuite/gas/arm/mrs-msr-thumb-v7e-m.d,
* testsuite/gas/arm/nomapping.d,
* testsuite/gas/arm/pic.d,
* testsuite/gas/arm/pic_vxworks.d,
* testsuite/gas/arm/plt-1.d,
* testsuite/gas/arm/reloc-bad.d,
* testsuite/gas/arm/reloc-fdpic.d,
* testsuite/gas/arm/t2-branch-global.d,
* testsuite/gas/arm/thumb.d,
* testsuite/gas/arm/thumb2_ldr_immediate_armv6.d,
* testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d,
* testsuite/gas/arm/thumb2_pool.d,
* testsuite/gas/arm/thumb2_vpool.d,
* testsuite/gas/arm/thumb2_vpool_be.d,
* testsuite/gas/arm/thumb32.d,
* testsuite/gas/arm/thumbver.d,
* testsuite/gas/arm/tls.d,
* testsuite/gas/arm/tls_vxworks.d,
* testsuite/gas/arm/undefined_coff.d,
* testsuite/gas/arm/unwind.d,
* testsuite/gas/arm/unwind_vxworks.d,
* testsuite/gas/arm/v4bx.d,
* testsuite/gas/arm/vfma1.d,
* testsuite/gas/arm/vldm-arm.d,
* testsuite/gas/arm/weakdef-1.d,
* testsuite/gas/arm/weakdef-2.d,
* testsuite/gas/arm/wince.d,
* testsuite/gas/arm/wince_inst.d,
* testsuite/gas/elf/bignums.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-1.d,
* testsuite/gas/elf/dwarf2-10.d,
* testsuite/gas/elf/dwarf2-11.d,
* testsuite/gas/elf/dwarf2-12.d,
* testsuite/gas/elf/dwarf2-13.d,
* testsuite/gas/elf/dwarf2-14.d,
* testsuite/gas/elf/dwarf2-15.d,
* testsuite/gas/elf/dwarf2-16.d,
* testsuite/gas/elf/dwarf2-17.d,
* testsuite/gas/elf/dwarf2-18.d,
* testsuite/gas/elf/dwarf2-2.d,
* testsuite/gas/elf/dwarf2-3.d,
* testsuite/gas/elf/dwarf2-4.d,
* testsuite/gas/elf/dwarf2-5.d,
* testsuite/gas/elf/dwarf2-6.d,
* testsuite/gas/elf/dwarf2-7.d,
* testsuite/gas/elf/dwarf2-8.d,
* testsuite/gas/elf/dwarf2-9.d,
* testsuite/gas/elf/group0c.d,
* testsuite/gas/elf/group1a.d,
* testsuite/gas/elf/group2.d,
* testsuite/gas/elf/groupautoa.d,
* testsuite/gas/elf/ifunc-1.d,
* testsuite/gas/elf/section11.d,
* testsuite/gas/elf/section4.d,
* testsuite/gas/elf/section7.d,
* testsuite/gas/elf/syms.d,
* testsuite/gas/elf/symver.d,
* testsuite/gas/i386/iamcu-1.d,
* testsuite/gas/i386/iamcu-2.d,
* testsuite/gas/i386/iamcu-3.d,
* testsuite/gas/i386/iamcu-4.d,
* testsuite/gas/i386/iamcu-5.d,
* testsuite/gas/i386/ilp32/rex.d,
* testsuite/gas/i386/k1om.d,
* testsuite/gas/i386/l1om.d,
* testsuite/gas/i386/rex.d,
* testsuite/gas/mach-o/sections-3.d,
* testsuite/gas/macros/irp.d,
* testsuite/gas/macros/repeat.d,
* testsuite/gas/macros/rept.d,
* testsuite/gas/macros/semi.d,
* testsuite/gas/macros/test2.d,
* testsuite/gas/macros/test3.d,
* testsuite/gas/macros/vararg.d,
* testsuite/gas/mips/jal-svr4pic-local.d,
* testsuite/gas/mips/micromips@jal-svr4pic-local.d,
* testsuite/gas/mips/mips1@jal-svr4pic-local.d,
* testsuite/gas/mips/r3000@jal-svr4pic-local.d,
* testsuite/gas/ppc/machine.d,
* testsuite/lib/gas-defs.exp (run_dump_test): Replace not-target
and not-skip with notarget and noskip.
diff --git a/gas/testsuite/gas/aarch64/codealign.d b/gas/testsuite/gas/aarch64/codealign.d
index b435f7a951..12da1469b3 100644
--- a/gas/testsuite/gas/aarch64/codealign.d
+++ b/gas/testsuite/gas/aarch64/codealign.d
@@ -1,7 +1,7 @@
#objdump: --section-headers
# Minimum code alignment should be set.
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format.*aarch64.*
diff --git a/gas/testsuite/gas/aarch64/litpool.d b/gas/testsuite/gas/aarch64/litpool.d
index 15edbc0a96..56044248b2 100644
--- a/gas/testsuite/gas/aarch64/litpool.d
+++ b/gas/testsuite/gas/aarch64/litpool.d
@@ -1,7 +1,7 @@
#objdump: -d
#name: AArch64 Bignums in Literal Pool (PR 16688)
# This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
.*: +file format.*aarch64.*
diff --git a/gas/testsuite/gas/aarch64/mapmisc.d b/gas/testsuite/gas/aarch64/mapmisc.d
index 5ceee73a81..fb30f1431e 100644
--- a/gas/testsuite/gas/aarch64/mapmisc.d
+++ b/gas/testsuite/gas/aarch64/mapmisc.d
@@ -3,7 +3,7 @@
#name: AArch64 Mapping Symbols for miscellaneous directives
#source: mapmisc.s
# This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
.*: +file format .*aarch64.*
diff --git a/gas/testsuite/gas/aarch64/mapping.d b/gas/testsuite/gas/aarch64/mapping.d
index 021bd936bb..46c730fee3 100644
--- a/gas/testsuite/gas/aarch64/mapping.d
+++ b/gas/testsuite/gas/aarch64/mapping.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms
#name: AArch64 Mapping Symbols
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# Test the generation of AArch64 ELF Mapping Symbols
diff --git a/gas/testsuite/gas/aarch64/mapping2.d b/gas/testsuite/gas/aarch64/mapping2.d
index 30fc346358..aafc9b0762 100644
--- a/gas/testsuite/gas/aarch64/mapping2.d
+++ b/gas/testsuite/gas/aarch64/mapping2.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms
#name: AArch64 Mapping Symbols Test 2
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format.*aarch64.*
diff --git a/gas/testsuite/gas/aarch64/mapping3.d b/gas/testsuite/gas/aarch64/mapping3.d
index 06a3260f4d..e4b7246c95 100644
--- a/gas/testsuite/gas/aarch64/mapping3.d
+++ b/gas/testsuite/gas/aarch64/mapping3.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms
#name: AArch64 Mapping Symbols Test 3
# This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
.*: +file format.*aarch64.*
diff --git a/gas/testsuite/gas/aarch64/mapping4.d b/gas/testsuite/gas/aarch64/mapping4.d
index 2f1474a187..d81a77e847 100644
--- a/gas/testsuite/gas/aarch64/mapping4.d
+++ b/gas/testsuite/gas/aarch64/mapping4.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms
#name: AArch64 Mapping Symbols Test 4
# This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
.*: +file format.*aarch64.*
diff --git a/gas/testsuite/gas/all/align.d b/gas/testsuite/gas/all/align.d
index eb08d8ddcd..9fcd6c0466 100644
--- a/gas/testsuite/gas/all/align.d
+++ b/gas/testsuite/gas/all/align.d
@@ -4,7 +4,7 @@
# even if the user requested that they filled with zeros.
# RISC-V handles alignment via relaxation and therefor won't have object files
# with the expected alignment.
-#not-target: m32c-* riscv*-* rx-*
+#notarget: m32c-* riscv*-* rx-*
# Test the alignment pseudo-op.
diff --git a/gas/testsuite/gas/all/fill-1.d b/gas/testsuite/gas/all/fill-1.d
index 861eb0de2e..6962a9880d 100644
--- a/gas/testsuite/gas/all/fill-1.d
+++ b/gas/testsuite/gas/all/fill-1.d
@@ -1,6 +1,6 @@
#objdump: -s -j .data -j "\$DATA\$"
#name: fill test with forward labels
-#not-target: tic4x-*-* tic54x-*-*
+#notarget: tic4x-*-* tic54x-*-*
.*: +file format .*
diff --git a/gas/testsuite/gas/all/incbin.d b/gas/testsuite/gas/all/incbin.d
index 6505dc54c2..e0c7c44ae3 100644
--- a/gas/testsuite/gas/all/incbin.d
+++ b/gas/testsuite/gas/all/incbin.d
@@ -1,7 +1,7 @@
#as: -I$srcdir/$subdir
#objdump: -s -j .text
#name: incbin
-#not-target: m32c-*
+#notarget: m32c-*
# Test the incbin pseudo-op
diff --git a/gas/testsuite/gas/all/redef2.d b/gas/testsuite/gas/all/redef2.d
index c50cd6c94c..5cd8849b7a 100644
--- a/gas/testsuite/gas/all/redef2.d
+++ b/gas/testsuite/gas/all/redef2.d
@@ -1,6 +1,6 @@
#objdump: -rs -j .data -j "\$DATA\$"
#name: .equ redefinitions (2)
-#not-target: *-*-darwin*
+#notarget: *-*-darwin*
.*: .*
diff --git a/gas/testsuite/gas/all/redef3.d b/gas/testsuite/gas/all/redef3.d
index 2ca3a018fe..925c20a967 100644
--- a/gas/testsuite/gas/all/redef3.d
+++ b/gas/testsuite/gas/all/redef3.d
@@ -1,6 +1,6 @@
#objdump: -rsj .data
#name: .equ redefinitions (3)
-#not-target: *-*darwin*
+#notarget: *-*darwin*
.*: .*
diff --git a/gas/testsuite/gas/all/relax.d b/gas/testsuite/gas/all/relax.d
index 27937fece2..f394043b01 100644
--- a/gas/testsuite/gas/all/relax.d
+++ b/gas/testsuite/gas/all/relax.d
@@ -3,7 +3,7 @@
# RISC-V doesn't support .sleb operands that are the difference of two symbols
# because symbol values are not known until after linker relaxation has been
# performed.
-#not-target : riscv*-*-*
+#notarget : riscv*-*-*
.*: .*
diff --git a/gas/testsuite/gas/all/sleb128-2.d b/gas/testsuite/gas/all/sleb128-2.d
index 377aa1f217..df24fafb5e 100644
--- a/gas/testsuite/gas/all/sleb128-2.d
+++ b/gas/testsuite/gas/all/sleb128-2.d
@@ -3,7 +3,7 @@
# RISC-V doesn't support .sleb operands that are the difference of two symbols
# because symbol values are not known until after linker relaxation has been
# performed.
-#not-target : riscv*-*-*
+#notarget : riscv*-*-*
.*: .*
diff --git a/gas/testsuite/gas/all/sleb128-4.d b/gas/testsuite/gas/all/sleb128-4.d
index 49eebbbb4d..a020741105 100644
--- a/gas/testsuite/gas/all/sleb128-4.d
+++ b/gas/testsuite/gas/all/sleb128-4.d
@@ -4,7 +4,7 @@
# RISC-V doesn't support .sleb operands that are the difference of two symbols
# because symbol values are not known until after linker relaxation has been
# performed.
-#not-target: riscv*-*-*
+#notarget: riscv*-*-*
.*: .*
diff --git a/gas/testsuite/gas/all/sleb128-5.d b/gas/testsuite/gas/all/sleb128-5.d
index b8298f5291..d6d4e37666 100644
--- a/gas/testsuite/gas/all/sleb128-5.d
+++ b/gas/testsuite/gas/all/sleb128-5.d
@@ -3,7 +3,7 @@
# RISC-V doesn't support .sleb operands that are the difference of two symbols
# because symbol values are not known until after linker relaxation has been
# performed.
-#not-target : riscv*-*-*
+#notarget : riscv*-*-*
.*: .*
diff --git a/gas/testsuite/gas/all/sleb128-7.d b/gas/testsuite/gas/all/sleb128-7.d
index 84aa5f16c3..609088bddd 100644
--- a/gas/testsuite/gas/all/sleb128-7.d
+++ b/gas/testsuite/gas/all/sleb128-7.d
@@ -3,7 +3,7 @@
# RISC-V doesn't support .sleb operands that are the difference of two symbols
# because symbol values are not known until after linker relaxation has been
# performed.
-#not-target: riscv*-*-*
+#notarget: riscv*-*-*
.*: .*
diff --git a/gas/testsuite/gas/all/sleb128-9.d b/gas/testsuite/gas/all/sleb128-9.d
index 5c5997f378..3d932fc47e 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
-#not-target: riscv*-*
+#notarget: riscv*-*
diff --git a/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d
index d1167077ab..1ce23a8a59 100644
--- a/gas/testsuite/gas/all/weakref1.d
+++ b/gas/testsuite/gas/all/weakref1.d
@@ -4,7 +4,7 @@
# pdp11 lacks .long
# darwin (mach-o) reverses the order of relocs.
# the following must be present in all weakref1*.d
-#not-target: alpha*-*-osf* *-*-ecoff pdp11-*-aout *-*-darwin*
+#notarget: alpha*-*-osf* *-*-ecoff pdp11-*-aout *-*-darwin*
#...
RELOCATION RECORDS FOR \[(\.text|\$CODE\$)\]:
diff --git a/gas/testsuite/gas/all/weakref1g.d b/gas/testsuite/gas/all/weakref1g.d
index 039c599786..eb3f31d503 100644
--- a/gas/testsuite/gas/all/weakref1g.d
+++ b/gas/testsuite/gas/all/weakref1g.d
@@ -1,10 +1,10 @@
#nm: --defined-only --extern-only
#name: weakref tests, global syms
#source: weakref1.s
-# see weakref1.d for comments on the not-targets
+# see weakref1.d for comments on the notargets
# ecoff (OSF/alpha) lacks .weak support
# pdp11 lacks .long
-#not-target: alpha*-*-osf* *-*-ecoff pdp11-*-aout
+#notarget: alpha*-*-osf* *-*-ecoff pdp11-*-aout
# the rest of this file is generated with the following script:
# # script begin
diff --git a/gas/testsuite/gas/all/weakref1l.d b/gas/testsuite/gas/all/weakref1l.d
index 05ba4583b4..4172e4c0c9 100644
--- a/gas/testsuite/gas/all/weakref1l.d
+++ b/gas/testsuite/gas/all/weakref1l.d
@@ -2,8 +2,8 @@
#name: weakref tests, local syms
#source: weakref1.s
# aix drops local symbols
-# see weakref1.d for comments on the other not-targets
-#not-target: *-*-aix* alpha*-*-osf* *-*-ecoff pdp11-*-aout
+# see weakref1.d for comments on the other notargets
+#notarget: *-*-aix* alpha*-*-osf* *-*-ecoff pdp11-*-aout
# the rest of this file is generated with the following script:
# # script begin
diff --git a/gas/testsuite/gas/all/weakref1u.d b/gas/testsuite/gas/all/weakref1u.d
index e8a38bd7fe..94823c2766 100644
--- a/gas/testsuite/gas/all/weakref1u.d
+++ b/gas/testsuite/gas/all/weakref1u.d
@@ -2,8 +2,8 @@
#name: weakref tests, strong undefined syms
#source: weakref1.s
# aout turns undefined into *ABS* symbols.
-# see weakref1.d for comments on the other not-targets
-#not-target: *-*-*aout ns32k-*-netbsd alpha*-*-osf* *-*-ecoff
+# see weakref1.d for comments on the other notargets
+#notarget: *-*-*aout ns32k-*-netbsd alpha*-*-osf* *-*-ecoff
# the rest of this file is generated with the following script:
# # script begin
diff --git a/gas/testsuite/gas/all/weakref1w.d b/gas/testsuite/gas/all/weakref1w.d
index 459877616a..4cae455e40 100644
--- a/gas/testsuite/gas/all/weakref1w.d
+++ b/gas/testsuite/gas/all/weakref1w.d
@@ -1,8 +1,8 @@
#nm: --undefined-only
#name: weakref tests, weak undefined syms
#source: weakref1.s
-# see weakref1.d for comments on the not-targets
-#not-target: alpha*-*-osf* *-*-ecoff pdp11-*-aout
+# see weakref1.d for comments on the notargets
+#notarget: alpha*-*-osf* *-*-ecoff pdp11-*-aout
# the rest of this file is generated with the following script:
# # script begin
diff --git a/gas/testsuite/gas/arm/abs12.d b/gas/testsuite/gas/arm/abs12.d
index d1ccf967d8..5668d270fd 100644
--- a/gas/testsuite/gas/arm/abs12.d
+++ b/gas/testsuite/gas/arm/abs12.d
@@ -1,5 +1,5 @@
#objdump: -dr
-#not-skip: *-vxworks
+#noskip: *-vxworks
.*: file format .*
diff --git a/gas/testsuite/gas/arm/arch4t.d b/gas/testsuite/gas/arm/arch4t.d
index a49ae0b1ce..2256080cff 100644
--- a/gas/testsuite/gas/arm/arch4t.d
+++ b/gas/testsuite/gas/arm/arch4t.d
@@ -2,7 +2,7 @@
# as: -march=armv4t
# objdump: -dr --prefix-addresses --show-raw-insn
# EABI targets have their own variant.
-# not-target: *-*-*eabi* *-*-symbianelf *-*-nacl*
+# notarget: *-*-*eabi* *-*-symbianelf *-*-nacl*
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/arch7.d b/gas/testsuite/gas/arm/arch7.d
index 0b0d3cf4be..4e26cf69ae 100644
--- a/gas/testsuite/gas/arm/arch7.d
+++ b/gas/testsuite/gas/arm/arch7.d
@@ -1,7 +1,7 @@
#name: ARM V7 instructions
#as: -march=armv7r
#objdump: -dr --prefix-addresses --show-raw-insn
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/arch7a-mp.d b/gas/testsuite/gas/arm/arch7a-mp.d
index 241f397296..2e5da2c27b 100644
--- a/gas/testsuite/gas/arm/arch7a-mp.d
+++ b/gas/testsuite/gas/arm/arch7a-mp.d
@@ -2,7 +2,7 @@
#as: -march=armv7-a+mp
#objdump: -dr --prefix-addresses --show-raw-insn
#source: arch7ar-mp.s
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/arch7em.d b/gas/testsuite/gas/arm/arch7em.d
index 9c8e32b7e1..1808d943ee 100644
--- a/gas/testsuite/gas/arm/arch7em.d
+++ b/gas/testsuite/gas/arm/arch7em.d
@@ -1,7 +1,7 @@
# name: 32-bit Thumb DSP instructions
# as: -march=armv7e-m
# objdump: -dr --prefix-addresses --show-raw-insn
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-5.d b/gas/testsuite/gas/arm/archv8m-main-dsp-5.d
index e31a2d66da..090dd9954c 100644
--- a/gas/testsuite/gas/arm/archv8m-main-dsp-5.d
+++ b/gas/testsuite/gas/arm/archv8m-main-dsp-5.d
@@ -2,7 +2,7 @@
#source: arch7em.s
#as: -march=armv8-m.main+dsp
#objdump: -dr --prefix-addresses --show-raw-insn
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/armv8a-automatic-hlt.d b/gas/testsuite/gas/arm/armv8a-automatic-hlt.d
index e33ac66129..ee6c428538 100644
--- a/gas/testsuite/gas/arm/armv8a-automatic-hlt.d
+++ b/gas/testsuite/gas/arm/armv8a-automatic-hlt.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/armv8a-automatic-lda.d b/gas/testsuite/gas/arm/armv8a-automatic-lda.d
index e33ac66129..ee6c428538 100644
--- a/gas/testsuite/gas/arm/armv8a-automatic-lda.d
+++ b/gas/testsuite/gas/arm/armv8a-automatic-lda.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/attr-syntax.d b/gas/testsuite/gas/arm/attr-syntax.d
index 211595ded4..b21e5eb61e 100644
--- a/gas/testsuite/gas/arm/attr-syntax.d
+++ b/gas/testsuite/gas/arm/attr-syntax.d
@@ -1,4 +1,4 @@
#source: attr-syntax.s
-#not-target: *-*-pe
+#notarget: *-*-pe
#as:
#error: :1: Error: Attribute name not recognised: made_up_tag.*:3: Error: expected <tag> , <value>.*:5: Error: expected <tag> , <value>
diff --git a/gas/testsuite/gas/arm/automatic-bw.d b/gas/testsuite/gas/arm/automatic-bw.d
index f05d884a19..0b250ef0d4 100644
--- a/gas/testsuite/gas/arm/automatic-bw.d
+++ b/gas/testsuite/gas/arm/automatic-bw.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-cbz.d b/gas/testsuite/gas/arm/automatic-cbz.d
index f05d884a19..0b250ef0d4 100644
--- a/gas/testsuite/gas/arm/automatic-cbz.d
+++ b/gas/testsuite/gas/arm/automatic-cbz.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-clrex.d b/gas/testsuite/gas/arm/automatic-clrex.d
index f05d884a19..0b250ef0d4 100644
--- a/gas/testsuite/gas/arm/automatic-clrex.d
+++ b/gas/testsuite/gas/arm/automatic-clrex.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-lda.d b/gas/testsuite/gas/arm/automatic-lda.d
index 9b35c9d0d6..172209eb63 100644
--- a/gas/testsuite/gas/arm/automatic-lda.d
+++ b/gas/testsuite/gas/arm/automatic-lda.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/automatic-ldaex.d b/gas/testsuite/gas/arm/automatic-ldaex.d
index 9b35c9d0d6..172209eb63 100644
--- a/gas/testsuite/gas/arm/automatic-ldaex.d
+++ b/gas/testsuite/gas/arm/automatic-ldaex.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/automatic-ldaexb.d b/gas/testsuite/gas/arm/automatic-ldaexb.d
index 9b35c9d0d6..172209eb63 100644
--- a/gas/testsuite/gas/arm/automatic-ldaexb.d
+++ b/gas/testsuite/gas/arm/automatic-ldaexb.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v8
diff --git a/gas/testsuite/gas/arm/automatic-ldrex.d b/gas/testsuite/gas/arm/automatic-ldrex.d
index f05d884a19..0b250ef0d4 100644
--- a/gas/testsuite/gas/arm/automatic-ldrex.d
+++ b/gas/testsuite/gas/arm/automatic-ldrex.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-ldrexd.d b/gas/testsuite/gas/arm/automatic-ldrexd.d
index f05d884a19..0b250ef0d4 100644
--- a/gas/testsuite/gas/arm/automatic-ldrexd.d
+++ b/gas/testsuite/gas/arm/automatic-ldrexd.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-movw.d b/gas/testsuite/gas/arm/automatic-movw.d
index f05d884a19..0b250ef0d4 100644
--- a/gas/testsuite/gas/arm/automatic-movw.d
+++ b/gas/testsuite/gas/arm/automatic-movw.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/automatic-sdiv.d b/gas/testsuite/gas/arm/automatic-sdiv.d
index aa115c2698..3fc60ef1c1 100644
--- a/gas/testsuite/gas/arm/automatic-sdiv.d
+++ b/gas/testsuite/gas/arm/automatic-sdiv.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v7
diff --git a/gas/testsuite/gas/arm/automatic-strexb.d b/gas/testsuite/gas/arm/automatic-strexb.d
index f05d884a19..0b250ef0d4 100644
--- a/gas/testsuite/gas/arm/automatic-strexb.d
+++ b/gas/testsuite/gas/arm/automatic-strexb.d
@@ -1,6 +1,6 @@
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_arch: v6T2
diff --git a/gas/testsuite/gas/arm/barrier-thumb.d b/gas/testsuite/gas/arm/barrier-thumb.d
index fd163fc579..6ce8ce37f1 100644
--- a/gas/testsuite/gas/arm/barrier-thumb.d
+++ b/gas/testsuite/gas/arm/barrier-thumb.d
@@ -3,7 +3,7 @@
#source: barrier.s
#as: -mcpu=cortex-a8 -mthumb
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# Test Barrier Instruction Operands
diff --git a/gas/testsuite/gas/arm/barrier.d b/gas/testsuite/gas/arm/barrier.d
index f747026532..3d20ad8ea2 100644
--- a/gas/testsuite/gas/arm/barrier.d
+++ b/gas/testsuite/gas/arm/barrier.d
@@ -2,7 +2,7 @@
#name: Barrier Instruction Operands
#as: -mcpu=cortex-a8
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# Test Barrier Instruction Operands
diff --git a/gas/testsuite/gas/arm/bignum1.d b/gas/testsuite/gas/arm/bignum1.d
index a5ce59b140..4b9765f932 100644
--- a/gas/testsuite/gas/arm/bignum1.d
+++ b/gas/testsuite/gas/arm/bignum1.d
@@ -2,7 +2,7 @@
# as:
# objdump: --full-contents
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/blx-bad.d b/gas/testsuite/gas/arm/blx-bad.d
index dec67de527..d95729c34f 100644
--- a/gas/testsuite/gas/arm/blx-bad.d
+++ b/gas/testsuite/gas/arm/blx-bad.d
@@ -1,7 +1,7 @@
#objdump: -drw --show-raw-insn
#name: BLX encoding
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: file format .*arm.*
diff --git a/gas/testsuite/gas/arm/blx-local.s b/gas/testsuite/gas/arm/blx-local.s
index a6b4d79a17..2bbf6fe074 100644
--- a/gas/testsuite/gas/arm/blx-local.s
+++ b/gas/testsuite/gas/arm/blx-local.s
@@ -1,5 +1,5 @@
# objdump: -fdrw --prefix-addresses --show-raw-insn
-# not-target: *-*-pe
+# notarget: *-*-pe
.text
.arch armv5t
diff --git a/gas/testsuite/gas/arm/crc32-armv8-a-bad.d b/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
index 608342c79f..029aef4d44 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
@@ -3,7 +3,7 @@
#source: crc32-armv8-ar-bad.s
#as: -march=armv8-a+crc
#stderr: crc32-bad.l
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/crc32-armv8-a.d b/gas/testsuite/gas/arm/crc32-armv8-a.d
index c163e60659..e7d0b97deb 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-a.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-a.d
@@ -2,7 +2,7 @@
#name: ARMv8-A CRC32 instructions
#source: crc32-armv8-ar.s
#as: -march=armv8-a+crc
-#not-target: *-*-pe *-*-wince
+#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 f8551d062a..e41055518c 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
@@ -3,7 +3,7 @@
#source: crc32-armv8-ar-bad.s
#as: -march=armv8-r+crc
#stderr: crc32-bad.l
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/crc32-armv8-r.d b/gas/testsuite/gas/arm/crc32-armv8-r.d
index 468e5c8dfe..3d1c74c60e 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-r.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-r.d
@@ -2,7 +2,7 @@
#name: ARMv8-R CRC32 instructions
#source: crc32-armv8-ar.s
#as: -march=armv8-r+crc
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: *file format .*arm.*
diff --git a/gas/testsuite/gas/arm/eabi_attr_1.d b/gas/testsuite/gas/arm/eabi_attr_1.d
index 6e05f17819..d78ea52694 100644
--- a/gas/testsuite/gas/arm/eabi_attr_1.d
+++ b/gas/testsuite/gas/arm/eabi_attr_1.d
@@ -1,7 +1,7 @@
# as: -meabi=4
# readelf: -A
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Attribute Section: aeabi
File Attributes
Tag_CPU_name: "ARM1136JF-S"
diff --git a/gas/testsuite/gas/arm/fp-save.d b/gas/testsuite/gas/arm/fp-save.d
index 501ebac01b..7c367ddca4 100644
--- a/gas/testsuite/gas/arm/fp-save.d
+++ b/gas/testsuite/gas/arm/fp-save.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: PR5712 - saving FP registers
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
#as: -mfpu=fpa
.*: *file format .*arm.*
diff --git a/gas/testsuite/gas/arm/local_function.d b/gas/testsuite/gas/arm/local_function.d
index 23fe3f615b..ea633a6306 100644
--- a/gas/testsuite/gas/arm/local_function.d
+++ b/gas/testsuite/gas/arm/local_function.d
@@ -1,7 +1,7 @@
#objdump: -r
#name: Relocations against local function symbols
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince *-*-vxworks
+#notarget: *-*-pe *-*-wince *-*-vxworks
.*: file format.*
diff --git a/gas/testsuite/gas/arm/local_label_coff.d b/gas/testsuite/gas/arm/local_label_coff.d
index e5b505bcec..8b66805233 100644
--- a/gas/testsuite/gas/arm/local_label_coff.d
+++ b/gas/testsuite/gas/arm/local_label_coff.d
@@ -2,7 +2,7 @@
#name: ARM local label relocs to section symbol relocs (COFF)
# This test is only valid on COFF based targets, except Windows CE.
# There are ELF and Windows CE versions of this test.
-#not-skip: *-unknown-pe
+#noskip: *-unknown-pe
# Check if relocations against local symbols are converted to
# relocations against section symbols.
diff --git a/gas/testsuite/gas/arm/local_label_wince.d b/gas/testsuite/gas/arm/local_label_wince.d
index 97fc58aea8..1660bebb29 100644
--- a/gas/testsuite/gas/arm/local_label_wince.d
+++ b/gas/testsuite/gas/arm/local_label_wince.d
@@ -2,7 +2,7 @@
#name: ARM local label relocs to section symbol relocs (WinCE)
# This test is only valid on Windows CE.
# There are ELF and COFF versions of this test.
-#not-skip: *-*-wince *-wince-*
+#noskip: *-*-wince *-wince-*
# Check if relocations against local symbols are converted to
# relocations against section symbols.
diff --git a/gas/testsuite/gas/arm/mapping.d b/gas/testsuite/gas/arm/mapping.d
index 32364d3c36..1e325f0fb6 100644
--- a/gas/testsuite/gas/arm/mapping.d
+++ b/gas/testsuite/gas/arm/mapping.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms
#name: ARM Mapping Symbols
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# Test the generation of ARM ELF Mapping Symbols
diff --git a/gas/testsuite/gas/arm/mapping2.d b/gas/testsuite/gas/arm/mapping2.d
index 393b5c6934..d275510abd 100644
--- a/gas/testsuite/gas/arm/mapping2.d
+++ b/gas/testsuite/gas/arm/mapping2.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms
#name: ARM Mapping Symbols Test 2
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format.*arm.*
diff --git a/gas/testsuite/gas/arm/mapping3.d b/gas/testsuite/gas/arm/mapping3.d
index 7a7b39b7ca..849f513512 100644
--- a/gas/testsuite/gas/arm/mapping3.d
+++ b/gas/testsuite/gas/arm/mapping3.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms
#name: ARM Mapping Symbols Test 3
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format.*arm.*
diff --git a/gas/testsuite/gas/arm/mapping4.d b/gas/testsuite/gas/arm/mapping4.d
index 6331e19106..abd2d50b67 100644
--- a/gas/testsuite/gas/arm/mapping4.d
+++ b/gas/testsuite/gas/arm/mapping4.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms
#name: ARM Mapping Symbols Test 4
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format.*arm.*
diff --git a/gas/testsuite/gas/arm/mapshort-elf.d b/gas/testsuite/gas/arm/mapshort-elf.d
index ffb649db91..e92661bd74 100644
--- a/gas/testsuite/gas/arm/mapshort-elf.d
+++ b/gas/testsuite/gas/arm/mapshort-elf.d
@@ -1,7 +1,7 @@
#objdump: --syms --special-syms -d
#name: ARM Mapping Symbols for .short (ELF version)
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince *-*-*eabi* *-*-symbianelf *-*-linux-* *-*-vxworks *-*-elf *-*-nacl*
+#notarget: *-*-pe *-*-wince *-*-*eabi* *-*-symbianelf *-*-linux-* *-*-vxworks *-*-elf *-*-nacl*
#source: mapshort.s
# Test the generation and use of ARM ELF Mapping Symbols
diff --git a/gas/testsuite/gas/arm/mask_1-armv8-a.d b/gas/testsuite/gas/arm/mask_1-armv8-a.d
index 823a266331..6315f437ee 100644
--- a/gas/testsuite/gas/arm/mask_1-armv8-a.d
+++ b/gas/testsuite/gas/arm/mask_1-armv8-a.d
@@ -3,7 +3,7 @@
#source: mask_1-armv8-ar.s
#as: -march=armv8-a
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# Test VFMA instruction disassembly
diff --git a/gas/testsuite/gas/arm/mask_1-armv8-r.d b/gas/testsuite/gas/arm/mask_1-armv8-r.d
index 7264de66ad..e45d1634e6 100644
--- a/gas/testsuite/gas/arm/mask_1-armv8-r.d
+++ b/gas/testsuite/gas/arm/mask_1-armv8-r.d
@@ -3,7 +3,7 @@
#source: mask_1-armv8-ar.s
#as: -march=armv8-r
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# Test VFMA instruction disassembly
diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d b/gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d
index 331fe4a1b6..abf8ba1107 100644
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MRS/MSR test, architecture v6t2, Thumb mode
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: file format .*
diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d b/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d
index 29bcc8ef24..d26d13e9ee 100644
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MRS/MSR test, architecture v7-M, Thumb mode
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: file format .*
diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d b/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
index 943cbd1d67..795164fdcd 100644
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MRS/MSR test, architecture v7e-M, Thumb mode
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: file format .*
diff --git a/gas/testsuite/gas/arm/nomapping.d b/gas/testsuite/gas/arm/nomapping.d
index caa1ec5a43..70131cef2e 100644
--- a/gas/testsuite/gas/arm/nomapping.d
+++ b/gas/testsuite/gas/arm/nomapping.d
@@ -1,7 +1,7 @@
#nm: -n
#name: ARM Mapping Symbols Ignored
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# Check ARM ELF Mapping Symbols are ignored properly
0+0 t sym1
diff --git a/gas/testsuite/gas/arm/pic.d b/gas/testsuite/gas/arm/pic.d
index 7e8caf37ee..bee64a4fae 100644
--- a/gas/testsuite/gas/arm/pic.d
+++ b/gas/testsuite/gas/arm/pic.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: PIC
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# VxWorks needs a special variant of this file.
#skip: *-*-vxworks*
diff --git a/gas/testsuite/gas/arm/pic_vxworks.d b/gas/testsuite/gas/arm/pic_vxworks.d
index 6b0f3edd81..9dbbc8dbb1 100644
--- a/gas/testsuite/gas/arm/pic_vxworks.d
+++ b/gas/testsuite/gas/arm/pic_vxworks.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: PIC
#source: pic.s
-#not-skip: *-*-vxworks*
+#noskip: *-*-vxworks*
# Test generation of PIC
diff --git a/gas/testsuite/gas/arm/plt-1.d b/gas/testsuite/gas/arm/plt-1.d
index b40db73702..4f1fe9c0c8 100644
--- a/gas/testsuite/gas/arm/plt-1.d
+++ b/gas/testsuite/gas/arm/plt-1.d
@@ -2,7 +2,7 @@
# as:
# objdump: -dr
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince *-*-vxworks
+#notarget: *-*-pe *-*-wince *-*-vxworks
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/reloc-bad.d b/gas/testsuite/gas/arm/reloc-bad.d
index 1c40a6f89a..95e5a6ac0e 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
-#not-target: *-*-vxworks
+#notarget: *-*-vxworks
diff --git a/gas/testsuite/gas/arm/reloc-fdpic.d b/gas/testsuite/gas/arm/reloc-fdpic.d
index c25aa80553..fb15b7a4fe 100644
--- a/gas/testsuite/gas/arm/reloc-fdpic.d
+++ b/gas/testsuite/gas/arm/reloc-fdpic.d
@@ -2,7 +2,7 @@
#objdump: -dr --show-raw-insn
#name: FDPIC relocations
# This test is only valid on ELF based ports.
-#not-skip: arm*-*-uclinuxfdpiceabi
+#noskip: arm*-*-uclinuxfdpiceabi
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/t2-branch-global.d b/gas/testsuite/gas/arm/t2-branch-global.d
index 0b77401e29..74d3bc3037 100644
--- a/gas/testsuite/gas/arm/t2-branch-global.d
+++ b/gas/testsuite/gas/arm/t2-branch-global.d
@@ -1,6 +1,6 @@
#name: Thumb-2 branch to constant address
#This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
#objdump: -rd
diff --git a/gas/testsuite/gas/arm/thumb.d b/gas/testsuite/gas/arm/thumb.d
index d0eae4e638..3b1c47fada 100644
--- a/gas/testsuite/gas/arm/thumb.d
+++ b/gas/testsuite/gas/arm/thumb.d
@@ -3,7 +3,7 @@
# objdump: -dr --prefix-addresses --show-raw-insn
# The arm-aout and arm-pe ports do not support Thumb branch relocations.
# EABI targets have their own variant.
-# not-target: *-*-pe *-*-*eabi* *-*-symbianelf *-*-nacl*
+# notarget: *-*-pe *-*-*eabi* *-*-symbianelf *-*-nacl*
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d b/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d
index f37fe31d31..217305b173 100644
--- a/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d
+++ b/gas/testsuite/gas/arm/thumb2_ldr_immediate_armv6.d
@@ -1,7 +1,7 @@
# name: Ldr immediate on armv6
# as: -march=armv6
# objdump: -dr --prefix-addresses --show-raw-insn
-# not-target: *-*-pe *-*-wince
+# notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d b/gas/testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d
index 107657d8d5..a2abb4b6cc 100644
--- a/gas/testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d
+++ b/gas/testsuite/gas/arm/thumb2_ldr_immediate_highregs_armv6t2.d
@@ -1,7 +1,7 @@
# name: Ldr small immediate high registers on armv6t2
# as: -march=armv6t2
# objdump: -dr --prefix-addresses --show-raw-insn
-# not-target: *-*-pe *-*-wince
+# notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumb2_pool.d b/gas/testsuite/gas/arm/thumb2_pool.d
index 55577da35f..25b8589f6c 100644
--- a/gas/testsuite/gas/arm/thumb2_pool.d
+++ b/gas/testsuite/gas/arm/thumb2_pool.d
@@ -1,7 +1,7 @@
# as: -march=armv6t2
# objdump: -dr --prefix-addresses --show-raw-insn
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince *-*-vxworks
+#notarget: *-*-pe *-*-wince *-*-vxworks
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumb2_vpool.d b/gas/testsuite/gas/arm/thumb2_vpool.d
index 3407614644..c542d1a8d7 100644
--- a/gas/testsuite/gas/arm/thumb2_vpool.d
+++ b/gas/testsuite/gas/arm/thumb2_vpool.d
@@ -1,7 +1,7 @@
# as: -march=armv6t2 -EL
# objdump: -dr --prefix-addresses --show-raw-insn
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
#name: Thumb2 vldr with immediate constant
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumb2_vpool_be.d b/gas/testsuite/gas/arm/thumb2_vpool_be.d
index 164651d5e5..d3276e9b5b 100644
--- a/gas/testsuite/gas/arm/thumb2_vpool_be.d
+++ b/gas/testsuite/gas/arm/thumb2_vpool_be.d
@@ -1,7 +1,7 @@
# as: -march=armv6t2 -mbig-endian
# objdump: -dr --prefix-addresses --show-raw-insn
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
#name: Thumb2 vldr with immediate constant
#source: thumb2_vpool.s
diff --git a/gas/testsuite/gas/arm/thumb32.d b/gas/testsuite/gas/arm/thumb32.d
index 65382b40b2..7693376c36 100644
--- a/gas/testsuite/gas/arm/thumb32.d
+++ b/gas/testsuite/gas/arm/thumb32.d
@@ -2,7 +2,7 @@
# as: -march=armv6zkt2
# objdump: -dr --prefix-addresses --show-raw-insn
# The arm-aout and arm-pe ports do not support Thumb branch relocations.
-# not-target: *-*-pe
+# notarget: *-*-pe
# stderr: thumb32.l
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/thumbver.d b/gas/testsuite/gas/arm/thumbver.d
index 49b66d7f90..1327789d5c 100644
--- a/gas/testsuite/gas/arm/thumbver.d
+++ b/gas/testsuite/gas/arm/thumbver.d
@@ -1,7 +1,7 @@
# as: -meabi=4
# readelf: -s
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
Symbol table '\.symtab' contains .* entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
diff --git a/gas/testsuite/gas/arm/tls.d b/gas/testsuite/gas/arm/tls.d
index 246463379a..23cb903f20 100644
--- a/gas/testsuite/gas/arm/tls.d
+++ b/gas/testsuite/gas/arm/tls.d
@@ -1,7 +1,7 @@
#objdump: -dr
#name: TLS
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# VxWorks needs a special variant of this file.
#skip: *-*-vxworks*
diff --git a/gas/testsuite/gas/arm/tls_vxworks.d b/gas/testsuite/gas/arm/tls_vxworks.d
index 085075b64c..80108ac995 100644
--- a/gas/testsuite/gas/arm/tls_vxworks.d
+++ b/gas/testsuite/gas/arm/tls_vxworks.d
@@ -1,10 +1,10 @@
#objdump: -dr
#name: TLS
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# This is the VxWorks variant of this file.
#source: tls.s
-#not-skip: *-*-vxworks*
+#noskip: *-*-vxworks*
# Test generation of TLS relocations
diff --git a/gas/testsuite/gas/arm/undefined_coff.d b/gas/testsuite/gas/arm/undefined_coff.d
index df802d4c8b..4e405a629a 100644
--- a/gas/testsuite/gas/arm/undefined_coff.d
+++ b/gas/testsuite/gas/arm/undefined_coff.d
@@ -1,5 +1,5 @@
#name: Undefined local label error
# COFF and aout based ports, except Windows CE,
# use a different naming convention for local labels.
-#not-skip: *-unknown-pe
+#noskip: *-unknown-pe
#error-output: undefined_coff.l
diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
index 05f46a02dd..e6a5c6d652 100644
--- a/gas/testsuite/gas/arm/unwind.d
+++ b/gas/testsuite/gas/arm/unwind.d
@@ -1,7 +1,7 @@
#objdump: -sr
#name: Unwind table generation
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# VxWorks needs a special variant of this file.
#skip: *-*-vxworks*
diff --git a/gas/testsuite/gas/arm/unwind_vxworks.d b/gas/testsuite/gas/arm/unwind_vxworks.d
index bb3edff8b8..36c3b59705 100644
--- a/gas/testsuite/gas/arm/unwind_vxworks.d
+++ b/gas/testsuite/gas/arm/unwind_vxworks.d
@@ -2,7 +2,7 @@
#name: Unwind table generation
# This is the VxWorks variant of this file.
#source: unwind.s
-#not-skip: *-*-vxworks*
+#noskip: *-*-vxworks*
.*: file format.*
diff --git a/gas/testsuite/gas/arm/v4bx.d b/gas/testsuite/gas/arm/v4bx.d
index 587e0028a6..a9b1b957f4 100644
--- a/gas/testsuite/gas/arm/v4bx.d
+++ b/gas/testsuite/gas/arm/v4bx.d
@@ -1,7 +1,7 @@
# objdump: -dr --prefix-addresses --show-raw-insn
# as: -meabi=4 --fix-v4bx
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/vfma1.d b/gas/testsuite/gas/arm/vfma1.d
index be75b15fc3..56a1cdec59 100644
--- a/gas/testsuite/gas/arm/vfma1.d
+++ b/gas/testsuite/gas/arm/vfma1.d
@@ -2,7 +2,7 @@
#name: VFMA decoding
#as: -mcpu=arm7m
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
# Test VFMA instruction disassembly
diff --git a/gas/testsuite/gas/arm/vldm-arm.d b/gas/testsuite/gas/arm/vldm-arm.d
index 1d0460d127..cb19150b3f 100644
--- a/gas/testsuite/gas/arm/vldm-arm.d
+++ b/gas/testsuite/gas/arm/vldm-arm.d
@@ -3,7 +3,7 @@
# source: vldm.s
# objdump: -dr --prefix-addresses --show-raw-insn
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/weakdef-1.d b/gas/testsuite/gas/arm/weakdef-1.d
index 8932d19ec0..a4e64f0ad1 100644
--- a/gas/testsuite/gas/arm/weakdef-1.d
+++ b/gas/testsuite/gas/arm/weakdef-1.d
@@ -2,7 +2,7 @@
# as:
# objdump: -dr
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince *-*-vxworks
+#notarget: *-*-pe *-*-wince *-*-vxworks
.*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/weakdef-2.d b/gas/testsuite/gas/arm/weakdef-2.d
index cff500f982..21259705f1 100644
--- a/gas/testsuite/gas/arm/weakdef-2.d
+++ b/gas/testsuite/gas/arm/weakdef-2.d
@@ -2,4 +2,4 @@
# as:
# error-output: weakdef-2.l
# This test is only valid on ELF based ports.
-#not-target: *-*-pe *-*-wince
+#notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/wince.d b/gas/testsuite/gas/arm/wince.d
index fd8ccec115..cb84aecf0a 100644
--- a/gas/testsuite/gas/arm/wince.d
+++ b/gas/testsuite/gas/arm/wince.d
@@ -2,7 +2,7 @@
#name: ARM WinCE basic tests
#as: -mcpu=arm7m -EL -mccs
#source: wince.s
-#not-skip: *-wince-*
+#noskip: *-wince-*
# Some WinCE specific tests.
diff --git a/gas/testsuite/gas/arm/wince_inst.d b/gas/testsuite/gas/arm/wince_inst.d
index 4fbd258dfb..6ed6f867c8 100644
--- a/gas/testsuite/gas/arm/wince_inst.d
+++ b/gas/testsuite/gas/arm/wince_inst.d
@@ -3,7 +3,7 @@
#as: -mcpu=arm7m -EL
#source: inst.s
# inst.d is used for non-WinCE targets.
-#not-skip: *-wince-*
+#noskip: *-wince-*
# This file is the same as inst.d except that the BL
# instructions have not had a -8 bias inserted.
diff --git a/gas/testsuite/gas/elf/bignums.d b/gas/testsuite/gas/elf/bignums.d
index 799ef3c2c6..1cc50aaea5 100644
--- a/gas/testsuite/gas/elf/bignums.d
+++ b/gas/testsuite/gas/elf/bignums.d
@@ -1,6 +1,6 @@
#readelf: -x .data
#name: bignum byte values
-#not-target: rx-*
+#notarget: rx-*
# The RX target sometimes calls its data section D_1.
#
# Test that 8-bit and 16-bit constants can be specified via bignums.
diff --git a/gas/testsuite/gas/elf/common5a.d b/gas/testsuite/gas/elf/common5a.d
index 9c790e61af..c42197d4e0 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
-#not-target: alpha-*-*
+#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 b1dabdcb66..2b03e0eb78 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
-#not-target: alpha-*-*
+#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 1e106ad2e3..eeeebbf728 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
-#not-target: alpha-*-*
+#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 9f51636dbe..8aa83dc2b4 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
-#not-target: alpha-*-*
+#notarget: alpha-*-*
# The Alpha target uses its own .set pseudo-insn.
diff --git a/gas/testsuite/gas/elf/dwarf2-1.d b/gas/testsuite/gas/elf/dwarf2-1.d
index 09f68688ac..c4d2e5a0ce 100644
--- a/gas/testsuite/gas/elf/dwarf2-1.d
+++ b/gas/testsuite/gas/elf/dwarf2-1.d
@@ -1,7 +1,7 @@
#as: --compress-debug-sections
#readelf: -w
#name: DWARF2 1
-#not-target: ia64-*-* m68hc1*-*-* m681*-*-*
+#notarget: ia64-*-* m68hc1*-*-* m681*-*-*
Contents of the .[z]?debug_info section:
diff --git a/gas/testsuite/gas/elf/dwarf2-10.d b/gas/testsuite/gas/elf/dwarf2-10.d
index 13c3171e5a..35f7a7ae59 100644
--- a/gas/testsuite/gas/elf/dwarf2-10.d
+++ b/gas/testsuite/gas/elf/dwarf2-10.d
@@ -3,4 +3,4 @@
#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.
-#not-target: mep-* tile*-*
+#notarget: mep-* tile*-*
diff --git a/gas/testsuite/gas/elf/dwarf2-11.d b/gas/testsuite/gas/elf/dwarf2-11.d
index c95fdfec11..bd0e6ca0c5 100644
--- a/gas/testsuite/gas/elf/dwarf2-11.d
+++ b/gas/testsuite/gas/elf/dwarf2-11.d
@@ -4,7 +4,7 @@
# The am33 avr cr16 crx ft32 mn10 msp430 nds32 pru rl78 and xtensa targets do not evaluate the subtraction of symbols at assembly time.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* m32c-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* m32c-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Contents of the \.debug_line section:
diff --git a/gas/testsuite/gas/elf/dwarf2-12.d b/gas/testsuite/gas/elf/dwarf2-12.d
index 036434e6e6..9a07b5914f 100644
--- a/gas/testsuite/gas/elf/dwarf2-12.d
+++ b/gas/testsuite/gas/elf/dwarf2-12.d
@@ -4,7 +4,7 @@
# The am33 avr cr16 crx ft32 mn10 msp430 nds32 pru rl78 and xtensa targets do not evaluate the subtraction of symbols at assembly time.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Hex dump of section '\.rodata':
diff --git a/gas/testsuite/gas/elf/dwarf2-13.d b/gas/testsuite/gas/elf/dwarf2-13.d
index ae810d2343..8ec16eb6cb 100644
--- a/gas/testsuite/gas/elf/dwarf2-13.d
+++ b/gas/testsuite/gas/elf/dwarf2-13.d
@@ -4,7 +4,7 @@
# The am33 avr cr16 crx ft32 mn10 msp430 nds32 pru rl78 and xtensa targets do not evaluate the subtraction of symbols at assembly time.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Hex dump of section '\.rodata':
0x00000000 01 *.*
diff --git a/gas/testsuite/gas/elf/dwarf2-14.d b/gas/testsuite/gas/elf/dwarf2-14.d
index a579d7b38e..14193893ff 100644
--- a/gas/testsuite/gas/elf/dwarf2-14.d
+++ b/gas/testsuite/gas/elf/dwarf2-14.d
@@ -4,7 +4,7 @@
# The am33 avr cr16 crx mn10 ft32 msp430 nds32 pru rl78 and xtensa targets do not evaluate the subtraction of symbols at assembly time
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Hex dump of section '\.rodata':
0x00000000 01 *.*
diff --git a/gas/testsuite/gas/elf/dwarf2-15.d b/gas/testsuite/gas/elf/dwarf2-15.d
index 772b7b6ba2..cabb6a649a 100644
--- a/gas/testsuite/gas/elf/dwarf2-15.d
+++ b/gas/testsuite/gas/elf/dwarf2-15.d
@@ -4,7 +4,7 @@
# The am33 avr cr16 crx ft32 mn10 msp430 nds32 pru rl78 and xtensa targets do not evaluate the subtraction of symbols at assembly time.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Hex dump of section '\.rodata':
0x00000000 01 *.*
diff --git a/gas/testsuite/gas/elf/dwarf2-16.d b/gas/testsuite/gas/elf/dwarf2-16.d
index ee4c767d59..a7b057140b 100644
--- a/gas/testsuite/gas/elf/dwarf2-16.d
+++ b/gas/testsuite/gas/elf/dwarf2-16.d
@@ -5,7 +5,7 @@
# The mep target tries to relay code sections which breaks symbolic view computations.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* mep-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* mep-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Hex dump of section '\.rodata':
0x00000000 01 *.*
diff --git a/gas/testsuite/gas/elf/dwarf2-17.d b/gas/testsuite/gas/elf/dwarf2-17.d
index 849258de64..f5a54489b6 100644
--- a/gas/testsuite/gas/elf/dwarf2-17.d
+++ b/gas/testsuite/gas/elf/dwarf2-17.d
@@ -5,7 +5,7 @@
# The mep target tries to relay code sections which breaks symbolic view computations.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* mep-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* mep-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Hex dump of section '\.rodata':
0x00000000 00 *.*
diff --git a/gas/testsuite/gas/elf/dwarf2-18.d b/gas/testsuite/gas/elf/dwarf2-18.d
index c1d86e2013..b31739adb6 100644
--- a/gas/testsuite/gas/elf/dwarf2-18.d
+++ b/gas/testsuite/gas/elf/dwarf2-18.d
@@ -4,7 +4,7 @@
# The am33 avr cr16 crx ft32 mn10 msp430 nds32 pru rl78 and xtensa targets do not evaluate the subtraction of symbols at assembly time.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Hex dump of section '\.rodata':
0x00000000 0100 *.*
diff --git a/gas/testsuite/gas/elf/dwarf2-2.d b/gas/testsuite/gas/elf/dwarf2-2.d
index cfcd5c6e40..948fc32031 100644
--- a/gas/testsuite/gas/elf/dwarf2-2.d
+++ b/gas/testsuite/gas/elf/dwarf2-2.d
@@ -1,7 +1,7 @@
#as: --compress-debug-sections
#readelf: -w
#name: DWARF2 2
-#not-target: ia64-*-* m68hc1*-*-* m681*-*-*
+#notarget: ia64-*-* m68hc1*-*-* m681*-*-*
Contents of the .[z]?debug_info section:
diff --git a/gas/testsuite/gas/elf/dwarf2-3.d b/gas/testsuite/gas/elf/dwarf2-3.d
index 2efe703300..2d630b5a12 100644
--- a/gas/testsuite/gas/elf/dwarf2-3.d
+++ b/gas/testsuite/gas/elf/dwarf2-3.d
@@ -1,6 +1,6 @@
#readelf: -wl
#name: DWARF2 3
-#not-target: ft32*-* ia64-*-* h8300-*-*
+#notarget: ft32*-* ia64-*-* h8300-*-*
Raw dump of debug contents of section \.z?debug_line:
diff --git a/gas/testsuite/gas/elf/dwarf2-4.d b/gas/testsuite/gas/elf/dwarf2-4.d
index 39e0326bc6..5340918703 100644
--- a/gas/testsuite/gas/elf/dwarf2-4.d
+++ b/gas/testsuite/gas/elf/dwarf2-4.d
@@ -1,7 +1,7 @@
#as: --compress-debug-sections
#readelf: -w
#name: DWARF2 4
-#not-target: ia64-*-*
+#notarget: ia64-*-*
Contents of the .[z]?debug_abbrev section:
diff --git a/gas/testsuite/gas/elf/dwarf2-5.d b/gas/testsuite/gas/elf/dwarf2-5.d
index 069b8015c2..437f4dfa31 100644
--- a/gas/testsuite/gas/elf/dwarf2-5.d
+++ b/gas/testsuite/gas/elf/dwarf2-5.d
@@ -5,7 +5,7 @@
# The mep target tries to relay code sections which breaks symbolic view computations.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* mep-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* rx-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* mep-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* rx-* tile*-* xtensa-*
Hex dump of section '\.rodata':
0x00000000 01010201 010203 *.*
diff --git a/gas/testsuite/gas/elf/dwarf2-6.d b/gas/testsuite/gas/elf/dwarf2-6.d
index b3d475190e..b518518ce0 100644
--- a/gas/testsuite/gas/elf/dwarf2-6.d
+++ b/gas/testsuite/gas/elf/dwarf2-6.d
@@ -2,7 +2,7 @@
#readelf: -wlL
#name: DWARF2 6
# These targets either do not support or do not evaluate the subtraction of symbols at assembly time.
-#not-target: am3*-* avr-* cr16-* crx-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* xtensa-*
Raw dump of debug contents of section .debug_line:
diff --git a/gas/testsuite/gas/elf/dwarf2-7.d b/gas/testsuite/gas/elf/dwarf2-7.d
index 222edf0622..fec6cf861f 100644
--- a/gas/testsuite/gas/elf/dwarf2-7.d
+++ b/gas/testsuite/gas/elf/dwarf2-7.d
@@ -4,7 +4,7 @@
# The am33 avr cr16 crx ft32 mn10 msp430 nds32 pru rl78 and xtensa targets do not evaluate the subtraction of symbols at assembly time.
# The riscv targets do not support the subtraction of symbols.
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
+#notarget: am3*-* avr-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* pru-* riscv*-* rl78-* tile*-* xtensa-*
Hex dump of section '\.rodata':
0x00000000 01 *.*
diff --git a/gas/testsuite/gas/elf/dwarf2-8.d b/gas/testsuite/gas/elf/dwarf2-8.d
index 455079d951..a82f5dbaa3 100644
--- a/gas/testsuite/gas/elf/dwarf2-8.d
+++ b/gas/testsuite/gas/elf/dwarf2-8.d
@@ -2,4 +2,4 @@
#name: DWARF2 8
#error-output: dwarf2-8.l
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: tile*-*
+#notarget: tile*-*
diff --git a/gas/testsuite/gas/elf/dwarf2-9.d b/gas/testsuite/gas/elf/dwarf2-9.d
index ebf11cbb32..3cb9b960d7 100644
--- a/gas/testsuite/gas/elf/dwarf2-9.d
+++ b/gas/testsuite/gas/elf/dwarf2-9.d
@@ -2,4 +2,4 @@
#name: DWARF2 9
#error-output: dwarf2-9.l
# The tile targets require 8-byte instructions, but the test only simulates 4-byte instructions.
-#not-target: tile*-*
+#notarget: tile*-*
diff --git a/gas/testsuite/gas/elf/group0c.d b/gas/testsuite/gas/elf/group0c.d
index 13932c5281..9564f65ced 100644
--- a/gas/testsuite/gas/elf/group0c.d
+++ b/gas/testsuite/gas/elf/group0c.d
@@ -1,7 +1,7 @@
#readelf: -sW
#name: group section name
#source: group0.s
-#not-target: *-*-solaris*
+#notarget: *-*-solaris*
#...
.*NOTYPE[ ]+LOCAL[ ]+DEFAULT[ ]+[0-9]+[ ]+\.foo_group
diff --git a/gas/testsuite/gas/elf/group1a.d b/gas/testsuite/gas/elf/group1a.d
index d264766f7b..0f9f3e93d6 100644
--- a/gas/testsuite/gas/elf/group1a.d
+++ b/gas/testsuite/gas/elf/group1a.d
@@ -2,7 +2,7 @@
#name: group section with multiple sections of same name
#source: group1.s
# The RX port uses non-standard section names.
-#not-target: rx-*
+#notarget: rx-*
#...
[ ]*\[.*\][ ]+\.group[ ]+GROUP.*
diff --git a/gas/testsuite/gas/elf/group2.d b/gas/testsuite/gas/elf/group2.d
index 1cea13c97e..269f944e74 100644
--- a/gas/testsuite/gas/elf/group2.d
+++ b/gas/testsuite/gas/elf/group2.d
@@ -2,7 +2,7 @@
#name: debug info in group section and non-group section with same name
#source: group2.s
# The RX port uses non-standard section names.
-#not-target: rx-*
+#notarget: rx-*
#...
[ ]*\[.*\][ ]+\.group[ ]+GROUP.*
diff --git a/gas/testsuite/gas/elf/groupautoa.d b/gas/testsuite/gas/elf/groupautoa.d
index fd1f3fce41..0297a68c9b 100644
--- a/gas/testsuite/gas/elf/groupautoa.d
+++ b/gas/testsuite/gas/elf/groupautoa.d
@@ -2,7 +2,7 @@
#name: automatic section group a
#source: groupauto.s
# The RX port uses non-standard section names.
-#not-target: rx-*
+#notarget: rx-*
#...
[ ]*\[.*\][ ]+\.group[ ]+GROUP.*
diff --git a/gas/testsuite/gas/elf/ifunc-1.d b/gas/testsuite/gas/elf/ifunc-1.d
index 112c896885..5b2657b088 100644
--- a/gas/testsuite/gas/elf/ifunc-1.d
+++ b/gas/testsuite/gas/elf/ifunc-1.d
@@ -1,6 +1,6 @@
#readelf: -s
#name: .set with IFUNC
-#not-target: alpha*
+#notarget: alpha*
#...
[ ]+[0-9]+:[ ]+[0-9a-f]+[ ]+[0-9]+[ ]+IFUNC[ ]+GLOBAL[ ]+DEFAULT[ ]+[1-9] __GI_foo
diff --git a/gas/testsuite/gas/elf/section11.d b/gas/testsuite/gas/elf/section11.d
index a92ad5acf7..4cada2a7fe 100644
--- a/gas/testsuite/gas/elf/section11.d
+++ b/gas/testsuite/gas/elf/section11.d
@@ -5,7 +5,7 @@
#skip: rx-*-*
# RISC-V handles alignment via linker relaxation, so object files don't have
# the expected alignment.
-#not-target: riscv*-*-*
+#notarget: riscv*-*-*
#...
\[ .\] .text[ ]+PROGBITS[ ]+0+00 0+[0-9a-f]+ 0+0(1|4|5) 00 AX 0 0 16
diff --git a/gas/testsuite/gas/elf/section4.d b/gas/testsuite/gas/elf/section4.d
index dcd9cf5c5b..fbeb0c7d59 100644
--- a/gas/testsuite/gas/elf/section4.d
+++ b/gas/testsuite/gas/elf/section4.d
@@ -1,7 +1,7 @@
#readelf: --sections
#name: label arithmetic with multiple same-name sections
# The RX port uses non-standard section names.
-#not-target: rx-*
+#notarget: rx-*
#...
[ ]*\[.*\][ ]+\.group[ ]+GROUP.*
diff --git a/gas/testsuite/gas/elf/section7.d b/gas/testsuite/gas/elf/section7.d
index 777b5517b5..c424a0fdfb 100644
--- a/gas/testsuite/gas/elf/section7.d
+++ b/gas/testsuite/gas/elf/section7.d
@@ -2,7 +2,7 @@
#name: elf section7
# .pushsection always creates the named section, but the
# test harness translates ".text" into "P" for the RX...
-#not-target: rx-*
+#notarget: rx-*
.*: +file format .*
diff --git a/gas/testsuite/gas/elf/syms.d b/gas/testsuite/gas/elf/syms.d
index 40f7706d56..011075f938 100644
--- a/gas/testsuite/gas/elf/syms.d
+++ b/gas/testsuite/gas/elf/syms.d
@@ -1,7 +1,7 @@
#readelf: -S -s -p .strtab
#name: Multibyte symbol names
# The following targets use an unusual .set syntax...
-#not-target: alpha*-*-* h8300-*-*
+#notarget: alpha*-*-* h8300-*-*
#...
Section Headers:
diff --git a/gas/testsuite/gas/elf/symver.d b/gas/testsuite/gas/elf/symver.d
index 971eea9d46..2c4d6ed058 100644
--- a/gas/testsuite/gas/elf/symver.d
+++ b/gas/testsuite/gas/elf/symver.d
@@ -1,6 +1,6 @@
#objdump: --syms
#name: ELF symbol versioning
-#not-target: hppa64*-*-hpux*
+#notarget: hppa64*-*-hpux*
#
# The #... and #pass are there to match extra symbols inserted by
# some toolchains, eg the mips-elf port will add .reginfo and .ptrd
diff --git a/gas/testsuite/gas/i386/iamcu-1.d b/gas/testsuite/gas/i386/iamcu-1.d
index c4d22bf00d..2b1df5de4b 100644
--- a/gas/testsuite/gas/i386/iamcu-1.d
+++ b/gas/testsuite/gas/i386/iamcu-1.d
@@ -1,6 +1,6 @@
#as: -J -march=iamcu
#objdump: -dw
-#not-target: *-*-nacl*
+#notarget: *-*-nacl*
.*: +file format elf32-iamcu.*
diff --git a/gas/testsuite/gas/i386/iamcu-2.d b/gas/testsuite/gas/i386/iamcu-2.d
index f3f3bfdb8c..50c48e7e05 100644
--- a/gas/testsuite/gas/i386/iamcu-2.d
+++ b/gas/testsuite/gas/i386/iamcu-2.d
@@ -1,6 +1,6 @@
#as: -J -march=iamcu
#objdump: -dw
-#not-target: *-*-nacl*
+#notarget: *-*-nacl*
.*: +file format elf32-iamcu.*
diff --git a/gas/testsuite/gas/i386/iamcu-3.d b/gas/testsuite/gas/i386/iamcu-3.d
index 291f6016a0..3b4dfd9077 100644
--- a/gas/testsuite/gas/i386/iamcu-3.d
+++ b/gas/testsuite/gas/i386/iamcu-3.d
@@ -1,6 +1,6 @@
#as: -J -march=iamcu+nop
#objdump: -dw
-#not-target: *-*-nacl*
+#notarget: *-*-nacl*
.*: +file format elf32-iamcu.*
diff --git a/gas/testsuite/gas/i386/iamcu-4.d b/gas/testsuite/gas/i386/iamcu-4.d
index afd8a8e0c6..7ea1bb6823 100644
--- a/gas/testsuite/gas/i386/iamcu-4.d
+++ b/gas/testsuite/gas/i386/iamcu-4.d
@@ -1,6 +1,6 @@
#as: -J -march=iamcu+sse2+387
#objdump: -dw
-#not-target: *-*-nacl*
+#notarget: *-*-nacl*
.*: +file format elf32-iamcu.*
diff --git a/gas/testsuite/gas/i386/iamcu-5.d b/gas/testsuite/gas/i386/iamcu-5.d
index dde69777b8..af3ecd7251 100644
--- a/gas/testsuite/gas/i386/iamcu-5.d
+++ b/gas/testsuite/gas/i386/iamcu-5.d
@@ -1,6 +1,6 @@
#as: -J -march=iamcu -I${srcdir}/$subdir
#objdump: -dw
-#not-target: *-*-nacl*
+#notarget: *-*-nacl*
.*: +file format elf32-iamcu.*
diff --git a/gas/testsuite/gas/i386/ilp32/rex.d b/gas/testsuite/gas/i386/ilp32/rex.d
index 0646ab4041..d8bc1b528c 100644
--- a/gas/testsuite/gas/i386/ilp32/rex.d
+++ b/gas/testsuite/gas/i386/ilp32/rex.d
@@ -1,7 +1,7 @@
#source: ../rex.s
#objdump: -dw
#name: x86-64 (ILP32) manual rex prefix use
-#not-target: x86_64-*-elf*
+#notarget: x86_64-*-elf*
.*: +file format .*
diff --git a/gas/testsuite/gas/i386/k1om.d b/gas/testsuite/gas/i386/k1om.d
index 1a796d8f11..3a7c48c387 100644
--- a/gas/testsuite/gas/i386/k1om.d
+++ b/gas/testsuite/gas/i386/k1om.d
@@ -2,7 +2,7 @@
#as: -J -march=k1om
#objdump: -dw
#name: k1om
-#not-target: *-*-nacl*
+#notarget: *-*-nacl*
.*: +file format elf64-k1om.*
diff --git a/gas/testsuite/gas/i386/l1om.d b/gas/testsuite/gas/i386/l1om.d
index 6d2fc57e08..fe068385d3 100644
--- a/gas/testsuite/gas/i386/l1om.d
+++ b/gas/testsuite/gas/i386/l1om.d
@@ -2,7 +2,7 @@
#as: -J -march=l1om
#objdump: -dw --insn-width=7
#name: l1om
-#not-target: *-*-nacl*
+#notarget: *-*-nacl*
.*: +file format elf64-l1om.*
diff --git a/gas/testsuite/gas/i386/rex.d b/gas/testsuite/gas/i386/rex.d
index 5af478f1d6..22c0c7f30a 100644
--- a/gas/testsuite/gas/i386/rex.d
+++ b/gas/testsuite/gas/i386/rex.d
@@ -1,6 +1,6 @@
#objdump: -dw
#name: x86-64 manual rex prefix use
-#not-target: x86_64-*-elf*
+#notarget: x86_64-*-elf*
.*: +file format .*
diff --git a/gas/testsuite/gas/mach-o/sections-3.d b/gas/testsuite/gas/mach-o/sections-3.d
index 9d1daf4d94..ea4f4e8fe7 100644
--- a/gas/testsuite/gas/mach-o/sections-3.d
+++ b/gas/testsuite/gas/mach-o/sections-3.d
@@ -1,5 +1,5 @@
#objdump: -P section
-#not-target: x86_64-*-darwin*
+#notarget: x86_64-*-darwin*
.*: +file format mach-o.*
#...
Section: __symbol_stub __TEXT.*\(bfdname: .symbol_stub\)
diff --git a/gas/testsuite/gas/macros/irp.d b/gas/testsuite/gas/macros/irp.d
index 77737929b4..6a8d0daaae 100644
--- a/gas/testsuite/gas/macros/irp.d
+++ b/gas/testsuite/gas/macros/irp.d
@@ -1,7 +1,7 @@
#objdump: -r
#name: macro irp
#darwin (mach-o) reverses relocs.
-#not-target: *-*-darwin* nds32*-*-*
+#notarget: *-*-darwin* nds32*-*-*
.*: +file format .*
diff --git a/gas/testsuite/gas/macros/repeat.d b/gas/testsuite/gas/macros/repeat.d
index 1e6e42220f..568dd8f906 100644
--- a/gas/testsuite/gas/macros/repeat.d
+++ b/gas/testsuite/gas/macros/repeat.d
@@ -1,7 +1,7 @@
#objdump: -r
#name: nested irp/irpc/rept
# darwin (mach-o) reverse relocs.
-#not-target: *-*-darwin*
+#notarget: *-*-darwin*
.*: +file format .*
diff --git a/gas/testsuite/gas/macros/rept.d b/gas/testsuite/gas/macros/rept.d
index 92d64109b8..b38c70afea 100644
--- a/gas/testsuite/gas/macros/rept.d
+++ b/gas/testsuite/gas/macros/rept.d
@@ -1,7 +1,7 @@
#objdump: -r
#name: macro rept
#darwin (mach-o) reverses relocs.
-#not-target: *-*-darwin* nds32*-*-*
+#notarget: *-*-darwin* nds32*-*-*
.*: +file format .*
diff --git a/gas/testsuite/gas/macros/semi.d b/gas/testsuite/gas/macros/semi.d
index 216a3ebafe..66c452adab 100644
--- a/gas/testsuite/gas/macros/semi.d
+++ b/gas/testsuite/gas/macros/semi.d
@@ -1,6 +1,6 @@
#objdump: -s -j .text
#name: semi
-#not-target: m32c-*
+#notarget: m32c-*
.*: .*
diff --git a/gas/testsuite/gas/macros/test2.d b/gas/testsuite/gas/macros/test2.d
index e5041cd1ff..bb9652420e 100644
--- a/gas/testsuite/gas/macros/test2.d
+++ b/gas/testsuite/gas/macros/test2.d
@@ -1,7 +1,7 @@
#objdump: -r
#name: macro test 2
# darwin(mach-o) reverses the order of relocs.
-#not-target: *-*-darwin*
+#notarget: *-*-darwin*
.*: +file format .*
diff --git a/gas/testsuite/gas/macros/test3.d b/gas/testsuite/gas/macros/test3.d
index afd47fa277..71949234d8 100644
--- a/gas/testsuite/gas/macros/test3.d
+++ b/gas/testsuite/gas/macros/test3.d
@@ -1,6 +1,6 @@
#objdump: -r
#name: macro test 3
-#not-target: nds32*-*-*
+#notarget: nds32*-*-*
.*: +file format .*
diff --git a/gas/testsuite/gas/macros/vararg.d b/gas/testsuite/gas/macros/vararg.d
index 94c1511260..fb5f25d220 100644
--- a/gas/testsuite/gas/macros/vararg.d
+++ b/gas/testsuite/gas/macros/vararg.d
@@ -1,7 +1,7 @@
#objdump: -r
#name: macro vararg
# darwin (mach-o) reverses relocs.
-#not-target: *-*-darwin*
+#notarget: *-*-darwin*
.*: +file format .*
diff --git a/gas/testsuite/gas/mips/jal-svr4pic-local.d b/gas/testsuite/gas/mips/jal-svr4pic-local.d
index ce3eec85d4..28679552c8 100644
--- a/gas/testsuite/gas/mips/jal-svr4pic-local.d
+++ b/gas/testsuite/gas/mips/jal-svr4pic-local.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS JALR relocation against local symbol
#as: -32
-#not-target: *-*-irix*
+#notarget: *-*-irix*
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/micromips@jal-svr4pic-local.d b/gas/testsuite/gas/mips/micromips@jal-svr4pic-local.d
index 9d50e783d9..cfd22ec6a5 100644
--- a/gas/testsuite/gas/mips/micromips@jal-svr4pic-local.d
+++ b/gas/testsuite/gas/mips/micromips@jal-svr4pic-local.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS JALR relocation against local symbol
#as: -32
-#not-target: *-*-irix*
+#notarget: *-*-irix*
#source: jal-svr4pic-local.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips1@jal-svr4pic-local.d b/gas/testsuite/gas/mips/mips1@jal-svr4pic-local.d
index 4054bfc198..0cc4474121 100644
--- a/gas/testsuite/gas/mips/mips1@jal-svr4pic-local.d
+++ b/gas/testsuite/gas/mips/mips1@jal-svr4pic-local.d
@@ -1,7 +1,7 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS JALR relocation against local symbol
#as: -32
-#not-target: *-*-irix*
+#notarget: *-*-irix*
#source: jal-svr4pic-local.s
.*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/r3000@jal-svr4pic-local.d b/gas/testsuite/gas/mips/r3000@jal-svr4pic-local.d
index a2bbf1b1cd..00d3b7ae13 100644
--- a/gas/testsuite/gas/mips/r3000@jal-svr4pic-local.d
+++ b/gas/testsuite/gas/mips/r3000@jal-svr4pic-local.d
@@ -1,6 +1,6 @@
#objdump: -dr --prefix-addresses --show-raw-insn
#name: MIPS JALR relocation against local symbol
#as: -32
-#not-target: *-*-irix*
+#notarget: *-*-irix*
#source: jal-svr4pic-local.s
#dump: mips1@jal-svr4pic-local.d
diff --git a/gas/testsuite/gas/ppc/machine.d b/gas/testsuite/gas/ppc/machine.d
index b8ec7a3b37..01430879a9 100644
--- a/gas/testsuite/gas/ppc/machine.d
+++ b/gas/testsuite/gas/ppc/machine.d
@@ -1,6 +1,6 @@
#objdump: -s -j .text
#name: PowerPC .machine test
-#not-target: *-*-pe *-*-winnt* *-*-cygwin*
+#notarget: *-*-pe *-*-winnt* *-*-cygwin*
.*
diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index b7cc06edef..e040e947a9 100644
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -391,7 +391,7 @@ proc run_dump_tests { testcases {extra_options {}} } {
# of them, the test will be run, otherwise it will be marked
# unsupported.
#
-# not-target: GLOB|PROC ...
+# notarget: GLOB|PROC ...
# Do not run this test on a specified list of targets. Again, each
# glob in the space-separated list is passed to "istarget" and each
# proc is called as a TCL procedure, and the test is run if it
@@ -399,8 +399,8 @@ proc run_dump_tests { testcases {extra_options {}} } {
# unsupported.
#
# skip: GLOB|PROC ...
-# not-skip: GLOB|PROC ...
-# These are exactly the same as "not-target" and "target",
+# noskip: GLOB|PROC ...
+# These are exactly the same as "notarget" and "target",
# respectively, except that they do nothing at all if the check
# fails. They should only be used in groups, to construct a single
# test which is run on all targets but with variant options or
@@ -474,9 +474,9 @@ proc run_dump_test { name {extra_options {}} } {
set opts(error-output) {}
set opts(warning) {}
set opts(target) {}
- set opts(not-target) {}
+ set opts(notarget) {}
set opts(skip) {}
- set opts(not-skip) {}
+ set opts(noskip) {}
set opts(xfail) {}
set opts(section-subst) {}
@@ -572,11 +572,11 @@ proc run_dump_test { name {extra_options {}} } {
}
# Handle skipping the test on specified targets.
- # You can have both skip/not-skip and target/not-target, but you can't
- # have both skip and not-skip, or target and not-target, in the same file.
+ # You can have both skip/noskip and target/notarget, but you can't
+ # have both skip and noskip, or target and notarget, in the same file.
if { $opts(skip) != "" } then {
- if { $opts(not-skip) != "" } then {
- perror "$testname: mixing skip and not-skip directives is invalid"
+ if { $opts(noskip) != "" } then {
+ perror "$testname: mixing skip and noskip directives is invalid"
unresolved $testname
return
}
@@ -584,9 +584,9 @@ proc run_dump_test { name {extra_options {}} } {
if {[match_target $glob]} { return }
}
}
- if { $opts(not-skip) != "" } then {
+ if { $opts(noskip) != "" } then {
set skip 1
- foreach glob $opts(not-skip) {
+ foreach glob $opts(noskip) {
if {[match_target $glob]} {
set skip 0
break
@@ -595,8 +595,8 @@ proc run_dump_test { name {extra_options {}} } {
if {$skip} { return }
}
if { $opts(target) != "" } then {
- if { $opts(not-target) != "" } then {
- perror "$testname: mixing target and not-target directives is invalid"
+ if { $opts(notarget) != "" } then {
+ perror "$testname: mixing target and notarget directives is invalid"
unresolved $testname
return
}
@@ -612,8 +612,8 @@ proc run_dump_test { name {extra_options {}} } {
return
}
}
- if { $opts(not-target) != "" } then {
- foreach glob $opts(not-target) {
+ if { $opts(notarget) != "" } then {
+ foreach glob $opts(notarget) {
if {[match_target $glob]} {
unsupported $testname
return
--
Alan Modra
Australia Development Lab, IBM