This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch gentoo/2.23 updated. glibc-2.23-17-g939f860
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 Mar 2016 22:09:29 -0000
- Subject: GNU C Library master sources branch gentoo/2.23 updated. glibc-2.23-17-g939f860
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, gentoo/2.23 has been updated
via 939f86004862d36b3bba15167b02047135e22e46 (commit)
from 4b06de856395d37848fc97bbc032c8c3dce5eb52 (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=939f86004862d36b3bba15167b02047135e22e46
commit 939f86004862d36b3bba15167b02047135e22e46
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Mar 3 14:51:40 2016 -0800
Or bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS
We should turn on bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS without
overriding other bits.
[BZ #19758]
* sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
(EXTRA_LD_ENVVARS): Or bit_Prefer_MAP_32BIT_EXEC.
(cherry picked from commit 33ab2ad58eba55de05a05f4adb795e1c172024bb)
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
index c9db5ea..a759934 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
@@ -33,7 +33,7 @@
case 21: \
if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
GLRO(dl_x86_cpu_features).feature[index_Prefer_MAP_32BIT_EXEC] \
- = bit_Prefer_MAP_32BIT_EXEC; \
+ |= bit_Prefer_MAP_32BIT_EXEC; \
break;
/* Extra unsecure variables. The names are all stuffed in a single
-----------------------------------------------------------------------
Summary of changes:
sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources