Merge "Fix mips flags" am: 2524b414e2 am: f1c2e9bb13

am: 6a2e4c45c1

* commit '6a2e4c45c102032d1ed76b730dd5d0065ec32a1a':
  Fix mips flags

Change-Id: Ic876ecfd2122ac113fa366a6549c63fa262aa3cb
This commit is contained in:
Dan Willemsen
2016-05-10 00:31:35 +00:00
committed by android-build-merger

View File

@@ -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
}