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

am: 55e095b6d8

Change-Id: I8f9d87561e02ffbeb0aae0f9435ad971c9bc1e2f

cc/config/arm64_device.go

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