intl: reintroduce unintentionally disabled optimization

HAVE_BUILTIN_EXPECT macro was removed by commit glibc-2.14-280-g3ce1f29,
but then its use was unintentionally reintroduced during merge with GNU
gettext 0.19.3 by commit glibc-2.20-324-g6d24885, effectively disabling
all optimization based on __builtin_expect.  As intl files are also part
of GNU gettext, HAVE_BUILTIN_EXPECT macro cannot be removed, so define
it unconditionally in config.h.in instead.

[BZ #19512]
* config.h.in (HAVE_BUILTIN_EXPECT): New macro.

diff --git a/ChangeLog b/ChangeLog
index 3c30a7298d53c0db79a1227398ab466e5fde16a2..bba717acdd895c284bb50570eae9a7efdbc4439e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-22  Dmitry V. Levin  <ldv@altlinux.org>
+
+       [BZ #19512]
+       * config.h.in (HAVE_BUILTIN_EXPECT): New macro.
+
 2016-02-22  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
        * posix/tst-dir.c: Include libc-internal.h.

diff --git a/config.h.in b/config.h.in
index ec9c8bc767bb2df8bdcdfeae482f88908c7f1d4e..13c0044a69cf22dcb9a0843f0068775e72f37257 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -37,6 +37,11 @@
 /* Define if static NSS modules are wanted.  */
 #undef DO_STATIC_NSS
 
+/* Assume that the compiler supports __builtin_expect.
+   This macro is necessary for proper compilation of code
+   shared between GNU libc and GNU gettext projects.  */
+#define HAVE_BUILTIN_EXPECT 1
+
 /* Define if the compiler supports __builtin_memset.  */
 #undef HAVE_BUILTIN_MEMSET