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-49-ga475427
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 3 Mar 2016 22:53:23 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-49-ga475427
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 a4754272958a8368701bb2a8d6b0c224fe3b4e73 (commit)
from e5d6bc61cbbc59302c35bdceac5e0dec26cdc872 (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=a4754272958a8368701bb2a8d6b0c224fe3b4e73
commit a4754272958a8368701bb2a8d6b0c224fe3b4e73
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.
diff --git a/ChangeLog b/ChangeLog
index 0e5475c..60c0442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-03 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #19758]
+ * sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
+ (EXTRA_LD_ENVVARS): Or bit_Prefer_MAP_32BIT_EXEC.
+
2016-03-03 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #19490]
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:
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources