2010/9/27, Luis Lavena <luislavena / gmail.com>: >> If you mean "[x86_64-mingw64] is wrong. It should be >> [x86_64-mingw32]", please teach me why. > > mingw32 is like darwin or linux, is the platform. It stagnated as > mingw32 even for the 64bits counterpart. Sorry for my mistake. Is this patch to r29350 right? diff --git a/tool/config.sub b/tool/config.sub index 9da347f..a6b5ae1 100755 --- a/tool/config.sub +++ b/tool/config.sub @@ -319,9 +319,6 @@ 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 @@ -744,7 +741,7 @@ case $basic_machine in ;; mingw64) basic_machine=x86_64-pc - os=-mingw64 + os=-mingw32 ;; mingw32ce) basic_machine=arm-unknown @@ -1312,13 +1309,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,9 +1696,7 @@ 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 diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 86ba979..1317f1b 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" -- wanabe