From 3ec721b9c2a382185b76ebadef317c85e85d9558 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Oct 2010 01:20:11 +0000
Subject: [PATCH] * configure.in (RUBY_MINGW32): canonicalize as like mswin
 version.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  4 ++++
 configure.in | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9cbe32d65a..ebd9702222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 10 10:20:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_MINGW32): canonicalize as like mswin version.
+
 Sun Oct 10 05:33:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_core.h (rb_signal_buff_size, rb_signal_exec): moved
diff --git a/configure.in b/configure.in
index 158a7e65d1..4e9f253847 100644
--- a/configure.in
+++ b/configure.in
@@ -34,10 +34,16 @@ AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
 ], rb_cv_mingw32=yes,rb_cv_mingw32=no)
 rm -f conftest*])
 test "$rb_cv_mingw32" = yes && target_os="mingw32"
-  ])
+])
 AS_CASE(["$target_os"], [mingw*msvc], [
 target_os="`echo ${target_os} | sed 's/msvc$//'`"
-  ])])
+])
+AS_CASE(["$target_cpu"], [x86_64], [
+# canonicalize as like mswin version.  see win32/setup.mak.
+target_cpu=x64
+target_os="`echo ${target_os} | sed 's/32$/64/'`"
+])
+])
 
 AC_DEFUN([RUBY_CPPOUTFILE],
 [AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
@@ -1561,7 +1567,7 @@ fi
 AC_DEFUN(RUBY_STACK_GROW_DIRECTION, [
     AC_CACHE_CHECK(stack growing direction on $1, rb_cv_stack_grow_dir_$1, [
 AS_CASE(["$1"],
-[m68*|x86*|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1],
+[m68*|x86*|x64|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1],
 [hppa*], [ $2=+1],
 [
   AC_TRY_RUN([