usa	2012-12-20 18:35:51 +0900 (Thu, 20 Dec 2012)

  New Revision: 38501

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38501

  Log:
    merge revision(s) 38134,38136: [Backport #7468]
    
    * gc.h (SET_MACHINE_STACK_END): add volatile for preventing
      harmful optimization.
      harmful optimization.  [ruby-dev:46665] [Bug #7468]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/gc.h
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38500)
+++ ruby_1_9_3/ChangeLog	(revision 38501)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Thu Dec 20 18:35:36 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* gc.h (SET_MACHINE_STACK_END): add volatile for preventing
+	  harmful optimization.  [ruby-dev:46665] [Bug #7468]
+
 Thu Dec 20 18:34:38 2012  Hiroshi Shirosaki  <h.shirosaki@g...>
 
 	* compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw
Index: ruby_1_9_3/gc.h
===================================================================
--- ruby_1_9_3/gc.h	(revision 38500)
+++ ruby_1_9_3/gc.h	(revision 38501)
@@ -3,9 +3,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/gc.h#L3
 #define RUBY_GC_H 1
 
 #if defined(__x86_64__) && defined(__GNUC__)
-#define SET_MACHINE_STACK_END(p) __asm__("movq\t%%rsp, %0" : "=r" (*(p)))
+#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movq\t%%rsp, %0" : "=r" (*(p)))
 #elif defined(__i386) && defined(__GNUC__)
-#define SET_MACHINE_STACK_END(p) __asm__("movl\t%%esp, %0" : "=r" (*(p)))
+#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movl\t%%esp, %0" : "=r" (*(p)))
 #else
 NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
 #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38500)
+++ ruby_1_9_3/version.h	(revision 38501)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 347
+#define RUBY_PATCHLEVEL 348
 
 #define RUBY_RELEASE_DATE "2012-12-20"
 #define RUBY_RELEASE_YEAR 2012

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r38134,38136


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