From c97cb65c4c198fc824a2ba27e3e24b3c8090509c Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 30 Jan 2009 04:22:41 +0000 Subject: [PATCH] merges r21888 from trunk into ruby_1_9_1. * cygwin/GNUmakefile.in (RUBYDEF): adds DATA to non-function symbols which is not marked as T. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ cygwin/GNUmakefile.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 727f5bb36b..aaf43dc946 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 30 12:57:28 2009 Nobuyoshi Nakada + + * cygwin/GNUmakefile.in (RUBYDEF): adds DATA to non-function symbols + which is not marked as T. + Tue Jan 20 16:17:12 2009 Nobuyoshi Nakada * cont.c (ruby_Init_{Continuation_body,Fiber_as_Coroutine}): prefixed diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index f12c46534c..c40e1285a0 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 'if / (?:(T)|[A-Z]) _((?!Init_).*)$$/; puts "#{$$2}#{" DATA" if $$1}"; end' > $@ + -e 'if / (?:(T)|[A-Z]) _((?!Init_).*)$$/; puts "#{$$2}#{" DATA" if !$$1}"; end' > $@ else $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) endif