From 6d67e6e68e5b8f53f997201d6c967aab5798b7c1 Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Tue, 7 Feb 2017 20:31:41 -0800 Subject: [PATCH] Disble CFI for ARM32 processes. This CL disables CFI for 32-bit ARM processes, which is broken due to a compiler error in the most recent version of clang. Bug: 35157333 Test: ENABLE_CFI=true m -j40 does not enable CFI for 32-bit processes Change-Id: I52ccf60d91ff1a2af4cf024376b7d70f87040674 --- cc/sanitize.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cc/sanitize.go b/cc/sanitize.go index b98797a7a..7eb191f5f 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -173,6 +173,12 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { s.Diag.Cfi = nil } + // Also disable CFI for arm32 until b/35157333 is fixed. + if ctx.Arch().ArchType == android.Arm { + s.Cfi = nil + s.Diag.Cfi = nil + } + if ctx.staticBinary() { s.Address = nil s.Coverage = nil