diff options
| author | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-03 15:06:23 +0000 |
|---|---|---|
| committer | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-03 15:06:23 +0000 |
| commit | a21409ff5f3347c3ab79386412d950561d560749 (patch) | |
| tree | 1f8a5a3b6b132e5e659ba603d636cdfc5b44a099 /tool | |
| parent | 65119c75b0fadd63d330af82b066ff11eb3a6091 (diff) | |
* tool/config.sub: revert r29320, r29324, r29347, r29354, r29365
to automake-1.11.1. [ruby-core:32634]
* win32/mkexports.rb: no longer use 'mingw64'. a patch from Luis Lavena
at [ruby-core:32678].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/config.sub | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/tool/config.sub b/tool/config.sub index b8d3d323cf..2a55a50751 100755 --- a/tool/config.sub +++ b/tool/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2010-09-29' +timestamp='2009-11-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -319,9 +319,6 @@ case $basic_machine in i*86 | x86_64) basic_machine=$basic_machine-pc ;; - i?86-w64 | x86_64-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 @@ -742,10 +739,6 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; mingw32ce) basic_machine=arm-unknown os=-mingw32ce @@ -1312,13 +1305,6 @@ 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-*) @@ -1706,10 +1692,6 @@ case $basic_machine in esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; - x86_64-pc) - basic_machine=`echo $basic_machine | sed 's/^x86_/x/'` - os=`echo $os | sed '/[a-z]32$/s/32$//;/[a-z]64/s/64$//'` - ;; esac echo $basic_machine$os |