shyouhei	2008-06-29 18:18:50 +0900 (Sun, 29 Jun 2008)

  New Revision: 17678

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/eval.c
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 17547:
    * eval.c (PUSH_FRAME, PUSH_CLASS): Add volatile to avoid a
      possible optimization bug on OS X/PPC.  This at least makes
      build with gcc -O1 and `make test' pass.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17678&r2=17677&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17678&r2=17677&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/eval.c?r1=17678&r2=17677&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17677)
+++ ruby_1_8_6/ChangeLog	(revision 17678)
@@ -1,3 +1,9 @@
+Sun Jun 29 17:34:11 2008  Akinori MUSHA  <knu@i...>
+
+	* eval.c (PUSH_FRAME, PUSH_CLASS): Add volatile to avoid a
+	  possible optimization bug on OS X/PPC.  This at least makes
+	  build with gcc -O1 and `make test' pass.
+
 Sun Jun 29 17:23:51 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17677)
+++ ruby_1_8_6/version.h	(revision 17678)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 245
+#define RUBY_PATCHLEVEL 246
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/eval.c
===================================================================
--- ruby_1_8_6/eval.c	(revision 17677)
+++ ruby_1_8_6/eval.c	(revision 17678)
@@ -761,7 +761,7 @@
 static unsigned long frame_unique = 0;
 
 #define PUSH_FRAME() do {		\
-    struct FRAME _frame;		\
+    volatile struct FRAME _frame;	\
     _frame.prev = ruby_frame;		\
     _frame.tmp  = 0;			\
     _frame.node = ruby_current_node;	\
@@ -1058,7 +1058,7 @@
 static VALUE ruby_wrapper;	/* security wrapper */
 
 #define PUSH_CLASS(c) do {		\
-    VALUE _class = ruby_class;		\
+    volatile VALUE _class = ruby_class;	\
     ruby_class = (c)
 
 #define POP_CLASS() ruby_class = _class; \

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