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.

diff --git a/ChangeLog b/ChangeLog
index 0e5475ca12f52b9971ecfdf28fe75d4b34eef644..60c04427d052e84ec846d87cee8a3b1193bdc4de 100644 (file)
--- 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 c9db5ea7777acb2bc62b47fcb73a7150799f5280..a759934fdd91287715cb9c12e91914065ea44735 100644 (file)
--- 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