StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restore lld parts of "Remove cortex-a53 linker workaround for new cpus.""

Browse Source
This commit is contained in:
Treehugger Robot
2018-10-09 22:51:11 +00:00
committed by Gerrit Code Review
parent 8bb0f530f7 e28663fb28
commit 55e095b6d8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/config/arm64_device.go
View File

@@ -177,6 +177,7 @@ type toolchainArm64 struct {
toolchain64Bit toolchain64Bit
ldflags string ldflags string
lldflags string
toolchainCflags string toolchainCflags string
toolchainClangCflags string toolchainClangCflags string
} }
@@ -234,7 +235,7 @@ func (t *toolchainArm64) ClangLdflags() string {
} }
func (t *toolchainArm64) ClangLldflags() string { func (t *toolchainArm64) ClangLldflags() string {
return "${config.Arm64Lldflags}" return t.lldflags
} }
func (t *toolchainArm64) ToolchainClangCflags() string { func (t *toolchainArm64) ToolchainClangCflags() string {
@@ -272,6 +273,10 @@ func arm64ToolchainFactory(arch android.Arch) Toolchain {
"${config.Arm64Ldflags}", "${config.Arm64Ldflags}",
extraLdflags, extraLdflags,
}, " "), }, " "),
lldflags: strings.Join([]string{
"${config.Arm64Lldflags}",
extraLdflags,
}, " "),
toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant), toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant),
toolchainClangCflags: strings.Join(toolchainClangCflags, " "), toolchainClangCflags: strings.Join(toolchainClangCflags, " "),
} }