From 191796051046aa5423585fc027a4c8d470c9438d Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 16 Feb 2015 05:14:48 +0000 Subject: configure.in: refine __builtin_choose_expr check * configure.in (__builtin_choose_expr): check more precisely the results. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 6fbc01c3ef..45d8dd212b 100644 --- a/configure.in +++ b/configure.in @@ -2183,8 +2183,16 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap64, [__builtin_bswap64(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_clz, [__builtin_clz(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)]) -RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [__builtin_choose_expr(0, 0, 0)]) -RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr_constant_p, [__builtin_choose_expr(__builtin_constant_p(foo), 0, 0)]) +RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [ + [int x[__extension__(__builtin_choose_expr(1, 1, -1))]]; + [int y[__extension__(__builtin_choose_expr(0, -1, 1))]]; + ]) +if test x$rb_cv_builtin___builtin_choose_expr = xyes; then + RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr_constant_p, [ + [int x[__extension__(__builtin_choose_expr(__builtin_constant_p(1), 1, -1))]]; + [int y[__extension__(__builtin_choose_expr(__builtin_constant_p(foo), -1, 1))]]; + ]) +fi RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)]) if test "$ac_cv_func_qsort_r" != no; then -- cgit v1.2.3