From e28663fb28f61e201a7c8aad91765d6c7618d1c4 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 9 Oct 2018 14:42:06 -0700
Subject: [PATCH] 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
---
 cc/config/arm64_device.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index 12e911447..cd81eab2a 100644
--- a/cc/config/arm64_device.go
+++ b/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, " "),
 	}