about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2016-03-03 14:51:40 -0800
committerH.J. Lu <hjl.tools@gmail.com>2016-04-02 10:56:06 -0700
commit4a49c82956f5a42a2cce22c2e97360de1b32301d (patch)
tree8cf6352da3a472880335ca2162783889468b0b82
parent18f8c0e3cc9ff7b092f02c9b42874a5439347bbc (diff)
downloadglibc-4a49c82956f5a42a2cce22c2e97360de1b32301d.tar.gz
glibc-4a49c82956f5a42a2cce22c2e97360de1b32301d.tar.xz
glibc-4a49c82956f5a42a2cce22c2e97360de1b32301d.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--sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h2
1 files changed, 1 insertions, 1 deletions
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 159d0f146b..1531437359 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