Renamed target x86_64-*-mingw64 to x86_64-*-mingw*.

7 files changed, 19 insertions, 9 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index e7ac70c..769db91 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* ld-fastcall/fastcall.exp: Renamed target x86_64-*-mingw64 to
+	x86_64-*-mingw*.
+	* ld-pe/pe.exp: Ditto.
+	* ld-scripts/align.exp: Ditto.
+	* ld-scripts/defined.exp: Ditto.
+	* ld-scripts/provide.exp: Ditto.
+	* ld-scripts/weak.exp: Ditto.
+
 2007-01-06  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* ld-scripts/expr.exp: New.
diff --git a/ld/testsuite/ld-fastcall/fastcall.exp b/ld/testsuite/ld-fastcall/fastcall.exp
index b613625..66ad72e 100644
--- a/ld/testsuite/ld-fastcall/fastcall.exp
+++ b/ld/testsuite/ld-fastcall/fastcall.exp
@@ -17,13 +17,13 @@
 
 set testname "ld (fastcall symbols)"
 
-if {![istarget "i*86-*-*"] && ![istarget "x86_64-*-mingw64*"] } {
+if {![istarget "i*86-*-*"] && ![istarget "x86_64-*-mingw*"] } {
     return
 }
 
 if {  !([istarget "i*86-*-*pe*"] && ![istarget "i*86-*-opensd*"]) \
     && ![istarget "i*86-*-cygwin*"] \
-    && ![istarget "x86_64-*-mingw64"] \
+    && ![istarget "x86_64-*-mingw*"] \
     && ![istarget "i*86-*-mingw*"] } {
     return
 }
diff --git a/ld/testsuite/ld-pe/pe.exp b/ld/testsuite/ld-pe/pe.exp
index 53440d1..8657f22 100644
--- a/ld/testsuite/ld-pe/pe.exp
+++ b/ld/testsuite/ld-pe/pe.exp
@@ -21,7 +21,7 @@
 if {    ![istarget i*86-*-cygwin*]

      && ![istarget i*86-*-pe]

      && ![istarget i*86-*-mingw*]

-     && ![istarget x86_64-*-mingw64*]

+     && ![istarget x86_64-*-mingw*]

      && ![istarget arm-wince-pe] } {

     return

 }

diff --git a/ld/testsuite/ld-scripts/align.exp b/ld/testsuite/ld-scripts/align.exp
index 25d4d3e..8c97d3b 100644
--- a/ld/testsuite/ld-scripts/align.exp
+++ b/ld/testsuite/ld-scripts/align.exp
@@ -30,10 +30,10 @@ if ![ld_assemble $as $srcdir/$subdir/align.s tmpdir/align.o] {
 }
 
 # Doesn't work on PECOFF, appears to be a genuine bug.
-# mingw64 targets need to set the image base to 0 to avoid auto image-basing.
+# mingw on x86_64 targets need to set the image base to 0 to avoid auto image-basing.
 global LDFLAGS
 set saved_LDFLAGS "$LDFLAGS"
-if [istarget "*-*-mingw64*"] then {
+if [istarget "x86_64-*-mingw*"] then {
   set LDFLAGS "$LDFLAGS --image-base 0"
 } else {
   if [is_pecoff_format] {
diff --git a/ld/testsuite/ld-scripts/defined.exp b/ld/testsuite/ld-scripts/defined.exp
index d02b909..13e8d5a 100644
--- a/ld/testsuite/ld-scripts/defined.exp
+++ b/ld/testsuite/ld-scripts/defined.exp
@@ -27,7 +27,7 @@ if ![ld_assemble $as $srcdir/$subdir/defined.s tmpdir/def.o] {
 
 global LDFLAGS
 set saved_LDFLAGS "$LDFLAGS"
-if [istarget "*-*-mingw64*"] then {
+if [istarget "x86_64-*-mingw*"] then {
   set LDFLAGS "$LDFLAGS --image-base 0"
 }
 
diff --git a/ld/testsuite/ld-scripts/provide.exp b/ld/testsuite/ld-scripts/provide.exp
index 7d755a0..4691597 100644
--- a/ld/testsuite/ld-scripts/provide.exp
+++ b/ld/testsuite/ld-scripts/provide.exp
@@ -31,7 +31,7 @@ if {[istarget "rs6000-*-aix*"] || [is_aout_format]} {
 
 global LDFLAGS
 set saved_LDFLAGS "$LDFLAGS"
-if [istarget "*-*-mingw64*"] then {
+if [istarget "x86_64-*-mingw*"] then {
   set LDFLAGS "$LDFLAGS --image-base 0"
 }
 
diff --git a/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp
index 9ea9ff6..c70bbf2 100644
--- a/ld/testsuite/ld-scripts/weak.exp
+++ b/ld/testsuite/ld-scripts/weak.exp
@@ -29,7 +29,7 @@ if {! [is_elf_format] && ! [is_pecoff_format]} {
 # Weak symbols are broken for non-i386 PE targets.
 if {! [istarget i?86-*-*]} {
     setup_xfail *-*-pe*
-    setup_xfail *-*-mingw64*
+    setup_xfail x86_64-*-mingw*
 }
 
 # hppa64 and or32 are incredibly broken
@@ -44,7 +44,7 @@ if {! [ld_assemble $as $srcdir/$subdir/weak1.s tmpdir/weak1.o]
 
 global LDFLAGS
 set saved_LDFLAGS "$LDFLAGS"
-if [istarget "*-*-mingw64*"] then {
+if [istarget "x86_64-*-mingw*"] then {
   set LDFLAGS "$LDFLAGS --image-base 0"
 }