]> Savannah Git Hosting - gnulib.git/commitdiff
builtin-expect: improve port to IBM XL C
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2016 02:20:21 +0000 (18:20 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2016 02:21:01 +0000 (18:21 -0800)
Problem reported for z/OS by Daniel Richard G. in:
http://lists.gnu.org/archive/html/bug-gnulib/2016-12/msg00079.html
* m4/builtin-expect.m4 (gl___BUILTIN_EXPECT):
Test for <builtins.h> directly.

ChangeLog
m4/builtin-expect.m4

index 2c44748f6e979acd2200aedb93f6579e3b356c94..fc8bef9bdc2ca000489ae2b6b2f9e8d79980f8c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-12-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+       builtin-expect: improve port to IBM XL C
+       Problem reported for z/OS by Daniel Richard G. in:
+       http://lists.gnu.org/archive/html/bug-gnulib/2016-12/msg00079.html
+       * m4/builtin-expect.m4 (gl___BUILTIN_EXPECT):
+       Test for <builtins.h> directly.
+
        builtin-expect: port to IBM XL C
        Problem reported for z/OS by Daniel Richard G. in:
        http://lists.gnu.org/archive/html/bug-gnulib/2016-12/msg00074.html
index ce048ae4815f5ad1e79501072d8ef6b1936b0187..e448066c9ac0ce4db11920ce6b33adda8443751f 100644 (file)
@@ -12,7 +12,7 @@ AC_DEFUN([gl___BUILTIN_EXPECT],
   AC_CACHE_CHECK([for __builtin_expect],
     [gl_cv___builtin_expect],
     [AC_LINK_IFELSE(
-       [AC_LANG_SOURCE([AC_INCLUDES_DEFAULT[
+       [AC_LANG_SOURCE([[
          int
          main (int argc, char **argv)
          {
@@ -20,16 +20,30 @@ AC_DEFUN([gl___BUILTIN_EXPECT],
            return argv[argc != 100][0];
          }]])],
        [gl_cv___builtin_expect=yes],
-       [gl_cv___builtin_expect=no])])
+       [AC_LINK_IFELSE(
+          [AC_LANG_SOURCE([[
+             #include <builtins.h>
+             int
+             main (int argc, char **argv)
+             {
+               argc = __builtin_expect (argc, 100);
+               return argv[argc != 100][0];
+             }]])],
+          [gl_cv___builtin_expect="in <builtins.h>"],
+          [gl_cv___builtin_expect=no])])])
   if test "$gl_cv___builtin_expect" = yes; then
     AC_DEFINE([HAVE___BUILTIN_EXPECT], [1])
+  elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
+    AC_DEFINE([HAVE___BUILTIN_EXPECT], [2])
   fi
   AH_VERBATIM([HAVE___BUILTIN_EXPECT],
-    [/* Define to 1 if the compiler or standard include files support
-   __builtin_expect.  */
+    [/* Define to 1 if the compiler supports __builtin_expect,
+   and to 2 if <builtins.h> does.  */
 #undef HAVE___BUILTIN_EXPECT
 #ifndef HAVE___BUILTIN_EXPECT
 # define __builtin_expect(e, c) (e)
+#elif HAVE___BUILTIN_EXPECT == 2
+# include <builtins.h>
 #endif
     ])
 ])