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

Commit aaf49237 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by Gerrit Code Review
Browse files

Merge "Disble CFI for ARM32 processes."

parents 06f32586 a2046062

core/config_sanitizers.mk

+6 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,12 @@ ifeq ($(strip $(ENABLE_CFI)),) 
  my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))

  my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))

endif

endif





# Disable CFI for arm32 (b/35157333).

ifneq ($(filter arm,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

  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.

# CFI needs gold linker, and mips toolchain does not have one.

ifneq ($(filter mips mips64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

ifneq ($(filter mips mips64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

  my_sanitize := $(filter-out cfi,$(my_sanitize))

  my_sanitize := $(filter-out cfi,$(my_sanitize))