You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2013/07/30 00:40:33 UTC

svn commit: r1508221 - /subversion/trunk/build/ac-macros/svn-macros.m4

Author: stefan2
Date: Mon Jul 29 22:40:32 2013
New Revision: 1508221

URL: http://svn.apache.org/r1508221
Log:
Fix the detection of __builtin_constant_p support.
We cannot use __builtin_choose_expr as explained here:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19449

* build/ac-macros/svn-macros.m4
  (AC_DEFUN): simply check that __builtin_constant_p works

Modified:
    subversion/trunk/build/ac-macros/svn-macros.m4

Modified: subversion/trunk/build/ac-macros/svn-macros.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/svn-macros.m4?rev=1508221&r1=1508220&r2=1508221&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/svn-macros.m4 (original)
+++ subversion/trunk/build/ac-macros/svn-macros.m4 Mon Jul 29 22:40:32 2013
@@ -171,8 +171,7 @@ AC_DEFUN([SVN_CHECK_FOR_DUNDER_BUILTINS]
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
       int main(int argc)
       {
-        return (!__builtin_choose_expr(__builtin_constant_p(argc), 1, 0)
-                && __builtin_choose_expr(__builtin_constant_p("foobar"), 1, 0))
+        return (!__builtin_constant_p(argc) && __builtin_constant_p("foobar"))
                ? 0 /* EXIT_SUCCESS */ : 1 /* EXIT_FAILURE */;
       }]])],
       svn_cv_dunder_builtins="yes",