From e4bb7513f73ad554bfcd15108d02168a50bc5d9f Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 6 Feb 2015 11:34:37 +0000
Subject: 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 signal.c  | 3 ++-
 version.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/signal.c b/signal.c
index 30769c164d..dcce2b2f2d 100644
--- a/signal.c
+++ b/signal.c
@@ -848,7 +848,8 @@ sigbus(int sig SIGINFO_ARG)
  * 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);
diff --git a/version.h b/version.h
index 9d932e6a29..a89fb7c2fd 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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
-- 
cgit v1.2.3