shyouhei	2008-06-08 05:32:26 +0900 (Sun, 08 Jun 2008)

  New Revision: 16990

  Modified files:
    branches/ruby_1_8_5/gc.c
    branches/ruby_1_8_5/version.h

  Log:
    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).


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16990&r2=16989&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/gc.c?r1=16990&r2=16989&diff_format=u

Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16989)
+++ ruby_1_8_5/version.h	(revision 16990)
@@ -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
Index: ruby_1_8_5/gc.c
===================================================================
--- ruby_1_8_5/gc.c	(revision 16989)
+++ ruby_1_8_5/gc.c	(revision 16990)
@@ -449,12 +449,13 @@
 #  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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/