From ae9264678cfde7bcc27d20d70c7643d2704a8dbd Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 26 Sep 2010 13:59:48 +0000
Subject: [PATCH] * tool/config.sub (x86_64-pc-mingw64): regularize.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       |  4 ++++
 tool/config.sub | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 24f66a837c..3660a128f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 26 22:59:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config.sub (x86_64-pc-mingw64): regularize.
+
 Sun Sep 26 22:21:07 2010  wanabe  <s.wanabe@gmail.com>
 
 	* ext/openssl/ossl_hmac.c (ossl_hmac_hexdigest, ossl_hmac_s_hexdigest),
diff --git a/tool/config.sub b/tool/config.sub
index b44485cccf..9da347fe74 100755
--- a/tool/config.sub
+++ b/tool/config.sub
@@ -319,6 +319,9 @@ case $basic_machine in
 	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
+	i?86-w64)
+	  basic_machine=x86_64-pc
+	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -1299,7 +1302,7 @@ case $os in
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -mingw64* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -1309,6 +1312,13 @@ case $os in
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-mingw64*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			basic_machine=x86_64-pc
+			;;
+		esac
+		;;
 	-qnx*)
 		case $basic_machine in
 		    x86-* | i*86-*)
@@ -1696,6 +1706,9 @@ case $basic_machine in
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
+	x86_64*)
+		os=`echo $os | sed 's/32/64/'`
+		;;
 esac
 
 echo $basic_machine$os