From e0c14678d4bfeebdd9a8afb4396037b18c46e4d6 Mon Sep 17 00:00:00 2001 From: Cindy Zhou Date: Thu, 14 Jan 2021 11:05:12 -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: I9eb034deed9938710f0f7b690fa57108d9bc5669 Change-Id: I434748ede352f998e64a6639de6ba162762ee7f0 --- cc/sanitize.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index 13e17803f..0733e8393 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -381,12 +381,6 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { s.Diag.Cfi = boolPtr(false) } - // Also disable CFI for arm32 until b/35157333 is fixed. - if ctx.Arch().ArchType == android.Arm { - s.Cfi = boolPtr(false) - s.Diag.Cfi = boolPtr(false) - } - // HWASan requires AArch64 hardware feature (top-byte-ignore). if ctx.Arch().ArchType != android.Arm64 { s.Hwaddress = nil