summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in4
-rw-r--r--version.h2
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 <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* 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 <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])
])
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