summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 20:32:26 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 20:32:26 +0000
commit889a1bb95e87ad19bd25d0d60838b4f3e85e29fc (patch)
treee601e62bebfe481f7ad561626e41cce6af7a509b
parentaeedcfb39ff5981a0495d6effd749e542950a885 (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_5@16990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--gc.c9
-rw-r--r--version.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/gc.c b/gc.c
index 2e171bd9d74..996713ef199 100644
--- a/gc.c
+++ b/gc.c
@@ -449,12 +449,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
diff --git a/version.h b/version.h
index 658331498a4..f3e6c81b2ae 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 159
+#define RUBY_PATCHLEVEL 160
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8