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

Commit 31e5fbc1 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

Merge "Disble CFI for ARM32 processes." am: aaf49237 am: af37b7ff 

am: 8c6400a2

Change-Id: Iad9668918c329d61111f774e2a7033242aba4ab6
parents 0f9093a3 8c6400a2

core/config_sanitizers.mk

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

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.

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

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