commit 30b6f2e45be070c18109b08e54b5cbd5d66bc303
author Evgenii Stepanov <eugenis@google.com> Fri Jul 01 20:38:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 01 20:38:03 2016 +0000
tree dc7d4e3392eaff3c99fcb741c09757199a8f1b0d
parent d9d0e05e5482f64027692a80f5256d8b13ff8b6e
parent b0d5e74deffb39e4f271612cdf7c91a99fe3818f

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

Change-Id: I8d0e99b0b223612654bd9238d5288f1ef0346271

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