From 00a1a4c1078159e8f288e87f628de5fe4bf09dcb Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Tue, 9 Mar 2010 17:38:30 +0900
Subject: [PATCH] Bug 550811 - bustage on Windows x64 buiild for js-ctypes.
 r=ted

---
 configure.in              | 11 ++++++++++-
 js/ctypes/libffi/msvcc.sh |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 64aec01f3723..7765b37e7d7b 100644
--- a/configure.in
+++ b/configure.in
@@ -8738,7 +8738,16 @@ if test "$BUILD_CTYPES"; then
   if test "$_MSC_VER"; then
     # Use a wrapper script for cl and ml that looks more like gcc.
     # autotools can't quite handle an MSVC build environment yet.
-    ac_configure_args="$ac_configure_args CC=$_topsrcdir/js/ctypes/libffi/msvcc.sh LD=link CPP=\"cl -nologo -EP\" SHELL=sh.exe"
+    ac_configure_args="$ac_configure_args LD=link CPP=\"cl -nologo -EP\" SHELL=sh.exe"
+    case "${target_cpu}" in
+    x86_64)
+      # Need target since MSYS tools into mozilla-build may be 32bit
+      ac_configure_args="$ac_configure_args CC=\"$_topsrcdir/js/ctypes/libffi/msvcc.sh -m64\" --build=$build --host=$target"
+      ;;
+    *)
+      ac_configure_args="$ac_configure_args CC=$_topsrcdir/js/ctypes/libffi/msvcc.sh"
+      ;;
+    esac
   fi
   if test "$SOLARIS_SUNPRO_CC"; then
     # Always use gcc for libffi on Solaris
diff --git a/js/ctypes/libffi/msvcc.sh b/js/ctypes/libffi/msvcc.sh
index 83018397f02f..d7a599b7b8e5 100755
--- a/js/ctypes/libffi/msvcc.sh
+++ b/js/ctypes/libffi/msvcc.sh
@@ -44,7 +44,7 @@
 
 # Disable specific warnings, and enable warnings-as-errors so we catch any
 # mistranslated args.
-nowarn="-wd4127 -wd4820 -wd4706 -wd4100 -wd4255 -wd4668 -wd4053 -wd4324"
+nowarn="-wd4127 -wd4820 -wd4706 -wd4100 -wd4255 -wd4668 -wd4053 -wd4324 -wd4267 -wd4054"
 args="-nologo -W3 -WX $nowarn"
 md=-MD
 cl="cl"