Merge "Disble CFI for ARM32 processes."

2017-02-13 20:49:19 +00:00
parent 040ffff84b 6d67e6e68e
commit e13374d3c1
1 changed files with 6 additions and 0 deletions
--- 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