yugui	2009-01-28 20:09:01 +0900 (Wed, 28 Jan 2009)

  New Revision: 21845

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21845

  Log:
    merges r21795 from trunk into ruby_1_9_1.
    * cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
      non-function symbols.  [ruby-core:21582]
    * win32/mkexports.rb (Exports::Mingw#each_export): ditto.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/cygwin/GNUmakefile.in
    branches/ruby_1_9_1/win32/mkexports.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21844)
+++ ruby_1_9_1/ChangeLog	(revision 21845)
@@ -1,3 +1,10 @@
+Tue Jan 27 14:41:33 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
+	  non-function symbols.  [ruby-core:21582]
+
+	* win32/mkexports.rb (Exports::Mingw#each_export): ditto.
+
 Sun Jan 25 12:17:21 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* cygwin/GNUmakefile.in (RUBYDEF): needs read-only section too.
Index: ruby_1_9_1/cygwin/GNUmakefile.in
===================================================================
--- ruby_1_9_1/cygwin/GNUmakefile.in	(revision 21844)
+++ ruby_1_9_1/cygwin/GNUmakefile.in	(revision 21845)
@@ -71,7 +71,7 @@
 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
Index: ruby_1_9_1/win32/mkexports.rb
===================================================================
--- ruby_1_9_1/win32/mkexports.rb	(revision 21844)
+++ ruby_1_9_1/win32/mkexports.rb	(revision 21845)
@@ -143,7 +143,7 @@
 
   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"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/