nagachika	2015-02-02 02:58:02 +0900 (Mon, 02 Feb 2015)

  New Revision: 49467

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

  Log:
    merge revision(s) r49463: [Backport #10814]
    
    signal.c: SIGBUS by stack overflow on Funtoo
    
    * signal.c (sigbus): seems that Funtoo Linux also delivers SIGBUS
      at stack overflow.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/signal.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49466)
+++ ruby_2_1/version.h	(revision 49467)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-01-22"
-#define RUBY_PATCHLEVEL 285
+#define RUBY_RELEASE_DATE "2015-02-02"
+#define RUBY_PATCHLEVEL 286
 
 #define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 2
 
 #include "ruby/version.h"
 
Index: ruby_2_1/signal.c
===================================================================
--- ruby_2_1/signal.c	(revision 49466)
+++ ruby_2_1/signal.c	(revision 49467)
@@ -780,7 +780,8 @@ sigbus(int sig SIGINFO_ARG) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/signal.c#L780
  * and it's delivered as SIGBUS instead of SIGSEGV to userland. It's crazy
  * wrong IMHO. but anyway we have to care it. Sigh.
  */
-#if defined __APPLE__
+    /* Seems Linux also delivers SIGBUS. */
+#if defined __APPLE__ || defined __linux__
     CHECK_STACK_OVERFLOW();
 #endif
     rb_bug("Bus Error" MESSAGE_FAULT_ADDRESS);

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49463


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