commit b0d5e74deffb39e4f271612cdf7c91a99fe3818f
author Evgenii Stepanov <eugenis@google.com> Fri Jul 01 20:32:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 01 20:32:57 2016 +0000
tree fb8258778cae8089409584d4c9fb83139b3dfaf5
parent 39b8b7882209010f3c47610f13c62051d78ecad1
parent f0506c3105985d9f2bf5b08094e58b5c5d7bb6b2

Merge \\\"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\\\" am: 997a6cd1a1 am: 9223ab05ae
am: f0506c3105

Change-Id: Ia164819f4c3ccf6d0af7610a911bd4bdd8fc947f

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