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

25 files changed, 69 insertions, 24 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e341c1f..402b0a3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* config.bfd: Renamed target x86_64-*-mingw64 to x86_64-*-mingw*.
+
 2007-01-05  Jakub Jelinek  <jakub@redhat.com>
 
 	* texhex.c (first_phase): Don't fall through into the default
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 93a6f63..70d2c70 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -590,7 +590,7 @@ case "${targ}" in
     targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
     want64=true
     ;;
-  x86_64-*-mingw64*)
+  x86_64-*-mingw*)
     targ_defvec=x86_64pe_vec
     targ_selvecs="x86_64pe_vec x86_64pei_vec x86_64coff_vec  bfd_elf64_x86_64_vec"
     want64=true
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d63cbc2..33ae904 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* configure.in: Renamed target x86_64-*-mingw64 to
+	x86_64-*-mingw*.
+	* configure: Regenerated.
+
 2007-01-05  Alan Modra  <amodra@bigpond.net.au>
 
 	* readelf.c (dump_section): Don't print 32-bit values, which
diff --git a/binutils/configure b/binutils/configure
index eaddc74..fd0d32b 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -8653,7 +8653,7 @@ do
 	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
 	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
 	  ;;
-	x86_64-*-mingw64*)
+	x86_64-*-mingw*)
   	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
 	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MX86_64"
 	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
diff --git a/binutils/configure.in b/binutils/configure.in
index bf95051..4036953 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -264,7 +264,7 @@ changequote([,])dnl
 	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
 	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
 	  ;;
-	x86_64-*-mingw64*)
+	x86_64-*-mingw*)
   	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
 	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MX86_64"
 	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index ca065c2..966222b 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* copy-3.d: Renamed target x86_64-*-mingw64 to x86_64-*-mingw*
+	* dlltool.exp: Dito
+	* lang.rc: Dito
+	* strtab1.rc: Dito
+	* windres.exp: Dito
+
 2006-09-20  Kai Tietz  <Kai.Tietz@onevision.com>
 
 	* binutils-all/copy-3.d: Add support for target x86_64-pc-mingw64.
diff --git a/binutils/testsuite/binutils-all/copy-3.d b/binutils/testsuite/binutils-all/copy-3.d
index 4bea36f..1b07817 100644
--- a/binutils/testsuite/binutils-all/copy-3.d
+++ b/binutils/testsuite/binutils-all/copy-3.d
@@ -3,7 +3,7 @@
 #objcopy: --set-section-flags .text=alloc,data
 #name: copy with setting section flags 3
 #source: bintest.s
-#not-target: *-*-aout *-*-*pe *-*-*coff i*86-*-cygwin* i*86-*-mingw32* x86_64-*-mingw64*
+#not-target: *-*-aout *-*-*pe *-*-*coff i*86-*-cygwin* i*86-*-mingw32* x86_64-*-mingw*
 # The .text # section in PE/COFF has a fixed set of flags and these
 # cannot be changed.  We skip it for them.
 
