naruse	2015-02-06 20:34:37 +0900 (Fri, 06 Feb 2015)

  New Revision: 49530

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

  Log:
    merge revision(s) 49463: [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_2/
  Modified files:
    branches/ruby_2_2/signal.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49529)
+++ ruby_2_2/version.h	(revision 49530)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-06"
-#define RUBY_PATCHLEVEL 42
+#define RUBY_PATCHLEVEL 43
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_2/signal.c
===================================================================
--- ruby_2_2/signal.c	(revision 49529)
+++ ruby_2_2/signal.c	(revision 49530)
@@ -848,7 +848,8 @@ sigbus(int sig SIGINFO_ARG) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/signal.c#L848
  * 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_context(SIGINFO_CTX, "Bus Error" MESSAGE_FAULT_ADDRESS);

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


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