summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-27 05:41:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-27 05:41:38 +0000
commit9c29032c7316c1e6f876c497f0eb80b62b32ba16 (patch)
tree69b226645215d2c14766c63747fbaa713ce0c69c
parentd9cb14ad088f4c56feb6f446ce3c898e2c0c0f5e (diff)
* cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
non-function symbols. [ruby-core:21582] * win32/mkexports.rb (Exports::Mingw#each_export): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--cygwin/GNUmakefile.in2
-rwxr-xr-xwin32/mkexports.rb2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d4cdbe..14d3c54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 27 14:41:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
+ non-function symbols. [ruby-core:21582]
+
+ * win32/mkexports.rb (Exports::Mingw#each_export): ditto.
+
Tue Jan 27 12:59:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
* ext/ripper/depend: use VPATH.
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 1da2bfc..f12c465 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -71,7 +71,7 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
ifeq (@target_os@,cygwin)
@NM@ --extern --defined $(LIBRUBY_A) | \
$(MINIRUBY) -n -e 'BEGIN{puts "VERSION $(MAJOR).$(MINOR)","EXPORTS"}' \
- -e 'puts $$1 if / [A-Z] _((?!Init_).*)$$/' > $@
+ -e 'if / (?:(T)|[A-Z]) _((?!Init_).*)$$/; puts "#{$$2}#{" DATA" if $$1}"; end' > $@
else
$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
endif
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 966b602..4d7eeb5 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -143,7 +143,7 @@ class Exports::Mingw < Exports
def each_export(objs)
objdump(objs) do |l|
- yield $1 if / [[:upper:]] _((?!Init_).*)$/ =~ l
+ yield $2, !$1 if /\s(?:(T)|[[:upper:]])\s_((?!Init_).*)$/ =~ l
end
yield "strcasecmp", "_stricmp"
yield "strncasecmp", "_strnicmp"