From: H.J. Lu Date: Thu, 3 Mar 2016 22:51:40 +0000 (-0800) Subject: Or bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=939f86004862d36b3bba15167b02047135e22e46;p=thirdparty%2Fglibc.git 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. (cherry picked from commit 33ab2ad58eba55de05a05f4adb795e1c172024bb) --- 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 c9db5ea7777..a759934fdd9 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