Correct mingw target select

x86_64-w64-mingw32  +FAIL: ld-scripts/default-script1
x86_64-w64-mingw32  +FAIL: ld-scripts/default-script2
x86_64-w64-mingw32  +FAIL: ld-scripts/default-script3
x86_64-w64-mingw32  +FAIL: ld-scripts/default-script4

	* testsuite/ld-scripts/default-script1.d: Correct mingw skip.
	* testsuite/ld-scripts/default-script2.d: Likewise.
	* testsuite/ld-scripts/default-script3.d: Likewise.
	* testsuite/ld-scripts/default-script4.d: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0ef2c7bb990e5bed6ceb0953228b5dfe2518ef96..79f8e63adccc3c4da764e9be36c4e866e03cdcf5 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2020-04-22  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/ld-scripts/default-script1.d: Correct mingw skip.
+       * testsuite/ld-scripts/default-script2.d: Likewise.
+       * testsuite/ld-scripts/default-script3.d: Likewise.
+       * testsuite/ld-scripts/default-script4.d: Likewise.
+
 2020-04-21  Stephen Casner  <casner@acm.org>
 
        PR 25829
@@ -16,7 +23,7 @@
        * testsuite/ld-scripts/empty-address-2b.d: Likewise.
        * testsuite/ld-misc/start.s: .long -> .dc.a to allow relocation to
        fit target address size.
-       * testsuite/ld-scripts/empty-address-1.s: Likewise.
+       * testsuite/ld-scripts/empty-address-1.s: Likewise.
        * testsuite/ld-scripts/empty-address-2.s: Likewise.
 
 2020-04-21  H.J. Lu  <hongjiu.lu@intel.com>

diff --git a/ld/testsuite/ld-scripts/default-script1.d b/ld/testsuite/ld-scripts/default-script1.d
index a749265b9f8d90791410b7716785cd03de36828c..110b30e3449ab97d8b4529817c4b6ed28c045ec1 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: *-*-mingw64 x86_64-*-cygwin
+# skip: x86_64-*-mingw* x86_64-*-cygwin
 # 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 137cf09b5292abc3bf921c2e46dd1e7a790d931a..3fd4386453076675511d6d0f42e0ae715a998232 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: *-*-mingw64 x86_64-*-cygwin
+# skip: x86_64-*-mingw* x86_64-*-cygwin
 # 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 00f64ecb618dd9f31c9d13082f20b8266a0c6961..43164bddc760c662a1e146cdb950657a8f269ff4 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: *-*-mingw64 x86_64-*-cygwin
+# skip: x86_64-*-mingw* x86_64-*-cygwin
 # 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 dc4f33b37cb72fbf2676aa2bea11864e08834f80..d92e9d608955fd54742b7156373244b9aad6efc2 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: *-*-mingw64 x86_64-*-cygwin
+# skip: x86_64-*-mingw* x86_64-*-cygwin
 # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
 
 #...