From: Paul Eggert Date: Sat, 17 Dec 2016 00:47:26 +0000 (-0800) Subject: builtin-expect: port to IBM XL C X-Git-Tag: v1.0~6488 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d1469b79e1766568957f52b54b82f152d2c90f9a;p=gnulib.git 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 * m4/builtin-expect.m4 (gl___BUILTIN_EXPECT): Also allow __builtin_expect defined via a standard include file. --- diff --git a/ChangeLog b/ChangeLog index aba7199677..2c44748f6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2016-12-16 Paul Eggert + 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 + * m4/builtin-expect.m4 (gl___BUILTIN_EXPECT): + Also allow __builtin_expect defined via a standard include file. + regex: fix dependency Problem reported by Bruno Haible in: http://lists.gnu.org/archive/html/bug-gnulib/2016-12/msg00073.html diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4 index 5f7a323112..ce048ae481 100644 --- a/m4/builtin-expect.m4 +++ b/m4/builtin-expect.m4 @@ -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_LANG_SOURCE([AC_INCLUDES_DEFAULT[ int main (int argc, char **argv) { @@ -25,7 +25,8 @@ AC_DEFUN([gl___BUILTIN_EXPECT], AC_DEFINE([HAVE___BUILTIN_EXPECT], [1]) fi AH_VERBATIM([HAVE___BUILTIN_EXPECT], - [/* Define to 1 if the compiler understands __builtin_expect. */ + [/* Define to 1 if the compiler or standard include files support + __builtin_expect. */ #undef HAVE___BUILTIN_EXPECT #ifndef HAVE___BUILTIN_EXPECT # define __builtin_expect(e, c) (e)