commit f0506c3105985d9f2bf5b08094e58b5c5d7bb6b2
author Evgenii Stepanov <eugenis@google.com> Fri Jul 01 20:27:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 01 20:27:43 2016 +0000
tree 6ed8eb7e5ad1915323bd294159bad36760648810
parent 6902905f37dc6f715f5ebb2011a943b78ab8a8cf
parent 9223ab05ae196bb3da4811b6e43b70b537396084

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

Change-Id: Idd26e5a3e33b0875fb0fec2541a3d47c04bf9c34

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