This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-33-g80fcb5c
- From: ldv at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Feb 2016 22:03:28 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-33-g80fcb5c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 80fcb5c583b5b241e3796f10a09cbe8e1dd30b5a (commit)
from de6e5df27ead590c7f590a63665cb87764cf6de3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=80fcb5c583b5b241e3796f10a09cbe8e1dd30b5a
commit 80fcb5c583b5b241e3796f10a09cbe8e1dd30b5a
Author: Dmitry V. Levin <ldv@altlinux.org>
Date: Sat Jan 23 23:48:10 2016 +0000
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 3c30a72..bba717a 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 ec9c8bc..13c0044 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
config.h.in | 5 +++++
2 files changed, 10 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources