Merge "Enable cfi for 32bit arch"

2021-03-12 12:41:39 +00:00 · 2021-03-12 12:41:39 +00:00 · 34d300ba76
parent a8c443618a e0c14678d4
commit 34d300ba76
1 changed files with 0 additions and 6 deletions
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@ -404,12 +404,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