summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-26 13:59:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-26 13:59:48 +0000
commitae9264678cfde7bcc27d20d70c7643d2704a8dbd (patch)
treee1917f506fff0de4d4a9836d6ae7c084e59661da /tool
parent7b77b436f088ca41405390a5b1d55056cb8ac3b7 (diff)
* 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
Diffstat (limited to 'tool')
-rwxr-xr-xtool/config.sub15
1 files changed, 14 insertions, 1 deletions
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