From 84d7b5ad2f45083e5d8ad149eb3702fb91414d0e Mon Sep 17 00:00:00 2001
From: Doug Semler <dougsemler@gmail.com>
Date: Wed, 14 Apr 2010 09:27:20 -0400
Subject: [PATCH] Default w64-mingw32 targets to include biarch target types.

---
 bfd/config.bfd   | 9 ++++++++-
 ld/configure.tgt | 7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bfd/config.bfd b/bfd/config.bfd
index d39ef1806..e3ede37ac 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -637,7 +637,7 @@ case "${targ}" in
     ;;
   x86_64-*-mingw*)
     targ_defvec=x86_64pe_vec
-    targ_selvecs="x86_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec"
+    targ_selvecs="x86_64pei_vec i386pe_vec i386pei_vec bfd_elf64_x86_64_vec bfd_elf32_i386_vec"
     want64=true
     targ_underscore=no
     ;;
@@ -683,6 +683,13 @@ case "${targ}" in
     targ_defvec=bfd_elf32_i386_vec
     targ_selvecs=i386coff_vec
     ;;
+  i[3-7]86-w64-mingw32*)
+    targ_defvec=i386pe_vec
+    targ_selvecs="i386pei_vec bfd_elf32_i386_vec"
+    targ64_selvecs="x86_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec"
+    targ_underscore=yes
+    want64=true
+    ;;
   i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
     targ_defvec=i386pe_vec
     targ_selvecs="i386pe_vec i386pei_vec bfd_elf32_i386_vec"
diff --git a/ld/configure.tgt b/ld/configure.tgt
index def028719..b72a4d173 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -272,10 +272,15 @@ i[3-7]86-*-pe)		targ_emul=i386pe ;
 i[3-7]86-*-cygwin*)	targ_emul=i386pe ;
 			targ_extra_ofiles="deffilep.o pe-dll.o"
 			test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api' ;;
+i[3-7]86-w64-mingw32*)	targ_emul=i386pe ;
+			targ64_extra_emuls="i386pep"
+			targ_extra_ofiles="deffilep.o pe-dll.o pep-dll.o" ;;
 i[3-7]86-*-mingw32*)	targ_emul=i386pe ;
 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 x86_64-*-mingw*)	targ_emul=i386pep ;
-			targ_extra_ofiles="deffilep.o pep-dll.o" ;;
+			targ_extra_emuls="i386pe"
+			targ_extra_ofiles="deffilep.o pe-dll.o pep-dll.o"
+			tdir_i386pe=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
 i[3-7]86-*-interix*)	targ_emul=i386pe_posix;
  			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 i[3-7]86-*-beospe*)	targ_emul=i386beos ;;
-- 
2.11.4.GIT