diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | tool/config.sub | 20 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 12 |
3 files changed, 11 insertions, 29 deletions
@@ -1,3 +1,11 @@ +Mon Oct 4 00:01:53 2010 wanabe <s.wanabe@gmail.com> + + * 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]. + Sun Oct 3 20:36:37 2010 Akio Tajima (arton) <artonx@yahoo.co.jp> * test/win32ole/test_folderitem2_invokeverb.rb: Change creating shortcut verb to 'Link' [Bug #3339] 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 diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 86ba979ddf..1317f1b601 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -149,19 +149,11 @@ class Exports::Cygwin < Exports end end -class Exports::Mingw32 < Exports::Cygwin - def each_export(objs) - super - yield "strcasecmp", "_stricmp" - yield "strncasecmp", "_strnicmp" - end -end - -class Exports::Mingw64 < Exports::Cygwin +class Exports::Mingw < Exports::Cygwin def each_export(objs) objdump(objs) do |l| next if /@.*@/ =~ l - yield $2, !$1 if /\s(?:(T)|[[:upper:]])\s_?((?!Init_|.*_threadptr_|DllMain[@\n]).*)$/ =~ l + yield $2, !$1 if /\s(?:(T)|[[:upper:]])\s_?((?!_?Init_|_?.*_threadptr_|_?DllMain[@\n]).*)$/ =~ l end yield "strcasecmp", "_stricmp" yield "strncasecmp", "_strnicmp" |