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.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 14917c7f574edd573ce439af0962174b8916153d..b30bbc40984c6548686c3cb9cdb1adf05fc67224 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-13  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/lib/binutils-common.exp (is_pecoff_format): Accept
+       optional machine-os arg.
+
 2020-07-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        * readelf.c (decode_x86_feature_2): Handle

diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index 948b910b83589b1ef8330726d3ecb15aeb0598e7..345840c0b24f3e591da348da3519ed45e0634f37 100644 (file)
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -94,15 +94,20 @@ proc is_aout_format {} {
 
 # True if the object format is known to be PE COFF.
 #
-proc is_pecoff_format {} {
-    if { [istarget *-*-beospe*]
-        || [istarget *-*-cegcc*]
-        || [istarget *-*-cygwin*]
-        || [istarget *-*-interix*]
-        || [istarget *-*-mingw*]
-        || [istarget *-*-netbsdpe*]
-        || [istarget *-*-pe*]
-        || [istarget *-*-winnt*] } {
+proc is_pecoff_format args {
+    if { [llength $args] == 1 } {
+       set m_os [lindex $args 0]
+    } else {
+       set m_os *-*
+    }
+    if { [istarget $m_os-beospe*]
+        || [istarget $m_os-cegcc*]
+        || [istarget $m_os-cygwin*]
+        || [istarget $m_os-interix*]
+        || [istarget $m_os-mingw*]
+        || [istarget $m_os-netbsdpe*]
+        || [istarget $m_os-pe*]
+        || [istarget $m_os-winnt*] } {
        return 1
     }
     return 0

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c0bbaf95dfa2c4b10c224f08da1c4c7536fdd632..98d10c0b73a867867a91d7dae721a4425691c472 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+2020-07-13  Alan Modra  <amodra@gmail.com>
+
+       * 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.
+
 2020-07-10  Alan Modra  <amodra@gmail.com>
 
        * ld.texi (PowerPC64 ELF64): Document --no-inline-optimize,

diff --git a/ld/testsuite/ld-scripts/default-script1.d b/ld/testsuite/ld-scripts/default-script1.d
index 110b30e3449ab97d8b4529817c4b6ed28c045ec1..ec88067f4383eabad22c2330f8376e63494a3c28 100644 (file)
--- 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 3fd4386453076675511d6d0f42e0ae715a998232..b10ac96288eb3f349dfdfbd58e7f1c069d58fa1b 100644 (file)
--- 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 43164bddc760c662a1e146cdb950657a8f269ff4..4742bc31e4f570f1770ad89d87d2d7549bbe0575 100644 (file)
--- 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 d92e9d608955fd54742b7156373244b9aad6efc2..09b6dbf08bad4beef2dfb787337874050040527b 100644 (file)
--- 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 b89e32b349e63972444d9d575cf3cb198b46350b..7eb25ce858de14bd0baf2596e3c3d9d00283f87c 100644 (file)
--- 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 6b3808ee4e2ac87680db5f096004747ceec8ee60..27a2d0d5a0b33ff544b701c7e35c2e7bb955697e 100644 (file)
--- 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 f5abc524e89dfe703a898840f18ba4771eb538b5..16510be9e90ffc990b4459bad1c082d316dd5cba 100644 (file)
--- 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