* [committed, PATCH] [BZ #19758] Typo in EXTRA_LD_ENVVARS for x86-64
@ 2016-03-03 22:55 H.J. Lu
2016-03-11 16:31 ` H.J. Lu
0 siblings, 1 reply; 2+ messages in thread
From: H.J. Lu @ 2016-03-03 22:55 UTC (permalink / raw)
To: GNU C Library
We should turn on bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS without
overriding other bits.
Will backport it to 2.23 branch.
H.J.
---
[BZ #19758]
* sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
(EXTRA_LD_ENVVARS): Or bit_Prefer_MAP_32BIT_EXEC.
---
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
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
--
2.5.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [committed, PATCH] [BZ #19758] Typo in EXTRA_LD_ENVVARS for x86-64
2016-03-03 22:55 [committed, PATCH] [BZ #19758] Typo in EXTRA_LD_ENVVARS for x86-64 H.J. Lu
@ 2016-03-11 16:31 ` H.J. Lu
0 siblings, 0 replies; 2+ messages in thread
From: H.J. Lu @ 2016-03-11 16:31 UTC (permalink / raw)
To: GNU C Library
On Thu, Mar 3, 2016 at 2:55 PM, H.J. Lu <hongjiu.lu@intel.com> wrote:
> We should turn on bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS without
> overriding other bits.
>
> Will backport it to 2.23 branch.
>
> H.J.
> ---
> [BZ #19758]
> * sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
> (EXTRA_LD_ENVVARS): Or bit_Prefer_MAP_32BIT_EXEC.
> ---
> ChangeLog | 6 ++++++
> sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h | 2 +-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> 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
> --
> 2.5.0
>
Committing to 2.23 branch now.
--
H.J.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-11 16:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-03 22:55 [committed, PATCH] [BZ #19758] Typo in EXTRA_LD_ENVVARS for x86-64 H.J. Lu
2016-03-11 16:31 ` H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).