aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog46
-rw-r--r--ld/testsuite/ld-elf/attributes.d2
-rw-r--r--ld/testsuite/ld-elf/compress1a.d2
-rw-r--r--ld/testsuite/ld-elf/compressed1a.d2
-rw-r--r--ld/testsuite/ld-elf/compressed1d.d3
-rw-r--r--ld/testsuite/ld-elf/compressed1e.d2
-rw-r--r--ld/testsuite/ld-elf/eh5.d2
-rw-r--r--ld/testsuite/ld-elf/group8a.d5
-rw-r--r--ld/testsuite/ld-elf/hash.d2
-rw-r--r--ld/testsuite/ld-elf/linkonce2.d2
-rw-r--r--ld/testsuite/ld-elf/orphan-10.d3
-rw-r--r--ld/testsuite/ld-elf/orphan-11.d1
-rw-r--r--ld/testsuite/ld-elf/orphan-12.d1
-rw-r--r--ld/testsuite/ld-elf/orphan-9.d3
-rw-r--r--ld/testsuite/ld-elf/overlay.d2
-rw-r--r--ld/testsuite/ld-elf/pr14926.d2
-rw-r--r--ld/testsuite/ld-elf/pr17550a.d5
-rw-r--r--ld/testsuite/ld-elf/pr17550b.d5
-rw-r--r--ld/testsuite/ld-elf/pr17550c.d6
-rw-r--r--ld/testsuite/ld-elf/pr17550d.d2
-rw-r--r--ld/testsuite/ld-elf/pr19162.d3
-rw-r--r--ld/testsuite/ld-elf/pr19539.d2
-rw-r--r--ld/testsuite/ld-elf/pr21884.d3
-rw-r--r--ld/testsuite/ld-elf/pr22319.d2
-rw-r--r--ld/testsuite/ld-gc/pr19167.d2
-rw-r--r--ld/testsuite/ld-gc/pr20022.d2
-rw-r--r--ld/testsuite/ld-gc/start.d2
-rw-r--r--ld/testsuite/ld-gc/stop.d1
-rw-r--r--ld/testsuite/ld-ifunc/pr17154-x86-64-now.d1
-rw-r--r--ld/testsuite/ld-misc/defsym1.d2
-rw-r--r--ld/testsuite/ld-pe/pr19803.d2
-rw-r--r--ld/testsuite/ld-scripts/assign-loc.d2
-rw-r--r--ld/testsuite/ld-scripts/defined4.d2
-rw-r--r--ld/testsuite/ld-scripts/empty-address-1.d2
-rw-r--r--ld/testsuite/ld-scripts/empty-address-2a.d2
-rw-r--r--ld/testsuite/ld-scripts/empty-address-2b.d2
-rw-r--r--ld/testsuite/ld-scripts/empty-address-3a.d2
-rw-r--r--ld/testsuite/ld-scripts/empty-address-3b.d2
-rw-r--r--ld/testsuite/ld-scripts/fill.d17
-rw-r--r--ld/testsuite/ld-scripts/fill16.d10
-rw-r--r--ld/testsuite/ld-scripts/pr14962-2.d2
-rw-r--r--ld/testsuite/ld-scripts/pr14962.d2
-rw-r--r--ld/testsuite/ld-scripts/section-match-1.d2
-rw-r--r--ld/testsuite/ld-unique/pr21529.d2
44 files changed, 98 insertions, 71 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9d82fc1..c69964b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,49 @@
+2018-07-10 Alan Modra <amodra@gmail.com>
+
+ * testsuite/ld-elf/attributes.d: Use xfail rather than notarget.
+ * testsuite/ld-elf/hash.d: Likewise.
+ * testsuite/ld-elf/orphan-10.d: Likewise.
+ * testsuite/ld-elf/overlay.d: Likewise.
+ * testsuite/ld-elf/pr14926.d: Likewise.
+ * testsuite/ld-elf/pr17550d.d: Likewise.
+ * testsuite/ld-elf/pr19539.d: Likewise.
+ * testsuite/ld-elf/pr22319.d: Likewise.
+ * testsuite/ld-misc/defsym1.d: Likewise.
+ * testsuite/ld-pe/pr19803.d: Likewise.
+ * testsuite/ld-scripts/assign-loc.d: Likewise.
+ * testsuite/ld-scripts/defined4.d: Likewise.
+ * testsuite/ld-scripts/empty-address-1.d: Likewise.
+ * testsuite/ld-scripts/empty-address-2a.d: Likewise.
+ * testsuite/ld-scripts/empty-address-2b.d: Likewise.
+ * testsuite/ld-scripts/fill.d: Likewise.
+ * testsuite/ld-scripts/fill16.d: Likewise.
+ * testsuite/ld-scripts/pr14962.d: Likewise.
+ * testsuite/ld-scripts/pr14962-2.d: Likewise.
+ * testsuite/ld-unique/pr21529.d: Likewise.
+ * testsuite/ld-elf/compress1a.d: Likewise, and adjust targets.
+ * testsuite/ld-elf/compressed1a.d: Likewise.
+ * testsuite/ld-elf/compressed1d.d: Likewise.
+ * testsuite/ld-elf/compressed1e.d: Likewise.
+ * testsuite/ld-elf/eh5.d: Likewise.
+ * testsuite/ld-elf/group8a.d: Likewise.
+ * testsuite/ld-elf/linkonce2.d: Likewise.
+ * testsuite/ld-elf/orphan-9.d: Likewise.
+ * testsuite/ld-elf/pr17550a.d: Likewise.
+ * testsuite/ld-elf/pr17550b.d: Likewise.
+ * testsuite/ld-elf/pr17550c.d: Likewise.
+ * testsuite/ld-elf/pr19162.d: Likewise.
+ * testsuite/ld-elf/pr21884.d: Likewise.
+ * testsuite/ld-gc/pr19167.d: Likewise.
+ * testsuite/ld-gc/pr20022.d: Likewise.
+ * testsuite/ld-gc/start.d: Likewise.
+ * testsuite/ld-elf/orphan-11.d: Delete notarget.
+ * testsuite/ld-elf/orphan-12.d: Likewise.
+ * testsuite/ld-gc/stop.d: Likewise.
+ * testsuite/ld-scripts/empty-address-3a.d: Likewise.
+ * testsuite/ld-scripts/empty-address-3b.d: Likewise.
+ * testsuite/ld-ifunc/pr17154-x86-64-now.d: Delete duplicate notarget.
+ * testsuite/ld-scripts/section-match-1.d: Comment fix.
+
2018-07-10 Maciej W. Rozycki <macro@mips.com>
* testsuite/ld-mips-elf/elf-rel-got-n64.d: Rename to...
diff --git a/ld/testsuite/ld-elf/attributes.d b/ld/testsuite/ld-elf/attributes.d
index 79afd14..78d896c 100644
--- a/ld/testsuite/ld-elf/attributes.d
+++ b/ld/testsuite/ld-elf/attributes.d
@@ -1,7 +1,7 @@
#name: Symbol flags copy
#ld: -T attributes.ld
#objdump: -t
-#notarget: pj-*-* dlx-*-* d30v-*-*
+#xfail: pj-*-* dlx-*-* d30v-*-*
#...
0+0000000 g F .text 0+0000000 __start
diff --git a/ld/testsuite/ld-elf/compress1a.d b/ld/testsuite/ld-elf/compress1a.d
index a8eac40..0d5b68e 100644
--- a/ld/testsuite/ld-elf/compress1a.d
+++ b/ld/testsuite/ld-elf/compress1a.d
@@ -2,7 +2,7 @@
#as: --compress-debug-sections
#ld: -e func_cu2
#readelf: -S --wide
-#notarget: alpha-*
+#xfail: alpha-*-*ecoff
#failif
#...
diff --git a/ld/testsuite/ld-elf/compressed1a.d b/ld/testsuite/ld-elf/compressed1a.d
index 653c203..3a5572e 100644
--- a/ld/testsuite/ld-elf/compressed1a.d
+++ b/ld/testsuite/ld-elf/compressed1a.d
@@ -2,7 +2,7 @@
#as: --compress-debug-sections=zlib-gabi
#ld: -e func_cu2
#readelf: -t
-#notarget: alpha-*
+#xfail: alpha-*-*ecoff
#failif
#...
diff --git a/ld/testsuite/ld-elf/compressed1d.d b/ld/testsuite/ld-elf/compressed1d.d
index 53406a2..95611c3 100644
--- a/ld/testsuite/ld-elf/compressed1d.d
+++ b/ld/testsuite/ld-elf/compressed1d.d
@@ -2,7 +2,8 @@
#as: --compress-debug-sections=none
#ld: -r --compress-debug-sections=zlib-gnu
#readelf: -SW
-#notarget: d30v-*-* dlx-*-* fr30-*-* frv-*-* ft32-*-* iq2000-*-* mn10200-*-* moxie-*-* msp430-*-* mt-*-* or1k-*-* pj-*-* riscv*-*-*
+#xfail: d30v-*-* dlx-*-* fr30-*-* frv-*-elf ft32-*-* iq2000-*-*
+#xfail: mn10200-*-* moxie-*-* msp430-*-* mt-*-* pj-*-* riscv*-*-*
# Not all ELF targets use the elf.em emulation...
# RISC-V has linker relaxations that delete code, so text label subtractions
# do not get resolved at assembly time, which results in a compressed section.
diff --git a/ld/testsuite/ld-elf/compressed1e.d b/ld/testsuite/ld-elf/compressed1e.d
index 7d9f13f..9b54618 100644
--- a/ld/testsuite/ld-elf/compressed1e.d
+++ b/ld/testsuite/ld-elf/compressed1e.d
@@ -3,7 +3,7 @@
#ld: -shared --compress-debug-sections=zlib-gnu
#readelf: -SW
#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
-#notarget: cris*-*-elf frv-*-*
+#xfail: cris*-*-elf frv-*-elf
#failif
#...
diff --git a/ld/testsuite/ld-elf/eh5.d b/ld/testsuite/ld-elf/eh5.d
index 1a5148c..0d30ee3 100644
--- a/ld/testsuite/ld-elf/eh5.d
+++ b/ld/testsuite/ld-elf/eh5.d
@@ -4,7 +4,7 @@
#ld:
#readelf: -wf
#target: cfi
-#notarget: alpha* hppa64* tile* visium*
+#xfail: alpha-*-*ecoff hppa64-*-* tile*-*-* visium-*-*
Contents of the .eh_frame section:
diff --git a/ld/testsuite/ld-elf/group8a.d b/ld/testsuite/ld-elf/group8a.d
index 7df205a..58283c9 100644
--- a/ld/testsuite/ld-elf/group8a.d
+++ b/ld/testsuite/ld-elf/group8a.d
@@ -1,9 +1,8 @@
#source: group8.s
#ld: -r --gc-sections --entry foo
#readelf: -g --wide
-#notarget: d30v-*-* dlx-*-* pj*-*-* pru-*-*
-#notarget: hppa64-*-* ia64-*-* mep-*-* mn10200-*-*
-#xfail: cr16-*-* crx-*-*
+#xfail: cr16-*-* crx-*-* d30v-*-* dlx-*-* hppa64-*-*
+#xfail: mep-*-* mn10200-*-* pj*-*-* pru-*-*
# generic linker targets don't support --gc-sections, nor do a bunch of others
# cr16 and crx use non-standard scripts with memory regions, which don't play
# well with unique group sections under ld -r.
diff --git a/ld/testsuite/ld-elf/hash.d b/ld/testsuite/ld-elf/hash.d
index d31168c..593d487 100644
--- a/ld/testsuite/ld-elf/hash.d
+++ b/ld/testsuite/ld-elf/hash.d
@@ -2,7 +2,7 @@
#readelf: -d -s -D
#ld: -shared --hash-style=gnu
#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
-#notarget: mips*-*-*
+#xfail: mips*-*-*
#...
+0x[0-9a-z]+ +\(GNU_HASH\) +0x[0-9a-z]+
diff --git a/ld/testsuite/ld-elf/linkonce2.d b/ld/testsuite/ld-elf/linkonce2.d
index ea16ce1..5d97a18 100644
--- a/ld/testsuite/ld-elf/linkonce2.d
+++ b/ld/testsuite/ld-elf/linkonce2.d
@@ -2,7 +2,7 @@
#source: linkonce1b.s
#ld: -emit-relocs
#objdump: -r
-#notarget: arc*-*-* d30v-*-* dlx-*-* pj*-*-*
+#xfail: d30v-*-* dlx-*-* pj*-*-*
# generic elf targets don't emit relocs
.*: file format .*
diff --git a/ld/testsuite/ld-elf/orphan-10.d b/ld/testsuite/ld-elf/orphan-10.d
index a5cf6d9..90ddb6b 100644
--- a/ld/testsuite/ld-elf/orphan-10.d
+++ b/ld/testsuite/ld-elf/orphan-10.d
@@ -1,7 +1,8 @@
#source: orphan-10.s
#ld: -N -T orphan-9.ld
#objdump: -h
-#notarget: d30v-* dlx-* fr30-* frv-* ft32-* iq2000-* mn10200-* moxie-* ms1-* msp430-* mt-* pj-*
+#xfail: d30v-* dlx-* fr30-* frv-*-elf ft32-* iq2000-*
+#xfail: mn10200-* moxie-* ms1-* msp430-* mt-* pj-*
#...
. \.text 0+(08|10) [0-9a-f]+ 0+200 .*
diff --git a/ld/testsuite/ld-elf/orphan-11.d b/ld/testsuite/ld-elf/orphan-11.d
index 15eb5fb..a9936f2 100644
--- a/ld/testsuite/ld-elf/orphan-11.d
+++ b/ld/testsuite/ld-elf/orphan-11.d
@@ -1,7 +1,6 @@
#source: orphan-11.s
#ld: -T orphan-11.ld --orphan-handling=error
#objdump: -wh
-#notarget: d30v-* dlx-* fr30-* frv-* ft32-* iq2000-* mn10200-* moxie-* ms1-* msp430-* mt-* pj-*
#...
. \.text .*
diff --git a/ld/testsuite/ld-elf/orphan-12.d b/ld/testsuite/ld-elf/orphan-12.d
index ff75345..b0d4c2f 100644
--- a/ld/testsuite/ld-elf/orphan-12.d
+++ b/ld/testsuite/ld-elf/orphan-12.d
@@ -1,7 +1,6 @@
#source: orphan-12.s
#ld: -T orphan-11.ld --strip-debug --orphan-handling=error
#objdump: -wh
-#notarget: d30v-* dlx-* fr30-* frv-* ft32-* iq2000-* mn10200-* moxie-* ms1-* msp430-* mt-* pj-*
#...
. \.text .*
diff --git a/ld/testsuite/ld-elf/orphan-9.d b/ld/testsuite/ld-elf/orphan-9.d
index 637e8c5..1c6d29c 100644
--- a/ld/testsuite/ld-elf/orphan-9.d
+++ b/ld/testsuite/ld-elf/orphan-9.d
@@ -1,7 +1,8 @@
#source: orphan-9.s
#ld: -N -T orphan-9.ld
#objdump: -h
-#notarget: d30v-* dlx-* fr30-* frv-* ft32-* iq2000-* mn10200-* moxie-* ms1-* msp430-* mt-* pj-*
+#xfail: d30v-* dlx-* fr30-* frv-*-elf ft32-* iq2000-*
+#xfail: mn10200-* moxie-* ms1-* msp430-* mt-* pj-*
#...
. \.text 0+(08|10) [0-9a-f]+ 0+200 .*
diff --git a/ld/testsuite/ld-elf/overlay.d b/ld/testsuite/ld-elf/overlay.d
index c4409ae..a258eda 100644
--- a/ld/testsuite/ld-elf/overlay.d
+++ b/ld/testsuite/ld-elf/overlay.d
@@ -1,6 +1,6 @@
# ld: -T overlay.t -u __load_start_text1 -u __load_start_text2 -u __load_stop_text1 -u __load_stop_text2
#readelf: -s
-#notarget: spu-*-*
+#xfail: spu-*-*
# The SPU adds its own LOAD segments, out of order, at the start of the program header table.
#...
diff --git a/ld/testsuite/ld-elf/pr14926.d b/ld/testsuite/ld-elf/pr14926.d
index 4e0a8da..b7671e5 100644
--- a/ld/testsuite/ld-elf/pr14926.d
+++ b/ld/testsuite/ld-elf/pr14926.d
@@ -1,6 +1,6 @@
#ld: -Ttext=0x60
#readelf: -S --wide
-#notarget: d10v-* m68hc1*-* msp*-* visium-* xgate-* xstormy*-* pru-*-* s12z-*-*
+#xfail: d10v-* m68hc1*-* msp*-* pru-*-* s12z-*-* visium-* xgate-* xstormy*-*
# the above targets use memory regions that don't allow 0x60 for .text
#...
diff --git a/ld/testsuite/ld-elf/pr17550a.d b/ld/testsuite/ld-elf/pr17550a.d
index 47caa8a..a6f2a2b 100644
--- a/ld/testsuite/ld-elf/pr17550a.d
+++ b/ld/testsuite/ld-elf/pr17550a.d
@@ -2,11 +2,10 @@
#source: pr17550-2.s
#ld: -r
#readelf: -s --wide
-#notarget: alpha-*-* cr16-*-* crx-*-* d30v-*-* dlx-*-* pj*-*-*
+#xfail: alpha-*-* cr16-*-* crx-*-*
# Disabled on alpha because alpha has a different .set directive.
# cr16 and crx use non-standard scripts with memory regions, which don't
-# play well with comdat group sections under ld -r. Generic linker
-# targets don't support comdat group sections.
+# play well with comdat group sections under ld -r.
#failif
#...
diff --git a/ld/testsuite/ld-elf/pr17550b.d b/ld/testsuite/ld-elf/pr17550b.d
index 9fa4881..4e424f1 100644
--- a/ld/testsuite/ld-elf/pr17550b.d
+++ b/ld/testsuite/ld-elf/pr17550b.d
@@ -2,11 +2,10 @@
#source: pr17550-1.s
#ld: -r
#readelf: -s --wide
-#notarget: alpha-*-* cr16-*-* crx-*-* d30v-*-* dlx-*-* pj*-*-*
+#xfail: alpha-*-* cr16-*-* crx-*-*
# Disabled on alpha because alpha has a different .set directive.
# cr16 and crx use non-standard scripts with memory regions, which don't
-# play well with comdat group sections under ld -r. Generic linker
-# targets don't support comdat group sections.
+# play well with comdat group sections under ld -r.
#failif
#...
diff --git a/ld/testsuite/ld-elf/pr17550c.d b/ld/testsuite/ld-elf/pr17550c.d
index bf18e208..9cc4c04 100644
--- a/ld/testsuite/ld-elf/pr17550c.d
+++ b/ld/testsuite/ld-elf/pr17550c.d
@@ -2,8 +2,6 @@
#source: pr17550-3.s
#ld: -r
#error: .*: defined in discarded section `\.data\[foo_group\]'
-#notarget: alpha-*-* cr16-*-* crx-*-* d30v-*-* dlx-*-* pj*-*-*
+#xfail: alpha-*-* d30v-*-* dlx-*-* pj*-*-*
# Disabled on alpha because alpha has a different .set directive.
-# cr16 and crx use non-standard scripts with memory regions, which don't
-# play well with comdat group sections under ld -r. Generic linker
-# targets don't support comdat group sections.
+# Generic linker targets don't support comdat group sections.
diff --git a/ld/testsuite/ld-elf/pr17550d.d b/ld/testsuite/ld-elf/pr17550d.d
index 70c112f..a8c43e7 100644
--- a/ld/testsuite/ld-elf/pr17550d.d
+++ b/ld/testsuite/ld-elf/pr17550d.d
@@ -2,7 +2,7 @@
#source: pr17550-4.s
#ld: -r
#readelf: -s --wide
-#notarget: alpha-*-* cr16-*-* crx-*-* d30v-*-* dlx-*-* pj*-*-*
+#xfail: alpha-*-* cr16-*-* crx-*-* d30v-*-* dlx-*-* pj*-*-*
# Disabled on alpha because alpha has a different .set directive.
# cr16 and crx use non-standard scripts with memory regions, which don't
# play well with comdat group sections under ld -r. Generic linker
diff --git a/ld/testsuite/ld-elf/pr19162.d b/ld/testsuite/ld-elf/pr19162.d
index feca3d4..218da40 100644
--- a/ld/testsuite/ld-elf/pr19162.d
+++ b/ld/testsuite/ld-elf/pr19162.d
@@ -3,8 +3,7 @@
#ld: -shared -z max-page-size=0x200000 -z noseparate-code
#readelf: -l --wide
#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
-#notarget: arc*-*-* hppa*-*-*
-# arc target has an extra 64K stack section.
+#xfail: hppa*-*-*
# hppa fails due to PR 12376.
#...
diff --git a/ld/testsuite/ld-elf/pr19539.d b/ld/testsuite/ld-elf/pr19539.d
index 285d189..5153229 100644
--- a/ld/testsuite/ld-elf/pr19539.d
+++ b/ld/testsuite/ld-elf/pr19539.d
@@ -3,7 +3,7 @@
#ld: -pie -T pr19539.t
#readelf : --dyn-syms --wide
#target: *-*-linux* *-*-gnu* *-*-solaris* arm*-*-uclinuxfdpiceabi
-#notarget: cris*-*-* alpha-*-*
+#xfail: cris*-*-* alpha-*-*
Symbol table '\.dynsym' contains [0-9]+ entr(y|ies):
#pass
diff --git a/ld/testsuite/ld-elf/pr21884.d b/ld/testsuite/ld-elf/pr21884.d
index e7eae56..3d44ccf 100644
--- a/ld/testsuite/ld-elf/pr21884.d
+++ b/ld/testsuite/ld-elf/pr21884.d
@@ -2,7 +2,8 @@
#source: pr21884b.s
#ld: -T pr21884.t
#objdump: -b binary -s
-#notarget: aarch64*-*-* arm*-*-* avr-*-* hppa-*-* ia64-*-* m68hc1*-*-* nds32*-*-* riscv*-*-* score-*-* v850-*-*
+#xfail: aarch64*-*-* arm*-*-* avr-*-* ia64-*-* m68hc1*-*-* nds32*-*-*
+#xfail: riscv*-*-* score-*-* v850-*-*
# Skip targets which can't change output format to binary.
.*: file format binary
diff --git a/ld/testsuite/ld-elf/pr22319.d b/ld/testsuite/ld-elf/pr22319.d
index 68a5706..8ad2f3e 100644
--- a/ld/testsuite/ld-elf/pr22319.d
+++ b/ld/testsuite/ld-elf/pr22319.d
@@ -1,7 +1,7 @@
#name: PR 22319 - required undefined symbols in output
#ld: -u undefined_symbol -e 0
#nm: -u
-#notarget: dlx-*-*
+#xfail: dlx-*-*
# The DLX target fails because it needs a special linker script to handle file symbols.
[ ]+U+[ ]+undefined_symbol
diff --git a/ld/testsuite/ld-gc/pr19167.d b/ld/testsuite/ld-gc/pr19167.d
index 578646e..9555cc8 100644
--- a/ld/testsuite/ld-gc/pr19167.d
+++ b/ld/testsuite/ld-gc/pr19167.d
@@ -3,7 +3,7 @@
#ld: --gc-sections -e _start
#objdump: -s -j _foo
#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
-#notarget: frv-*-linux* metag-*-linux*
+#xfail: frv-*-* metag-*-*
#...
Contents of section _foo:
diff --git a/ld/testsuite/ld-gc/pr20022.d b/ld/testsuite/ld-gc/pr20022.d
index 6600f4a..681c68c 100644
--- a/ld/testsuite/ld-gc/pr20022.d
+++ b/ld/testsuite/ld-gc/pr20022.d
@@ -2,7 +2,7 @@
#ld: --gc-sections -e _start tmpdir/pr20022.so
#readelf: -SsW
#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
-#notarget: frv-*-linux* metag-*-linux* mips*-*-*
+#xfail: frv-*-* metag-*-* mips*-*-*
# Skip on targets without dynamic relocations in .text section.
#...
diff --git a/ld/testsuite/ld-gc/start.d b/ld/testsuite/ld-gc/start.d
index b848623..85b0612 100644
--- a/ld/testsuite/ld-gc/start.d
+++ b/ld/testsuite/ld-gc/start.d
@@ -2,7 +2,7 @@
#ld: --gc-sections -e _start
#nm: -n
#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
-#notarget: frv-*-linux* metag-*-linux*
+#xfail: frv-*-* metag-*-*
#...
[0-9a-f]+ D +__start__foo
diff --git a/ld/testsuite/ld-gc/stop.d b/ld/testsuite/ld-gc/stop.d
index 84dc465..ebd3597 100644
--- a/ld/testsuite/ld-gc/stop.d
+++ b/ld/testsuite/ld-gc/stop.d
@@ -2,7 +2,6 @@
#ld: --gc-sections -e _start
#nm: -n
#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
-#notarget: frv-*-linux* metag-*-linux*
#failif
#...
diff --git a/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d b/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d
index 2a89771..cf94a0c 100644
--- a/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d
+++ b/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d
@@ -4,7 +4,6 @@
#objdump: -dw
#target: x86_64-*-*
#notarget: x86_64-*-nacl*
-#notarget: x86_64-*-nacl*
.*: +file format .*
diff --git a/ld/testsuite/ld-misc/defsym1.d b/ld/testsuite/ld-misc/defsym1.d
index 5ee08c7..b0d7c77 100644
--- a/ld/testsuite/ld-misc/defsym1.d
+++ b/ld/testsuite/ld-misc/defsym1.d
@@ -1,7 +1,7 @@
#ld: -e 0 --defsym foo=1 tmpdir/start.o tmpdir/libfoo.a
#nm: -B
#source: dummy.s
-#notarget: frv-*-linux*
+#xfail: frv-*-linux*
# Check that --defsym works on archive.
#failif
diff --git a/ld/testsuite/ld-pe/pr19803.d b/ld/testsuite/ld-pe/pr19803.d
index d8d0c55..238194b 100644
--- a/ld/testsuite/ld-pe/pr19803.d
+++ b/ld/testsuite/ld-pe/pr19803.d
@@ -1,6 +1,6 @@
#ld: -shared --out-implib dx.dll.a --gc-sections
#objdump: --syms
-#notarget: mcore-*
+#xfail: mcore-*
#
# The MCORE-PE target does not support -shared.
#
diff --git a/ld/testsuite/ld-scripts/assign-loc.d b/ld/testsuite/ld-scripts/assign-loc.d
index bc0c5a0..f3115b0 100644
--- a/ld/testsuite/ld-scripts/assign-loc.d
+++ b/ld/testsuite/ld-scripts/assign-loc.d
@@ -1,7 +1,7 @@
#ld: -T assign-loc.t
#source: data.s
#nm: -n
-#notarget: powerpc*-*-aix* rs6000-*-aix*
+#xfail: powerpc*-*-aix* rs6000-*-aix*
#...
0+0100 A HEAP_SIZE
#...
diff --git a/ld/testsuite/ld-scripts/defined4.d b/ld/testsuite/ld-scripts/defined4.d
index 2f034cb..cd3eb4f 100644
--- a/ld/testsuite/ld-scripts/defined4.d
+++ b/ld/testsuite/ld-scripts/defined4.d
@@ -2,7 +2,7 @@
#nm: -B
#source: defined4.s
#xfail: powerpc*-*-aix* rs6000-*-aix*
-#notarget: mips*-*-* mmix-*-*
+#xfail: mips*-*-* mmix-*-*
# We check that defined and defined1 have the same address. MIPS targets
# use different address. MMIX puts defined and defined1 in text section.
diff --git a/ld/testsuite/ld-scripts/empty-address-1.d b/ld/testsuite/ld-scripts/empty-address-1.d
index f43e4c3..5b18217 100644
--- a/ld/testsuite/ld-scripts/empty-address-1.d
+++ b/ld/testsuite/ld-scripts/empty-address-1.d
@@ -1,6 +1,6 @@
#ld: -T empty-address-1.t
#nm: -n
-#notarget: frv-*-*linux*
+#xfail: frv-*-*linux*
#...
0+0 T _start
#...
diff --git a/ld/testsuite/ld-scripts/empty-address-2a.d b/ld/testsuite/ld-scripts/empty-address-2a.d
index 5c4f330..d27bf00 100644
--- a/ld/testsuite/ld-scripts/empty-address-2a.d
+++ b/ld/testsuite/ld-scripts/empty-address-2a.d
@@ -1,7 +1,7 @@
#source: empty-address-2.s
#ld: -Ttext 0x0000000 -Tdata 0x2000000 -T empty-address-2a.t
#nm: -n
-#notarget: frv-*-*linux*
+#xfail: frv-*-*linux*
#...
0+0 T _start
#...
diff --git a/ld/testsuite/ld-scripts/empty-address-2b.d b/ld/testsuite/ld-scripts/empty-address-2b.d
index 861ef36..eb23e74 100644
--- a/ld/testsuite/ld-scripts/empty-address-2b.d
+++ b/ld/testsuite/ld-scripts/empty-address-2b.d
@@ -1,7 +1,7 @@
#source: empty-address-2.s
#ld: -Ttext 0x0000000 -Tdata 0x2000000 -T empty-address-2b.t
#nm: -n
-#notarget: frv-*-*linux*
+#xfail: frv-*-*linux*
#...
0+0 T _start
#...
diff --git a/ld/testsuite/ld-scripts/empty-address-3a.d b/ld/testsuite/ld-scripts/empty-address-3a.d
index 68d1663..b3135bf 100644
--- a/ld/testsuite/ld-scripts/empty-address-3a.d
+++ b/ld/testsuite/ld-scripts/empty-address-3a.d
@@ -1,7 +1,7 @@
#source: empty-address-3.s
#ld: -T empty-address-3a.t
#nm: -n
-#notarget: mmix-knuth-mmixware
+
#...
0+0 T _start
#...
diff --git a/ld/testsuite/ld-scripts/empty-address-3b.d b/ld/testsuite/ld-scripts/empty-address-3b.d
index d3ebee3..1e68e29 100644
--- a/ld/testsuite/ld-scripts/empty-address-3b.d
+++ b/ld/testsuite/ld-scripts/empty-address-3b.d
@@ -1,7 +1,7 @@
#source: empty-address-3.s
#ld: -T empty-address-3b.t
#nm: -n
-#notarget: mmix-knuth-mmixware
+
#...
0+0 T _start
#...
diff --git a/ld/testsuite/ld-scripts/fill.d b/ld/testsuite/ld-scripts/fill.d
index 38b3f2d..07dca0b 100644
--- a/ld/testsuite/ld-scripts/fill.d
+++ b/ld/testsuite/ld-scripts/fill.d
@@ -3,18 +3,11 @@
#source: fill_2.s
#ld: -T fill.t
#objdump: -s -j .text
-#notarget: ia64-*-*
-#notarget: mips*-*-irix* mips*-*-linux* mips*-*-freebsd* mips*-*-gnu*
-#notarget: mips*-*-kfreebsd* mips*-*-netbsd* mips*-*-openbsd* mips*-*-sysv4*
-#notarget: tilegx*-*-*
-#notarget: tilepro-*-*
-#notarget: x86_64-*-cygwin x86_64-*-mingw* x86_64-*-pe*
-#xfail: alpha*-*-*ecoff
-#xfail: m32c-*-*
-#xfail: sh-*-pe
-#xfail: sparc*-*-coff
-#xfail: tic30-*-coff tic4x-*-* tic54x-*-*
-#xfail: z8k-*-*
+#xfail: alpha*-*-*ecoff ia64-*-* m32c-*-* mips*-*-freebsd* mips*-*-gnu*
+#xfail: mips*-*-irix* mips*-*-kfreebsd* mips*-*-linux* mips*-*-netbsd*
+#xfail: mips*-*-openbsd* mips*-*-sysv4* sh-*-pe sparc*-*-coff
+#xfail: tic30-*-coff tic4x-*-* tic54x-*-* tilegx*-*-* tilepro-*-*
+#xfail: x86_64-*-cygwin x86_64-*-mingw* x86_64-*-pe* z8k-*-*
#
# See also fill16.d. We use `notarget' for configurations unsupported
# here that are covered there, and `xfail' for configurations that work
diff --git a/ld/testsuite/ld-scripts/fill16.d b/ld/testsuite/ld-scripts/fill16.d
index 068af75..371f38e 100644
--- a/ld/testsuite/ld-scripts/fill16.d
+++ b/ld/testsuite/ld-scripts/fill16.d
@@ -3,14 +3,8 @@
#source: fill16_2.s
#ld: -T fill.t
#objdump: -s -j .text
-#notarget: arm-*-coff
-#notarget: i[3-7]86-*-coff
-#xfail: alpha*-*-*ecoff
-#xfail: m32c-*-*
-#xfail: sh-*-pe
-#xfail: sparc*-*-coff
-#xfail: tic30-*-coff tic4x-*-* tic54x-*-*
-#xfail: z8k-*-*
+#xfail: alpha*-*-*ecoff arm-*-coff i[3-7]86-*-coff m32c-*-* sh-*-pe
+#xfail: sparc*-*-coff tic30-*-coff tic4x-*-* tic54x-*-* z8k-*-*
#
# See also fill.d. We use `notarget' for configurations unsupported
# here that are covered there, and `xfail' for configurations that work
diff --git a/ld/testsuite/ld-scripts/pr14962-2.d b/ld/testsuite/ld-scripts/pr14962-2.d
index dad84a3..b80b6e6 100644
--- a/ld/testsuite/ld-scripts/pr14962-2.d
+++ b/ld/testsuite/ld-scripts/pr14962-2.d
@@ -1,7 +1,7 @@
#ld: -T pr14962-2.t
#source: pr14962a.s
#nm: -n
-#notarget: frv-*-*linux*
+#xfail: frv-*-*linux*
#...
0+2000 [AT] _start
diff --git a/ld/testsuite/ld-scripts/pr14962.d b/ld/testsuite/ld-scripts/pr14962.d
index ba7dd58..b7b0c35 100644
--- a/ld/testsuite/ld-scripts/pr14962.d
+++ b/ld/testsuite/ld-scripts/pr14962.d
@@ -2,7 +2,7 @@
#source: pr14962a.s
#source: pr14962b.s
#nm: -n
-#notarget: mmix-knuth-mmixware
+#xfail: mmix-knuth-mmixware
# The reference to x would normally generate a cross-reference error
# but the linker script converts x to absolute to avoid the error.
diff --git a/ld/testsuite/ld-scripts/section-match-1.d b/ld/testsuite/ld-scripts/section-match-1.d
index a30608e..5644b3e 100644
--- a/ld/testsuite/ld-scripts/section-match-1.d
+++ b/ld/testsuite/ld-scripts/section-match-1.d
@@ -3,7 +3,7 @@
#objdump: -s
#notarget: *-*-osf* *-*-aix* *-*-pe *-*-*aout *-*-ecoff *-*-netbsd *-*-vms h8300-*-* tic30-*-*
# This test uses arbitrary section names, which are not support by some
-# file formts. Also these section names must be present in the
+# file formats. Also these section names must be present in the
# output, not translated into some other name, eg .text
.*: file format .*
diff --git a/ld/testsuite/ld-unique/pr21529.d b/ld/testsuite/ld-unique/pr21529.d
index 11d47b8..fb63794 100644
--- a/ld/testsuite/ld-unique/pr21529.d
+++ b/ld/testsuite/ld-unique/pr21529.d
@@ -1,6 +1,6 @@
#ld: --oformat binary -T pr21529.ld -e main
#objdump: -s -b binary
-#notarget: aarch64*-*-* arm*-*-* avr-*-* ia64-*-* m68hc1*-*-* nds32*-*-* riscv*-*-* score-*-* v850-*-*
+#xfail: aarch64*-*-* arm*-*-* avr-*-* ia64-*-* m68hc1*-*-* nds32*-*-* riscv*-*-* score-*-* v850-*-*
# Skip targets which can't change output format to binary.
#pass