This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [committed, PATCH] [BZ #19758] Typo in EXTRA_LD_ENVVARS for x86-64
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Fri, 11 Mar 2016 08:31:40 -0800
- Subject: Re: [committed, PATCH] [BZ #19758] Typo in EXTRA_LD_ENVVARS for x86-64
- Authentication-results: sourceware.org; auth=none
- References: <20160303225502 dot GA5023 at intel dot com>
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.