forked from mirrors/nixpkgs
19 lines
826 B
Diff
19 lines
826 B
Diff
|
Adapted from https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=4d5cfeb510125345cb41431afc9022492994cffa, omitting changes to NEWS
|
||
|
|
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 1943691..ac694c0 100644
|
||
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
|
||
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
|
||
|
|
@@ -31,7 +31,8 @@
|
||
|
|
environment variable, LD_PREFER_MAP_32BIT_EXEC. */
|
||
|
|
#define EXTRA_LD_ENVVARS \
|
||
|
|
case 21: \
|
||
|
|
- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
|
||
|
|
+ if (!__libc_enable_secure \
|
||
|
|
+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
|
||
|
|
GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \
|
||
|
|
|= bit_arch_Prefer_MAP_32BIT_EXEC; \
|
||
|
|
break;
|
||
|
|
--
|
||
|
|
2.9.3
|
||
|
|
|