shyouhei	2008-06-15 19:52:03 +0900 (Sun, 15 Jun 2008)

  New Revision: 17192

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

  Log:
    merge revision(s) 15548:
    * gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed.  [ruby-dev:33857]


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

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17191)
+++ ruby_1_8_5/ChangeLog	(revision 17192)
@@ -1,3 +1,7 @@
+Sun Jun 15 19:51:37 2008  Tanaka Akira  <akr@f...>
+
+	* gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed.  [ruby-dev:33857]
+
 Sun Jun 15 19:49:10 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/readline/readline.c (readline_event): prevent polling.  based on
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17191)
+++ ruby_1_8_5/version.h	(revision 17192)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 181
+#define RUBY_PATCHLEVEL 182
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/gc.c
===================================================================
--- ruby_1_8_5/gc.c	(revision 17191)
+++ ruby_1_8_5/gc.c	(revision 17192)
@@ -464,9 +464,7 @@
 # endif
 # define STACK_END (stack_end)
 #endif
-#if defined(sparc) || defined(__sparc__)
-# define STACK_LENGTH  (rb_gc_stack_start - STACK_END + 0x80)
-#elif STACK_GROW_DIRECTION < 0
+#if STACK_GROW_DIRECTION < 0
 # define STACK_LENGTH  (rb_gc_stack_start - STACK_END)
 #elif STACK_GROW_DIRECTION > 0
 # define STACK_LENGTH  (STACK_END - rb_gc_stack_start + 1)

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