summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cc/sanitize.go6
1 files changed, 0 insertions, 6 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 8218d972c..cd09e6e4e 100644
--- 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