nagachika	2013-04-26 23:49:26 +0900 (Fri, 26 Apr 2013)

  New Revision: 40485

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

  Log:
    merge revision(s) 40476: [Backport #8332]
    
    * thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
      This fixes a compilation failure while cross-compiling for ARM.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/thread_pthread.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40484)
+++ ruby_2_0_0/ChangeLog	(revision 40485)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Apr 26 23:48:58 2013  Tanaka Akira  <akr@f...>
+
+	* thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
+	  This fixes a compilation failure while cross-compiling for ARM.
+
 Fri Apr 26 23:32:09 2013  Kouhei Sutou  <kou@c...>
 
 	* lib/rss/atom.rb (RSS::Atom::Entry): Fix indent of document comment.
Index: ruby_2_0_0/thread_pthread.c
===================================================================
--- ruby_2_0_0/thread_pthread.c	(revision 40484)
+++ ruby_2_0_0/thread_pthread.c	(revision 40485)
@@ -687,6 +687,7 @@ ruby_init_stack(volatile VALUE *addr https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L687
     /* it should be on co-routine (alternative stack). [Feature #2294] */
     {
 	void *start, *end;
+	STACK_GROW_DIR_DETECTION;
 
 	if (IS_STACK_DIR_UPPER()) {
 	    start = native_main_thread.stack_start;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40484)
+++ ruby_2_0_0/version.h	(revision 40485)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-26"
-#define RUBY_PATCHLEVEL 171
+#define RUBY_PATCHLEVEL 172
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40476


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