aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgenii Stepanov <eugenis@google.com>2016-07-01 20:09:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-07-01 20:09:45 +0000
commit997a6cd1a17ad4b0db404e14b3c44618737beeef (patch)
treec5f4b8dc91cc17dd37e0eb4d9484d19b6a1d3b00
parent9c88e0bfa2c3a7589c41f47f2aded24ec7e9254b (diff)
parent7dcb8b80c5893d926a45b0d7aa12dd00a13c4d86 (diff)
downloadbuild-997a6cd1a17ad4b0db404e14b3c44618737beeef.tar.gz
Merge "Apply SANITIZE_TARGET=safe-stack to 64 bit targets only."
-rw-r--r--core/config_sanitizers.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 41f0680bb7..9602626007 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -75,6 +75,12 @@ ifneq ($(filter thread,$(my_sanitize)),)
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