diff --git a/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp
index 96b6782..af0145d 100644
--- a/binutils/testsuite/binutils-all/dlltool.exp
+++ b/binutils/testsuite/binutils-all/dlltool.exp
@@ -14,14 +14,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-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-*-cygwin*"] \
     && ![istarget "i*86-*-mingw32*"] \
-    && ![istarget "x86_64-*-mingw64*"] } {
+    && ![istarget "x86_64-*-mingw*"] } {
     set target_xfail "yes"
 } else {
     set target_xfail "no"
diff --git a/binutils/testsuite/binutils-all/windres/lang.rc b/binutils/testsuite/binutils-all/windres/lang.rc
index f3da105..11a4d06 100644
--- a/binutils/testsuite/binutils-all/windres/lang.rc
+++ b/binutils/testsuite/binutils-all/windres/lang.rc
@@ -1,4 +1,4 @@
-//#xfail *-*-mingw64
+//#xfail x86_64-*-mingw*
 #include "windows.h"
 
 LANGUAGE 0, 0
diff --git a/binutils/testsuite/binutils-all/windres/strtab1.rc b/binutils/testsuite/binutils-all/windres/strtab1.rc
index 48fd107..416d157 100644
--- a/binutils/testsuite/binutils-all/windres/strtab1.rc
+++ b/binutils/testsuite/binutils-all/windres/strtab1.rc
@@ -1,4 +1,4 @@
-//#xfail *-*-mingw64
+//#xfail x86_64-*-mingw*
 #include "windows.h"
 
 LANGUAGE 0, 0
diff --git a/binutils/testsuite/binutils-all/windres/windres.exp b/binutils/testsuite/binutils-all/windres/windres.exp
index 2c836b8..eb825d0 100644
--- a/binutils/testsuite/binutils-all/windres/windres.exp
+++ b/binutils/testsuite/binutils-all/windres/windres.exp
@@ -19,14 +19,14 @@
 
 # Written by DJ Delorie <dj@redhat.com>
 
-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-*-cygwin*"] \
     && ![istarget "i*86-*-mingw32*"] \
-    && ![istarget "x86_64-*-mingw64*"] } {
+    && ![istarget "x86_64-*-mingw*"] } {
     set target_xfail "yes"
 } else {
     set target_xfail "no"
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7b9c20e..3b7a57a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* configure.tgt: Renamed target x86_64-*-mingw64 to x86_64-*-mingw*
+
 2007-01-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/tc-i386.c (set_intel_syntax): Update set_intel_syntax
diff --git a/gas/configure.tgt b/gas/configure.tgt
index e4cfa1e..8650dac 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -212,8 +212,11 @@ case ${generic_target} in
   i386-*-pe)				fmt=coff em=pe ;;
   i386-*-cygwin*)			fmt=coff em=pe ;;
   i386-*-interix*)			fmt=coff em=interix ;;
-  i386-*-mingw32*)			fmt=coff em=pe ;;
-  i386-*-mingw64*)			fmt=coff em=pep ;;
+  i386-*-mingw*)
+    case ${cpu} in
+      x86_64*)				fmt=coff em=pep ;;
+      i*)				fmt=coff em=pe ;;
+    esac ;;
   i386-*-nto-qnx*)			fmt=elf ;;
   i386-*-*nt*)				fmt=coff em=pe ;;
   i386-*-chaos)				fmt=elf ;;
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index df0a747..fda071e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* gas/all/gas.exp: Renamed target x86_64-*-mingw64 to x86_64-*-mingw*.
+	* gas/i386/i386.exp: Ditto.
+
 2007-01-04  Paul Brook  <paul@codesourcery.com>
 
 	* gas/arm/archv6.s: Add more cpsie tests.
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index adaa486..294d091 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -207,7 +207,7 @@ if {   ([istarget *-*-coff*] && ![istarget *arm*-*-coff] && ![istarget thumb*-*-
      || [istarget i*86-*-isc*] \
      || [istarget i*86-*-go32*] \
      || [istarget i*86-*-cygwin*] \
-     || [istarget x86_64-*-mingw64*] \
+     || [istarget x86_64-*-mingw*] \
      || [istarget i*86-*-*nt] \
      || [istarget i*86-*-interix*] \
      || ([istarget i960-*-vxworks5.*] && ![istarget i960-*-vxworks5.0*]) } {
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 1594653..1f141f2 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -164,7 +164,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-io-suffix"
     run_dump_test "x86-64-gidt"
     run_dump_test "x86-64-nops"
-    if ![istarget "*-*-mingw64*"] then {
+    if ![istarget "x86_64-*-mingw*"] then {
 	run_dump_test "x86-64-nops-1"
     }
     run_dump_test "x86-64-nops-1-k8"
diff --git a/ld/ChangeLog b/ld/ChangeLog
index d3e3eaf..116c8aa 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* configure.tgt: Renamed target x86_64-*-mingw64 to
+	x86_64-*-mingw*.
+
 2007-01-08  Pedro Alves  <pedro_alves@portugalmail.pt>
 
 	* configure.host: Add i[3-7]86-*-mingw* case.
diff --git a/ld/configure.tgt b/ld/configure.tgt
index d1fc690..8623235 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -239,7 +239,7 @@ i[3-7]86-*-cygwin*)	targ_emul=i386pe ;
 			test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api' ;;
 i[3-7]86-*-mingw32*)	targ_emul=i386pe ;
 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
-x86_64-*-mingw64*)	targ_emul=i386pep ;
+x86_64-*-mingw*)	targ_emul=i386pep ;
 			targ_extra_ofiles="deffilep.o pep-dll.o" ;;
 i[3-7]86-*-interix*)	targ_emul=i386pe_posix;
  			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
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"
 }