commit 7dcb8b80c5893d926a45b0d7aa12dd00a13c4d86
author Evgenii Stepanov <eugenis@google.com> Fri May 06 18:15:57 2016 -0700
committer Evgenii Stepanov <eugenis@google.com> Fri Jul 01 20:07:38 2016 +0000
tree c5f4b8dc91cc17dd37e0eb4d9484d19b6a1d3b00
parent 9c88e0bfa2c3a7589c41f47f2aded24ec7e9254b

Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.

Bug: 27729263
Change-Id: I214a9f40b94f6e6716aca05be774f014e62f73e8

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 41f0680..9602626 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -75,6 +75,12 @@
   endif
 endif
 
+ifneq ($(filter safe-stack,$(my_sanitize)),)
+  ifeq ($(my_32_64_bit_suffix),32)
+    my_sanitize := $(filter-out safe-stack,$(my_sanitize))
+  endif
+endif
+
 # Undefined symbols can occur if a non-sanitized library links
 # sanitized static libraries. That's OK, because the executable
 # always depends on the ASan runtime library, which defines these