Merge "Hide CFI behind a global flag."

2017-01-20 01:32:43 +00:00
parent 0fe7253718 1b017a76e1
commit 97673c06d8
3 changed files with 10 additions and 0 deletions
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -161,6 +161,11 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
 		}
 	}

+	if !ctx.AConfig().EnableCFI() {
+		s.Cfi = nil
+		s.Diag.Cfi = nil
+	}
+
 	if ctx.staticBinary() {
 		s.Address = nil
 		s.Coverage = nil