about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--config.h.in5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c30a7298d..bba717acdd 100644
--- 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 ec9c8bc767..13c0044a69 100644
--- 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