diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-05-10 00:09:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-10 00:09:00 +0000 |
commit | f4449451b59dda4e8dfc92ffdffa9dd6aa569a19 (patch) | |
tree | 2f4acf06079c158671997afbd67403f5efc2be36 /cc | |
parent | 2524b414e2f83a12f8a362dd9b861212ef161f48 (diff) | |
parent | 569b0fa2aeaf4d509c3bbfaa5fb8b501ccbc8aee (diff) | |
download | build_soong-f4449451b59dda4e8dfc92ffdffa9dd6aa569a19.tar.gz build_soong-f4449451b59dda4e8dfc92ffdffa9dd6aa569a19.tar.bz2 build_soong-f4449451b59dda4e8dfc92ffdffa9dd6aa569a19.zip |
Merge "Fix X86 flags"
Diffstat (limited to 'cc')
-rw-r--r-- | cc/x86_64_device.go | 4 | ||||
-rw-r--r-- | cc/x86_device.go | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/cc/x86_64_device.go b/cc/x86_64_device.go index ceaf51c4..7d9eddae 100644 --- a/cc/x86_64_device.go +++ b/cc/x86_64_device.go @@ -219,6 +219,10 @@ func (t *toolchainX86_64) ClangTriple() string { return "${x86_64GccTriple}" } +func (t *toolchainX86_64) ToolchainClangLdflags() string { + return "${x86_64ToolchainLdflags}" +} + func (t *toolchainX86_64) ToolchainClangCflags() string { return t.toolchainClangCflags } diff --git a/cc/x86_device.go b/cc/x86_device.go index 6b90f17b..c1bdfd55 100644 --- a/cc/x86_device.go +++ b/cc/x86_device.go @@ -46,6 +46,15 @@ var ( "-fno-strict-aliasing", } + x86ClangCflags = append(x86Cflags, []string{ + "-msse3", + + // -mstackrealign is needed to realign stack in native code + // that could be called from JNI, so that movaps instruction + // will work on assumed stack aligned local variables. + "-mstackrealign", + }...) + x86Cppflags = []string{} x86Ldflags = []string{ @@ -157,7 +166,7 @@ func init() { }, " ")) // Clang cflags - pctx.StaticVariable("x86ClangCflags", strings.Join(clangFilterUnknownCflags(x86Cflags), " ")) + pctx.StaticVariable("x86ClangCflags", strings.Join(clangFilterUnknownCflags(x86ClangCflags), " ")) pctx.StaticVariable("x86ClangLdflags", strings.Join(clangFilterUnknownCflags(x86Ldflags), " ")) pctx.StaticVariable("x86ClangCppflags", strings.Join(clangFilterUnknownCflags(x86Cppflags), " ")) @@ -217,7 +226,11 @@ func (t *toolchainX86) IncludeFlags() string { } func (t *toolchainX86) ClangTriple() string { - return "${x86GccTriple}" + return "i686-linux-android" +} + +func (t *toolchainX86) ToolchainClangLdflags() string { + return "${x86ToolchainLdflags}" } func (t *toolchainX86) ToolchainClangCflags() string { |