aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-05-10 00:08:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-05-10 00:08:54 +0000
commit2524b414e2f83a12f8a362dd9b861212ef161f48 (patch)
tree92ed859f2f2f9e929b88b191d1ed5c181bf95e09
parented89a7aa0c9b9085490b8ef1957f4b549d559012 (diff)
parentc785ff35afe578b79312896e993f290fe28f7ddd (diff)
downloadbuild_soong-2524b414e2f83a12f8a362dd9b861212ef161f48.tar.gz
build_soong-2524b414e2f83a12f8a362dd9b861212ef161f48.tar.bz2
build_soong-2524b414e2f83a12f8a362dd9b861212ef161f48.zip
Merge "Fix mips flags"
-rw-r--r--cc/mips_device.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/cc/mips_device.go b/cc/mips_device.go
index ba67c0bb..eed18d6e 100644
--- a/cc/mips_device.go
+++ b/cc/mips_device.go
@@ -50,6 +50,10 @@ var (
"-frename-registers",
}
+ mipsClangCflags = append(mipsCflags, []string{
+ "-fPIC",
+ }...)
+
mipsCppflags = []string{
"-fvisibility-inlines-hidden",
}
@@ -80,7 +84,7 @@ var (
"-mips32r2",
"-mfp32",
"-modd-spreg",
- "-mno-synci",
+ "-msynci",
},
"mips32r2-fp-xburst": []string{
"-mips32r2",
@@ -141,7 +145,7 @@ func init() {
// Clang cflags
pctx.StaticVariable("mipsClangTriple", "mipsel-linux-android")
- pctx.StaticVariable("mipsClangCflags", strings.Join(clangFilterUnknownCflags(mipsCflags), " "))
+ pctx.StaticVariable("mipsClangCflags", strings.Join(clangFilterUnknownCflags(mipsClangCflags), " "))
pctx.StaticVariable("mipsClangLdflags", strings.Join(clangFilterUnknownCflags(mipsLdflags), " "))
pctx.StaticVariable("mipsClangCppflags", strings.Join(clangFilterUnknownCflags(mipsCppflags), " "))
@@ -205,6 +209,10 @@ func (t *toolchainMips) ClangTriple() string {
return "${mipsClangTriple}"
}
+func (t *toolchainMips) ToolchainClangLdflags() string {
+ return "${mipsToolchainLdflags}"
+}
+
func (t *toolchainMips) ToolchainClangCflags() string {
return t.toolchainClangCflags
}