commit 594eb16b02525c3c3a2457d1ab8161dfe5e0e641
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 20 21:28:12 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 20 21:28:13 2017 +0000
tree 6c13fcfc25a48713ee51f3a971fadc7209b2e5a8
parent 2f9b9f0938f16e60d1b3abc442c55ccd9e1f6822
parent c026f6d0ed7c2af56d8c1bdb27a3f526c5e13f12

Merge "Disable CFI for ASAN targets. (Make)"

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index d735a02..04aedf4 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -74,6 +74,12 @@
   my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
 endif
 
+# Also disable CFI if ASAN is enabled.
+ifneq ($(filter address,$(my_sanitize)),)
+  my_sanitize := $(filter-out cfi,$(my_sanitize))
+  my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
+endif
+
 # CFI needs gold linker, and mips toolchain does not have one.
 ifneq ($(filter mips mips64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)
   my_sanitize := $(filter-out cfi,$(my_sanitize))