Merge "Remove unused mips workarounds."

2020-03-16 21:06:13 +00:00
parent 843f09723b da3a071eaa
commit cc868de8a7
15 changed files with 9 additions and 432 deletions
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -307,8 +307,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
 		}
 	}

-	// CFI needs gold linker, and mips toolchain does not have one.
-	if !ctx.Config().EnableCFI() || ctx.Arch().ArchType == android.Mips || ctx.Arch().ArchType == android.Mips64 {
+	// Is CFI actually enabled?
+	if !ctx.Config().EnableCFI() {
 		s.Cfi = nil
 		s.Diag.Cfi = nil
 	}