Select 32-bit pei for 64-bit pei configurations.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7edf3903d57f34809596c06e7aa1137318b032d9..26d45ff0bf3f23691af45122c1e09dba209efe6b 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-02  Richard Henderson  <rth@redhat.com>
+
+       * config.bfd (x86_64-*-mingw*): Select 32-bit pei vectors too.
+
 2010-09-01  Pedro Alves  <pedro@codesourcery.com>
 
        * netbsd-core.c (netbsd_core_core_file_pid): Renamed to ...

diff --git a/bfd/config.bfd b/bfd/config.bfd
index 0bfb53541aace90e1d316ec6bce16c1adaceb564..e42535f91aaed0a900ecfa66a7c3b42a37613eec 100644 (file)
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -634,7 +634,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_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec i386pe_vec i386pei_vec bfd_elf32_i386_vec"
     want64=true
     targ_underscore=no
     ;;

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c3a1d1cef66d22aacd51e262bd9574c8314330da..43858f4e9673c4c54244ea91b3eda6d01944df61 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-02  Richard Henderson  <rth@redhat.com>
+
+       * configure.tgt (x86_64-*-mingw*): Add 32-bit pe emulations too.
+
 2010-08-31  Nick Clifton  <nickc@redhat.com>
 
        * ldlex.l (WILDCHAR): Add the caret and exclamation point

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 9bbb702a0a49ecedc12a069fa9d3c22e39eb7ce6..61ab9402c6189bd9851e49ca7c6145e1433d9dfc 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -275,7 +275,8 @@ i[3-7]86-*-cygwin*) targ_emul=i386pe ;
 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 pep-dll.o pe-dll.o" ;;
 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 ;;