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

This commit is contained in:
Treehugger Robot
2018-10-09 22:51:11 +00:00
committed by Gerrit Code Review

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, " "),
}