diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 20:33:10 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 20:33:10 +0000 |
commit | 08a04c815393dccd908a9310428a1a5caa7a8901 (patch) | |
tree | 39ca1099696ba94913b6aeb547f2dad05816775d | |
parent | bd82f4cf5d16f70111bf49840a3eb52b3456bac1 (diff) |
merge revision(s) 14255:
* gc.c (stack_end_address): use local variable address instead of
__builtin_frame_address(0) to avoid SEGV on SunOS 5.11 on x86 with
gcc (GCC) 3.4.3 (csl-sol210-3_4-20050802).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gc.c | 9 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Sun Jun 8 05:32:45 2008 Tanaka Akira <akr@fsij.org> + + * gc.c (stack_end_address): use local variable address instead of + __builtin_frame_address(0) to avoid SEGV on SunOS 5.11 on x86 with + gcc (GCC) 3.4.3 (csl-sol210-3_4-20050802). + Sun Jun 8 05:24:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined @@ -438,12 +438,13 @@ static unsigned int STACK_LEVEL_MAX = 655300; # if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 __attribute__ ((noinline)) # endif -static VALUE * -stack_end_address(void) +static void +stack_end_address(VALUE **stack_end_p) { - return (VALUE *)__builtin_frame_address(0); + VALUE stack_end; + *stack_end_p = &stack_end; } -# define SET_STACK_END VALUE *stack_end = stack_end_address() +# define SET_STACK_END VALUE *stack_end; stack_end_address(&stack_end) # else # define SET_STACK_END VALUE *stack_end = alloca(1) # endif @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 159 +#define RUBY_PATCHLEVEL 160 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |