summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-30 04:22:41 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-30 04:22:41 +0000
commitec39520a3f3f4c3f2f7e9c0cbeccb1b5be181703 (patch)
tree3aeb5e75e1cab843fe44c82934986573a83db994
parent49dba68d479e47ada0b117296db900780570c620 (diff)
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--cygwin/GNUmakefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 727f5bb36..aaf43dc94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 30 12:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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 <nobu@ruby-lang.org>
* cont.c (ruby_Init_{Continuation_body,Fiber_as_Coroutine}): prefixed
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index f12c46534..c40e1285a 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