ruby-changes:34120
From: usa <ko1@a...>
Date: Wed, 28 May 2014 13:25:04 +0900 (JST)
Subject: [ruby-changes:34120] usa:r46201 (ruby_2_0_0): merge revision(s) 45716: [Backport #9665]
usa 2014-05-28 13:24:54 +0900 (Wed, 28 May 2014) New Revision: 46201 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=46201 Log: merge revision(s) 45716: [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_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/configure.in branches/ruby_2_0_0/version.h Index: ruby_2_0_0/configure.in =================================================================== --- ruby_2_0_0/configure.in (revision 46200) +++ ruby_2_0_0/configure.in (revision 46201) @@ -1371,8 +1371,8 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L1371 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_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 46200) +++ ruby_2_0_0/ChangeLog (revision 46201) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Wed May 28 13:24:39 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 13:20:32 2014 Nobuyoshi Nakada <nobu@r...> * ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 46200) +++ ruby_2_0_0/version.h (revision 46201) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-05-28" -#define RUBY_PATCHLEVEL 489 +#define RUBY_PATCHLEVEL 490 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 5 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r45716 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/