From 80fcb5c583b5b241e3796f10a09cbe8e1dd30b5a Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sat, 23 Jan 2016 23:48:10 +0000 Subject: 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. --- ChangeLog | 5 +++++ config.h.in | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3c30a7298d..bba717acdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-02-22 Dmitry V. Levin + + [BZ #19512] + * config.h.in (HAVE_BUILTIN_EXPECT): New macro. + 2016-02-22 Stefan Liebler * 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 -- cgit 1.4.1