diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2016-03-03 14:51:40 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2016-03-03 14:51:40 -0800 |
| commit | a4754272958a8368701bb2a8d6b0c224fe3b4e73 (patch) | |
| tree | f4ecb44c5fc8e652ba76c39122c49a9cdac1a1db | |
| parent | e5d6bc61cbbc59302c35bdceac5e0dec26cdc872 (diff) | |
| download | glibc-a4754272958a8368701bb2a8d6b0c224fe3b4e73.tar.gz glibc-a4754272958a8368701bb2a8d6b0c224fe3b4e73.tar.xz glibc-a4754272958a8368701bb2a8d6b0c224fe3b4e73.zip | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 0e5475ca12..60c04427d0 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 c9db5ea777..a759934fdd 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 |