Merge "Disable CFI for ASAN targets. (Make)"
This commit is contained in:
commit
594eb16b02
1 changed files with 6 additions and 0 deletions
|
@ -74,6 +74,12 @@ ifneq ($(filter arm,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)
|
|||
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))
|
||||
|
|
Loading…
Reference in a new issue