commit e48dccaa8376a329e479b3f3b83779a85cf243c8
author Cindy Zhou <zhouci@google.com> Fri Mar 12 12:41:39 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 12 12:41:39 2021 +0000
tree fcca5fcd02388c7904dd449d1d53b8efe5c1d85c
parent c2643ead1616f4cb90df6ee134712ef82aa87030
parent 5d793fb74095001169d815afe276462ff31bd76c

Merge "Enable cfi for 32bit arch"

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index f39b84a..228bad6 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -153,12 +153,6 @@
   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))