bfd/ChangeLog:

2009-06-07  Robert Millan  <rmh@aybabtu.com>

	* config.bfd: Build amd64 targets for i[3-7]86-mingw32.

gas/ChangeLog:

2009-06-07  Robert Millan  <rmh@aybabtu.com>

	* configure.tgt: Use `pep' emulation on i386-*-mingw*.

Index: bfd/config.bfd
===================================================================
RCS file: /cvs/src/src/bfd/config.bfd,v
retrieving revision 1.250
diff -u -p -r1.250 config.bfd
--- bfd/config.bfd	5 Jun 2009 09:19:44 -0000	1.250
+++ bfd/config.bfd	7 Jun 2009 21:23:17 -0000
@@ -685,6 +685,7 @@ case "${targ}" in
   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"
+    targ64_selvecs="x86_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec"
     targ_underscore=yes
     ;;
   i[3-7]86-none-*)
Index: gas/configure.tgt
===================================================================
RCS file: /cvs/src/src/gas/configure.tgt,v
retrieving revision 1.48
diff -u -p -r1.48 configure.tgt
--- gas/configure.tgt	16 Apr 2009 15:39:44 -0000	1.48
+++ gas/configure.tgt	7 Jun 2009 21:23:17 -0000
@@ -223,11 +223,7 @@ case ${generic_target} in
   i386-*-pe)				fmt=coff em=pe ;;
   i386-*-cygwin*)			fmt=coff em=pe ;;
   i386-*-interix*)			fmt=coff em=interix ;;
-  i386-*-mingw*)
-    case ${cpu} in
-      x86_64*)				fmt=coff em=pep ;;
-      i*)				fmt=coff em=pe ;;
-    esac ;;
+  i386-*-mingw*)			fmt=coff em=pep ;;
   i386-*-nto-qnx*)			fmt=elf ;;
   i386-*-*nt*)				fmt=coff em=pe ;;
   i386-*-chaos)				fmt=elf ;;