kosaki	2011-07-24 00:19:38 +0900 (Sun, 24 Jul 2011)

  New Revision: 32648

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

  Log:
    merge revision(s) 32647:
    
    * configure.in: changed default optflags to -O0 if the compiler is
      llvm-gcc. It prevent ruby crash on OS X 10.7 (Lion).

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/configure.in
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 32647)
+++ ruby_1_9_3/configure.in	(revision 32648)
@@ -277,7 +277,13 @@
 AC_SUBST(GCC)
 if test "$GCC" = yes; then
     linker_flag=-Wl,
-    : ${optflags=-O3}
+    if test "$CC -v 2>&1 | grep LLVM" ; then
+	# llvm-gcc's optimization strategy is far different from gcc.
+	# It makes confusing our gcc specific optimized code.
+	: ${optflags=-O0}
+    else
+	: ${optflags=-O3}
+    fi
     AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
     RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
 else
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32647)
+++ ruby_1_9_3/ChangeLog	(revision 32648)
@@ -1,3 +1,8 @@
+Sun Jul 24 00:19:13 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* configure.in: changed default optflags to -O0 if the compiler is
+	  llvm-gcc. It prevent ruby crash on OS X 10.7 (Lion).
+
 Sat Jul 23 17:06:25 2011  Tanaka Akira  <akr@f...>
 
 	* io.c (rb_update_max_fd): validate fd.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 32647)
+++ ruby_1_9_3/version.h	(revision 32648)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-07-23"
+#define RUBY_RELEASE_DATE "2011-07-24"
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 

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