1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-02-01 17:58:02 +00:00
parent 2558571db1
commit 3fb0936a98
2 changed files with 6 additions and 5 deletions

View file

@ -780,7 +780,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("Bus Error" MESSAGE_FAULT_ADDRESS);

View file

@ -1,10 +1,10 @@
#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"