nagachika	2014-05-28 23:54:49 +0900 (Wed, 28 May 2014)

  New Revision: 46215

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

  Log:
    merge revision(s) r45716: [Backport #9665]
    
    * configure.in (rb_cv_func___builtin_unreachable): try with an
      external variable not only by a warning, which might not be
      shown due to the optimization.  [ruby-core:61647] [Bug #9665]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 46214)
+++ ruby_2_1/configure.in	(revision 46215)
@@ -1548,8 +1548,8 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L1548
 
     AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
     [RUBY_WERROR_FLAG(
-    [AC_TRY_LINK([@%:@include <stdlib.h>],
-	[exit(0); __builtin_unreachable();],
+    [AC_TRY_LINK([volatile int zero;],
+	[if (zero) __builtin_unreachable();],
 	[rb_cv_func___builtin_unreachable=yes],
 	[rb_cv_func___builtin_unreachable=no])
     ])
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46214)
+++ ruby_2_1/ChangeLog	(revision 46215)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed May 28 23:47:22 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (rb_cv_func___builtin_unreachable): try with an
+	  external variable not only by a warning, which might not be
+	  shown due to the optimization.  [ruby-core:61647] [Bug #9665]
+
 Wed May 28 23:40:57 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46214)
+++ ruby_2_1/version.h	(revision 46215)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-05-28"
-#define RUBY_PATCHLEVEL 114
+#define RUBY_PATCHLEVEL 115
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45716


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