Merge "Restore lld parts of "Remove cortex-a53 linker workaround for new cpus.""
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index 12e9114..cd81eab 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -177,6 +177,7 @@
toolchain64Bit
ldflags string
+ lldflags string
toolchainCflags string
toolchainClangCflags string
}
@@ -234,7 +235,7 @@
}
func (t *toolchainArm64) ClangLldflags() string {
- return "${config.Arm64Lldflags}"
+ return t.lldflags
}
func (t *toolchainArm64) ToolchainClangCflags() string {
@@ -272,6 +273,10 @@
"${config.Arm64Ldflags}",
extraLdflags,
}, " "),
+ lldflags: strings.Join([]string{
+ "${config.Arm64Lldflags}",
+ extraLdflags,
+ }, " "),
toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant),
toolchainClangCflags: strings.Join(toolchainClangCflags, " "),
}