4 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2dd796962d7..a2ebd3e912b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-09  Ken Brown  <kbrown@cornell.edu>
+
+        * configure.ac (W32_RES_LINK): Remove unneeded linker directive
+        `-Wl,-bpe-i386', which is confusing in the 64-bit case.
+        (Bug#12993)
+
 2013-04-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).
diff --git a/configure.ac b/configure.ac
index 2d8c4c3473d..71e35ec8ff7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1527,7 +1527,7 @@ if test "${with_w32}" != no; then
   W32_RES="emacs.res"
   # Tell the linker that emacs.res is an object (which we compile from
   # the rc file), not a linker script.
-  W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res"
+  W32_RES_LINK="-Wl,emacs.res"
 fi
 AC_SUBST(W32_OBJ)
 AC_SUBST(W32_LIBS)
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3d2c0e172ff..acc74488424 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-09  Ken Brown  <kbrown@cornell.edu>
+
+        * emacs.rc: Use 64-bit manifest for 64-bit Cygwin build.
+        (Bug#12993)
+
 2013-04-01  Eli Zaretskii  <eliz@gnu.org>
 
         * README: A better documentation of ddeclient.exe.
diff --git a/nt/emacs.rc b/nt/emacs.rc
index d2703c45869..81d283f70af 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,6 +1,6 @@
 Emacs ICON   icons/emacs.ico
 32649 CURSOR icons/hand.cur
-#ifdef WIN64
+#if defined (WIN64) || defined (__x86_64__)
 1 24 "emacs-x64.manifest"
 #else
 1 24 "emacs-x86.manifest"