From a2046062fb4fa76455a1ccbb55b4d60a60f88f2b Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Tue, 7 Feb 2017 20:28:07 -0800 Subject: [PATCH] Disble CFI for ARM32 processes. This CL disables CFI for 32-bit ARM processes, which is broken due to a compiler error in the most recent version of clang. Bug: 35157333 Test: ENABLE_CFI=true m -j40 does not enable CFI for 32-bit processes Change-Id: I6a6e1d14c8365da1056b4cbccad11ef2f15c70b2 --- core/config_sanitizers.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 5eaf7b1455..57a7993bd9 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -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))