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_0_0@49625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 3 insertions, 2 deletions

diff --git a/signal.c b/signal.c
index 9f966043c0..ff6828ea28 100644
--- a/signal.c
+++ b/signal.c
@@ -648,7 +648,8 @@ sigbus(int sig SIGINFO_ARG)
  * and it's delivered as SIGBUS instaed 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");
diff --git a/version.h b/version.h
index 7515e891af..c6d19fe62b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2015-02-17"
-#define RUBY_PATCHLEVEL 631
+#define RUBY_PATCHLEVEL 632
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2