Merge "Fixups after llvm rebase"

cc/config/mips64_device.go

@@ -55,6 +55,10 @@ var (
 		"-frename-registers",
 	}
 
+	mips64ClangCflags = append(mips64Cflags, []string{
+		"-fintegrated-as",
+	}...)
+
 	mips64Cppflags = []string{
 		"-fvisibility-inlines-hidden",
 	}
@@ -108,7 +112,7 @@ func init() {
 	pctx.StaticVariable("Mips64IncludeFlags", bionicHeaders("mips64", "mips"))
 
 	// Clang cflags
-	pctx.StaticVariable("Mips64ClangCflags", strings.Join(ClangFilterUnknownCflags(mips64Cflags), " "))
+	pctx.StaticVariable("Mips64ClangCflags", strings.Join(ClangFilterUnknownCflags(mips64ClangCflags), " "))
 	pctx.StaticVariable("Mips64ClangLdflags", strings.Join(ClangFilterUnknownCflags(mips64Ldflags), " "))
 	pctx.StaticVariable("Mips64ClangCppflags", strings.Join(ClangFilterUnknownCflags(mips64Cppflags), " "))
 
@@ -172,6 +176,10 @@ func (t *toolchainMips64) ToolchainClangCflags() string {
 	return t.toolchainClangCflags
 }
 
+func (t *toolchainMips64) ClangAsflags() string {
+	return "-fno-integrated-as"
+}
+
 func (t *toolchainMips64) ClangCflags() string {
 	return t.clangCflags
 }

cc/config/mips_device.go

@@ -52,7 +52,7 @@ var (
 
 	mipsClangCflags = append(mipsCflags, []string{
 		"-fPIC",
-		"-fno-integrated-as",
+		"-fintegrated-as",
 	}...)
 
 	mipsCppflags = []string{