From 3c508c9d9b1fed041c0efae7d996056efdf2fd50 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 28 May 2014 04:24:54 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ configure.in | 4 ++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e8ee089c7..f4463eda17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed May 28 13:24:39 2014 Nobuyoshi Nakada + + * 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 * ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value diff --git a/configure.in b/configure.in index f49a34c981..402919d174 100644 --- a/configure.in +++ b/configure.in @@ -1371,8 +1371,8 @@ if test "$GCC" = yes; then AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable, [RUBY_WERROR_FLAG( - [AC_TRY_LINK([@%:@include ], - [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]) ]) diff --git a/version.h b/version.h index cf42b43eb6..163207e63f 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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 -- cgit v1.2.3