bca718
commit a4754272958a8368701bb2a8d6b0c224fe3b4e73
bca718
Author: H.J. Lu <hjl.tools@gmail.com>
bca718
Date:   Thu Mar 3 14:51:40 2016 -0800
bca718
bca718
    Or bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS
bca718
    
bca718
    We should turn on bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS without
bca718
    overriding other bits.
bca718
    
bca718
      [BZ #19758]
bca718
      * sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
bca718
      (EXTRA_LD_ENVVARS): Or bit_Prefer_MAP_32BIT_EXEC.
bca718
bca718
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
bca718
index c9db5ea..a759934 100644
bca718
--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
bca718
+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
bca718
@@ -33,7 +33,7 @@
bca718
   case 21:							      \
bca718
     if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0)	      \
bca718
       GLRO(dl_x86_cpu_features).feature[index_Prefer_MAP_32BIT_EXEC]  \
bca718
-	= bit_Prefer_MAP_32BIT_EXEC;				      \
bca718
+	|= bit_Prefer_MAP_32BIT_EXEC;				      \
bca718
     break;
bca718
 
bca718
 /* Extra unsecure variables.  The names are all stuffed in a single