Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 594eb16b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 2f9b9f09 c026f6d0

core/config_sanitizers.mk

+6 −0
Original line number Diff line number Diff line
@@ -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))