3 files changed, 20 insertions, 5 deletions
diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index b0190ac..ab75241 100644
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -112,6 +112,21 @@ proc is_pecoff_format args {
     return 0
 }
 
+# True if the object format is known to COFF or PE (but not ECOFF or XCOFF)
+#
+proc is_coff_format {} {
+    if { [is_pecoff_format]
+	 || [istarget *-*-coff*]
+	 || [istarget *-*-go32*]
+	 || [istarget *-*-msdosdjgpp*]
+	 || [istarget tic4x-*-*]
+	 || [istarget tic54x-*-*]
+	 || [istarget z8k-*-*] } {
+	return 1
+    }
+    return 0
+}
+
 proc is_som_format {} {
     if { ![istarget hppa*-*-*] || [istarget hppa*64*-*-*] } {
 	return 0;
diff --git a/ld/testsuite/ld-scripts/ascii.d b/ld/testsuite/ld-scripts/ascii.d
index cfc1a4c..ff3bd32 100644
--- a/ld/testsuite/ld-scripts/ascii.d
+++ b/ld/testsuite/ld-scripts/ascii.d
@@ -1,8 +1,8 @@
 #source: ascii.s
 #ld: -T ascii.t
 #objdump: -s -j .header
-#notarget: [is_aout_format]
-#skip: tic4x-*-* tic54x-*-* *-*-*ecoff *-*-macho *-*-aix*
+#target: [is_elf_format] [is_coff_format]
+#notarget: tic4x-*-* tic54x-*-*
 
 .*:     file format .*
 
diff --git a/ld/testsuite/ld-scripts/asciz.d b/ld/testsuite/ld-scripts/asciz.d
index 75e3c85..38d0408 100644
--- a/ld/testsuite/ld-scripts/asciz.d
+++ b/ld/testsuite/ld-scripts/asciz.d
@@ -1,8 +1,8 @@
 #source: asciz.s
 #ld: -T asciz.t
 #objdump: -s -j .data
-#notarget: [is_aout_format]
-#skip: tic4x-*-* tic54x-*-* *-*-*ecoff *-*-macho *-*-aix*
+#target: [is_elf_format] [is_coff_format]
+#notarget: tic4x-*-* tic54x-*-*
 
 .*:     file format .*
 
@@ -10,5 +10,5 @@ Contents of section .data:
  .... 54686973 20697320 61207374 72696e67  This is a string
  .... 00546869 73206973 20616e6f 74686572  .This is another
  .... 0a537472 696e6700 006e6f71 756f7465  .String..noquote
- .... 7300                                 s.              
+ .... 7300[ 0]*  s.*
 #pass