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.
This commit is contained in:
Dmitry V. Levin 2016-01-23 23:48:10 +00:00
parent de6e5df27e
commit 80fcb5c583
2 changed files with 10 additions and 0 deletions

View File

@ -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.

View File

@ -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