diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-09 19:03:12 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-09 19:03:12 +0000 |
commit | 3d83ebe1768d676c90e8fa3d508157f4654821e5 (patch) | |
tree | 7e90b13ffabba6d24ab7367c2793a5028f15e3f4 | |
parent | 52c920fb2ceded026320791609b3f10d13fce381 (diff) | |
parent | 08734bbeaea207b87b03db02ac10adca417b7623 (diff) | |
download | soong-oreo-m6-s4-release.tar.gz |
Snap for 4384531 from 08734bbeaea207b87b03db02ac10adca417b7623 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: Iab8f12106adecfcd4c1819fd8cbc880c6eed6981
-rw-r--r-- | cc/config/x86_darwin_host.go | 10 | ||||
-rw-r--r-- | cc/config/x86_linux_host.go | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/cc/config/x86_darwin_host.go b/cc/config/x86_darwin_host.go index 65fa1edda..bb751feba 100644 --- a/cc/config/x86_darwin_host.go +++ b/cc/config/x86_darwin_host.go @@ -159,6 +159,8 @@ func init() { strings.Join(ClangFilterUnknownCflags(darwinX8664Cflags), " ")) pctx.StaticVariable("DarwinX86ClangLdflags", strings.Join(darwinX86ClangLdflags, " ")) pctx.StaticVariable("DarwinX8664ClangLdflags", strings.Join(darwinX8664ClangLdflags, " ")) + pctx.StaticVariable("DarwinX86YasmFlags", "-f macho -m x86") + pctx.StaticVariable("DarwinX8664YasmFlags", "-f macho -m amd64") } func xcrun(config android.Config, args ...string) (string, error) { @@ -276,6 +278,14 @@ func (t *toolchainDarwinX8664) ClangLdflags() string { return "${config.DarwinClangLdflags} ${config.DarwinX8664ClangLdflags}" } +func (t *toolchainDarwinX86) YasmFlags() string { + return "${config.DarwinX86YasmFlags}" +} + +func (t *toolchainDarwinX8664) YasmFlags() string { + return "${config.DarwinX8664YasmFlags}" +} + func (t *toolchainDarwin) ShlibSuffix() string { return ".dylib" } diff --git a/cc/config/x86_linux_host.go b/cc/config/x86_linux_host.go index 80e928956..65ac603cf 100644 --- a/cc/config/x86_linux_host.go +++ b/cc/config/x86_linux_host.go @@ -160,6 +160,9 @@ func init() { pctx.StaticVariable("LinuxX8664ClangLdflags", strings.Join(linuxX8664ClangLdflags, " ")) pctx.StaticVariable("LinuxX86ClangCppflags", strings.Join(linuxX86ClangCppflags, " ")) pctx.StaticVariable("LinuxX8664ClangCppflags", strings.Join(linuxX8664ClangCppflags, " ")) + // Yasm flags + pctx.StaticVariable("LinuxX86YasmFlags", "-f elf32 -m x86") + pctx.StaticVariable("LinuxX8664YasmFlags", "-f elf64 -m amd64") } type toolchainLinux struct { @@ -252,6 +255,14 @@ func (t *toolchainLinuxX8664) ClangLdflags() string { return "${config.LinuxClangLdflags} ${config.LinuxX8664ClangLdflags}" } +func (t *toolchainLinuxX86) YasmFlags() string { + return "${config.LinuxX86YasmFlags}" +} + +func (t *toolchainLinuxX8664) YasmFlags() string { + return "${config.LinuxX8664YasmFlags}" +} + func (t *toolchainLinux) AvailableLibraries() []string { return linuxAvailableLibraries } |