Fixups after llvm rebase
Clang now generates a SHF_MERGE section that is rejected by GNU as on
Mips64. Change to use integrated assembler for Mips and Mips64.
Bug: 37423073
Test: external/clang/build.py
Change-Id: I8eae5cf370b930119eb6892db960f5f70777312f
diff --git a/cc/config/mips64_device.go b/cc/config/mips64_device.go
index 8997893..4a739f2 100644
--- a/cc/config/mips64_device.go
+++ b/cc/config/mips64_device.go
@@ -55,6 +55,10 @@
"-frename-registers",
}
+ mips64ClangCflags = append(mips64Cflags, []string{
+ "-fintegrated-as",
+ }...)
+
mips64Cppflags = []string{
"-fvisibility-inlines-hidden",
}
@@ -108,7 +112,7 @@
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 @@
return t.toolchainClangCflags
}
+func (t *toolchainMips64) ClangAsflags() string {
+ return "-fno-integrated-as"
+}
+
func (t *toolchainMips64) ClangCflags() string {
return t.clangCflags
}