ruby-changes:37544
From: usa <ko1@a...>
Date: Tue, 17 Feb 2015 17:55:09 +0900 (JST)
Subject: [ruby-changes:37544] usa:r49625 (ruby_2_0_0): merge revision(s) 49463: [Backport #10814]
usa 2015-02-17 17:55:01 +0900 (Tue, 17 Feb 2015) New Revision: 49625 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49625 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_0_0/ Modified files: branches/ruby_2_0_0/signal.c branches/ruby_2_0_0/version.h Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 49624) +++ ruby_2_0_0/version.h (revision 49625) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #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 Index: ruby_2_0_0/signal.c =================================================================== --- ruby_2_0_0/signal.c (revision 49624) +++ ruby_2_0_0/signal.c (revision 49625) @@ -648,7 +648,8 @@ sigbus(int sig SIGINFO_ARG) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/signal.c#L648 * 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"); Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r49463 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/