x86_64-cygwin tests

Tests just having "xfail: x86_64-*-cygwin" aren't good, since
presumably if a test fails on x86_64-cygwin then it also fails on
x86_64-*-pe* and x86_64-*-mingw*.

binutils/
	* testsuite/lib/binutils-common.exp (is_pecoff_format): Accept
	optional machine-os arg.
ld/
	* testsuite/ld-scripts/default-script1.d: Don't skip, xfail
	using is_pecoff_format.
	* testsuite/ld-scripts/default-script2.d: Likewise.
	* testsuite/ld-scripts/default-script3.d: Likewise.
	* testsuite/ld-scripts/default-script4.d: Likewise.
	* testsuite/ld-scripts/pr20302.d: Remove x86_64-*-cygwin from notarget.
	* testsuite/ld-scripts/provide-6.d: Remove x86_64-*-cygwin from xfail.
	* testsuite/ld-scripts/provide-8.d: Likewise.

7 files changed, 18 insertions, 20 deletions

diff --git a/ld/testsuite/ld-scripts/default-script1.d b/ld/testsuite/ld-scripts/default-script1.d
index 110b30e..ec88067 100644
--- a/ld/testsuite/ld-scripts/default-script1.d
+++ b/ld/testsuite/ld-scripts/default-script1.d
@@ -1,7 +1,7 @@
-# source: default-script.s
-# ld: -defsym _START=0x800 -T default-script.t
-# nm: -n
-# skip: x86_64-*-mingw* x86_64-*-cygwin
+#source: default-script.s
+#ld: -defsym _START=0x800 -T default-script.t
+#nm: -n
+#xfail: {[is_pecoff_format x86_64-*]}
 # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
 
 #...
diff --git a/ld/testsuite/ld-scripts/default-script2.d b/ld/testsuite/ld-scripts/default-script2.d
index 3fd4386..b10ac96 100644
--- a/ld/testsuite/ld-scripts/default-script2.d
+++ b/ld/testsuite/ld-scripts/default-script2.d
@@ -1,7 +1,7 @@
-# source: default-script.s
-# ld: -T default-script.t -defsym _START=0x800
-# nm: -n
-# skip: x86_64-*-mingw* x86_64-*-cygwin
+#source: default-script.s
+#ld: -T default-script.t -defsym _START=0x800
+#nm: -n
+#xfail: {[is_pecoff_format x86_64-*]}
 # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
 
 #...
diff --git a/ld/testsuite/ld-scripts/default-script3.d b/ld/testsuite/ld-scripts/default-script3.d
index 43164bd..4742bc3 100644
--- a/ld/testsuite/ld-scripts/default-script3.d
+++ b/ld/testsuite/ld-scripts/default-script3.d
@@ -1,7 +1,7 @@
-# source: default-script.s
-# ld: -defsym _START=0x800 -dT default-script.t
-# nm: -n
-# skip: x86_64-*-mingw* x86_64-*-cygwin
+#source: default-script.s
+#ld: -defsym _START=0x800 -dT default-script.t
+#nm: -n
+#xfail: {[is_pecoff_format x86_64-*]}
 # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
 
 #...
diff --git a/ld/testsuite/ld-scripts/default-script4.d b/ld/testsuite/ld-scripts/default-script4.d
index d92e9d6..09b6dbf 100644
--- a/ld/testsuite/ld-scripts/default-script4.d
+++ b/ld/testsuite/ld-scripts/default-script4.d
@@ -1,7 +1,7 @@
-# source: default-script.s
-# ld: --default-script default-script.t -defsym _START=0x800
-# nm: -n
-# skip: x86_64-*-mingw* x86_64-*-cygwin
+#source: default-script.s
+#ld: --default-script default-script.t -defsym _START=0x800
+#nm: -n
+#xfail: {[is_pecoff_format x86_64-*]}
 # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
 
 #...
diff --git a/ld/testsuite/ld-scripts/pr20302.d b/ld/testsuite/ld-scripts/pr20302.d
index b89e32b..7eb25ce 100644
--- a/ld/testsuite/ld-scripts/pr20302.d
+++ b/ld/testsuite/ld-scripts/pr20302.d
@@ -1,11 +1,10 @@
 #ld: -Tdata=0x1000 -Tdata=0x2000 -Tcross2.t
 #source: align2a.s
 #objdump: -h
-#notarget: *-*-*aout *-*-netbsd *-*-vms ns32k-*-* rx-*-* x86_64-*-cygwin
+#notarget: *-*-*aout *-*-netbsd *-*-vms ns32k-*-* rx-*-*
 # AOUT and NETBSD (ns32k is aout) have fixed address for the data section.
 # VMS targets need extra libraries.
 # RX uses non standard section names.
-# x86_64 Cygwin biases all start addresses to be > 2Gb.
 
 #...
   . \.data[ 	]+0+[0-9a-f]+[ 	]+0+02000[ 	]+0+02000.*
diff --git a/ld/testsuite/ld-scripts/provide-6.d b/ld/testsuite/ld-scripts/provide-6.d
index 6b3808e..27a2d0d 100644
--- a/ld/testsuite/ld-scripts/provide-6.d
+++ b/ld/testsuite/ld-scripts/provide-6.d
@@ -1,7 +1,6 @@
 #source: provide-5.s
 #ld: -T provide-6.t
 #nm: -B
-#xfail: x86_64-*-cygwin
 
 #...
 0+1000 D foo
diff --git a/ld/testsuite/ld-scripts/provide-8.d b/ld/testsuite/ld-scripts/provide-8.d
index f5abc52..16510be 100644
--- a/ld/testsuite/ld-scripts/provide-8.d
+++ b/ld/testsuite/ld-scripts/provide-8.d
@@ -1,7 +1,7 @@
 #source: provide-5.s
 #ld: -T provide-8.t
 #nm: -B
-#xfail: x86_64-*-cygwin mmix-*-* sh-*-pe spu-*-*
+#xfail: mmix-*-* sh-*-pe spu-*-*
 
 #...
 0+4000 D __FOO