diff -rNbu src/bfd/config.bfd binutils_061219/bfd/config.bfd
--- src/bfd/config.bfd	2006-12-19 10:44:06.292786200 +0100
+++ binutils_061219/bfd/config.bfd	2006-12-19 12:18:17.918880000 +0100
@@ -584,7 +584,7 @@
     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 -rNbu src/binutils/configure.in binutils_061219/binutils/configure.in
--- src/binutils/configure.in	2006-12-19 10:44:10.378539000 +0100
+++ binutils_061219/binutils/configure.in	2006-12-19 12:18:56.653324500 +0100
@@ -264,7 +264,7 @@
 	  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 -rNbu src/binutils/testsuite/binutils-all/copy-3.d binutils_061219/binutils/testsuite/binutils-all/copy-3.d
--- src/binutils/testsuite/binutils-all/copy-3.d	2006-09-20 14:45:05.840881900 +0200
+++ binutils_061219/binutils/testsuite/binutils-all/copy-3.d	2006-12-19 12:19:18.604012500 +0100
@@ -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 -rNbu src/binutils/testsuite/binutils-all/dlltool.exp binutils_061219/binutils/testsuite/binutils-all/dlltool.exp
--- src/binutils/testsuite/binutils-all/dlltool.exp	2006-09-20 14:45:05.910982000 +0200
+++ binutils_061219/binutils/testsuite/binutils-all/dlltool.exp	2006-12-19 12:19:49.737538500 +0100
@@ -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 -rNbu src/binutils/testsuite/binutils-all/windres/lang.rc binutils_061219/binutils/testsuite/binutils-all/windres/lang.rc
--- src/binutils/testsuite/binutils-all/windres/lang.rc	2006-09-20 14:45:06.121282300 +0200
+++ binutils_061219/binutils/testsuite/binutils-all/windres/lang.rc	2006-12-19 12:20:09.555244500 +0100
@@ -1,4 +1,4 @@
-//#xfail *-*-mingw64
+//#xfail x86_64-*-mingw*
 #include "windows.h"
 
 LANGUAGE 0, 0
diff -rNbu src/binutils/testsuite/binutils-all/windres/strtab1.rc binutils_061219/binutils/testsuite/binutils-all/windres/strtab1.rc
--- src/binutils/testsuite/binutils-all/windres/strtab1.rc	2006-09-20 14:45:06.171353800 +0200
+++ binutils_061219/binutils/testsuite/binutils-all/windres/strtab1.rc	2006-12-19 12:20:26.098372500 +0100
@@ -1,4 +1,4 @@
-//#xfail *-*-mingw64
+//#xfail x86_64-*-mingw*
 #include "windows.h"
 
 LANGUAGE 0, 0
diff -rNbu src/binutils/testsuite/binutils-all/windres/windres.exp binutils_061219/binutils/testsuite/binutils-all/windres/windres.exp
--- src/binutils/testsuite/binutils-all/windres/windres.exp	2006-09-20 14:45:06.241453900 +0200
+++ binutils_061219/binutils/testsuite/binutils-all/windres/windres.exp	2006-12-19 12:20:48.830263900 +0100
@@ -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 -rNbu src/gas/configure.tgt binutils_061219/gas/configure.tgt
--- src/gas/configure.tgt	2006-10-30 09:24:41.540426400 +0100
+++ binutils_061219/gas/configure.tgt	2006-12-19 12:23:46.330259600 +0100
@@ -211,8 +211,11 @@
   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 -rNbu src/gas/testsuite/gas/all/gas.exp binutils_061219/gas/testsuite/gas/all/gas.exp
