Merge "[mips] Disable compact branch generation" am: ca06cc331d am: 3daec3e3e4

am: 4bbc689ff4 Change-Id: I2d183ff81dc7ff8c7fdcd0431b10235bddd60e94
2016-09-06 23:01:31 +00:00
parent e5fcab0854 4bbc689ff4
commit aa837e13d2
2 changed files with 6 additions and 0 deletions
--- a/cc/config/mips64_device.go
+++ b/cc/config/mips64_device.go
@@ -78,6 +78,9 @@ var (
 		"mips64r6": []string{
 			"-mips64r6",
 			"-msynci",
+
+			// revert once clang picks up r278824
+			"-mcompact-branches=never",
 		},
 	}
 )
--- a/cc/config/mips_device.go
+++ b/cc/config/mips_device.go
@@ -114,6 +114,9 @@ var (
 			"-mfp64",
 			"-mno-odd-spreg",
 			"-msynci",
+
+			// revert once clang picks up r278824
+			"-mcompact-branches=never",
 		},
 	}
 )