From 5d793fb74095001169d815afe276462ff31bd76c Mon Sep 17 00:00:00 2001 From: Cindy Zhou Date: Thu, 18 Feb 2021 08:58:56 -0800 Subject: [PATCH] Enable cfi for 32bit arch Enabling cfi for 32-bit arch; b/35157333 seems to have been resolved in b/67507331. Bug: 158010610 Test: manual interaction with Wimbley device: youtube video, chrome navigations, gmail MPTS testing on Sargo Change-Id: I79eeb7e880ea09d857f8339901b67f77243a575c --- core/config_sanitizers.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index eaab1b5ec..e46632895 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -122,12 +122,6 @@ ifeq ($(strip $(ENABLE_CFI)),false) 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 - # Also disable CFI if ASAN is enabled. ifneq ($(filter address,$(my_sanitize)),) my_sanitize := $(filter-out cfi,$(my_sanitize))