--- src/gas/testsuite/gas/all/gas.exp	2006-09-20 14:45:07.813699000 +0200
+++ binutils_061219/gas/testsuite/gas/all/gas.exp	2006-12-19 12:24:27.047183600 +0100
@@ -207,7 +207,7 @@
      || [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 -rNbu src/gas/testsuite/gas/i386/i386.exp binutils_061219/gas/testsuite/gas/i386/i386.exp
--- src/gas/testsuite/gas/i386/i386.exp	2006-12-19 10:44:17.718874300 +0100
+++ binutils_061219/gas/testsuite/gas/i386/i386.exp	2006-12-19 12:24:46.294091600 +0100
@@ -164,7 +164,7 @@
     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 -rNbu src/ld/configure.tgt binutils_061219/ld/configure.tgt
--- src/ld/configure.tgt	2006-12-19 10:44:24.538476400 +0100
+++ binutils_061219/ld/configure.tgt	2006-12-19 12:25:16.125992000 +0100
@@ -235,7 +235,7 @@
 			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 -rNbu src/ld/testsuite/ld-fastcall/fastcall.exp binutils_061219/ld/testsuite/ld-fastcall/fastcall.exp
--- src/ld/testsuite/ld-fastcall/fastcall.exp	2006-10-04 09:31:34.834824100 +0200
+++ binutils_061219/ld/testsuite/ld-fastcall/fastcall.exp	2006-12-19 12:25:35.182824300 +0100
@@ -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 -rNbu src/ld/testsuite/ld-pe/pe.exp binutils_061219/ld/testsuite/ld-pe/pe.exp
--- src/ld/testsuite/ld-pe/pe.exp	2006-10-04 09:31:35.105202100 +0200
+++ binutils_061219/ld/testsuite/ld-pe/pe.exp	2006-12-19 12:25:48.711873400 +0100
@@ -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 -rNbu src/ld/testsuite/ld-scripts/align.exp binutils_061219/ld/testsuite/ld-scripts/align.exp
--- src/ld/testsuite/ld-scripts/align.exp	2006-09-20 14:45:12.610548700 +0200
+++ binutils_061219/ld/testsuite/ld-scripts/align.exp	2006-12-19 12:26:22.749588700 +0100
@@ -30,10 +30,10 @@
 }
 
 # 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 -rNbu src/ld/testsuite/ld-scripts/defined.exp binutils_061219/ld/testsuite/ld-scripts/defined.exp
--- src/ld/testsuite/ld-scripts/defined.exp	2006-09-20 14:45:12.750748900 +0200
+++ binutils_061219/ld/testsuite/ld-scripts/defined.exp	2006-12-19 12:26:47.884728700 +0100
@@ -27,7 +27,7 @@
 
 global LDFLAGS
 set saved_LDFLAGS "$LDFLAGS"
-if [istarget "*-*-mingw64*"] then {
+if [istarget "x86_64-*-mingw*"] then {
   set LDFLAGS "$LDFLAGS --image-base 0"
 }
 
diff -rNbu src/ld/testsuite/ld-scripts/provide.exp binutils_061219/ld/testsuite/ld-scripts/provide.exp
--- src/ld/testsuite/ld-scripts/provide.exp	2006-09-20 14:45:12.840877600 +0200
+++ binutils_061219/ld/testsuite/ld-scripts/provide.exp	2006-12-19 12:27:01.974426700 +0100
@@ -31,7 +31,7 @@
 
 global LDFLAGS
 set saved_LDFLAGS "$LDFLAGS"
-if [istarget "*-*-mingw64*"] then {
+if [istarget "x86_64-*-mingw*"] then {
   set LDFLAGS "$LDFLAGS --image-base 0"
 }
 
diff -rNbu src/ld/testsuite/ld-scripts/weak.exp binutils_061219/ld/testsuite/ld-scripts/weak.exp
--- src/ld/testsuite/ld-scripts/weak.exp	2006-09-20 14:45:13.001106400 +0200
+++ binutils_061219/ld/testsuite/ld-scripts/weak.exp	2006-12-19 12:27:30.253962700 +0100
@@ -29,7 +29,7 @@
 # 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 @@
 
 global LDFLAGS
 set saved_LDFLAGS "$LDFLAGS"
-if [istarget "*-*-mingw64*"] then {
+if [istarget "x86_64-*-mingw*"] then {
   set LDFLAGS "$LDFLAGS --image-base 0"
 }