openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

https://android-review.googlesource.com/c/platform/build/soong/+/689585
added, but was skipped going into pi-dev-plus-aosp, as the pi-dev
version (which did not have these lld bits) was already merged there.
When pi-dev-plus-aosp was pushed to aosp-master, this got lost.

Merged-In is a random git_master change, since this needs to go
into pi-dev-plus-aosp too, but no further.

Bug: 78133793
Test: git diff aosp-master..master -- cc/config/arm64_device.go
Change-Id: Iea69a2c040d11249e43a76a78859944274ce6a92
Merged-In: I7799feac522a1097ec4271bd7868cd6bfe147ad9
This commit is contained in:
Dan Willemsen 2018-10-09 14:42:06 -07:00
parent ae6ae1d880
commit e28663fb28
1 changed files with 6 additions and 1 deletions
Show Stats 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
ldflags string
lldflags string
toolchainCflags string
toolchainClangCflags string
}
@ -234,7 +235,7 @@ func (t *toolchainArm64) ClangLdflags() string {
}
func (t *toolchainArm64) ClangLldflags() string {
return "${config.Arm64Lldflags}"
return t.lldflags
}
func (t *toolchainArm64) ToolchainClangCflags() string {
@ -272,6 +273,10 @@ func arm64ToolchainFactory(arch android.Arch) Toolchain {
"${config.Arm64Ldflags}",
extraLdflags,
}, " "),
lldflags: strings.Join([]string{
"${config.Arm64Lldflags}",
extraLdflags,
}, " "),
toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant),
toolchainClangCflags: strings.Join(toolchainClangCflags, " "),
}