StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cortex-a53 linker workaround for new cpus.

Browse Source 
am: 79dff70b46

Change-Id: Ib6e6b334611973c524c850ce8133fe0885f7f0a3
This commit is contained in:
Christopher Ferris
2018-05-15 15:03:24 -07:00
committed by android-build-merger
parent 3262054a81 79dff70b46
commit 6290b64f3d
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cc/config/arm64_device.go
View File

@@ -39,7 +39,6 @@ var (
arm64Ldflags = []string{ arm64Ldflags = []string{
"-Wl,-m,aarch64_elf64_le_vec", "-Wl,-m,aarch64_elf64_le_vec",
"-Wl,--hash-style=gnu", "-Wl,--hash-style=gnu",
"-Wl,--fix-cortex-a53-843419",
"-fuse-ld=gold", "-fuse-ld=gold",
"-Wl,--icf=safe", "-Wl,--icf=safe",
} }
@@ -177,6 +176,7 @@ var (
type toolchainArm64 struct { type toolchainArm64 struct {
toolchain64Bit toolchain64Bit
ldflags string
toolchainCflags string toolchainCflags string
toolchainClangCflags string toolchainClangCflags string
} }
@@ -210,7 +210,7 @@ func (t *toolchainArm64) Cppflags() string {
} }
func (t *toolchainArm64) Ldflags() string { func (t *toolchainArm64) Ldflags() string {
return "${config.Arm64Ldflags}" return t.ldflags
} }
func (t *toolchainArm64) IncludeFlags() string { func (t *toolchainArm64) IncludeFlags() string {
@@ -230,7 +230,7 @@ func (t *toolchainArm64) ClangCppflags() string {
} }
func (t *toolchainArm64) ClangLdflags() string { func (t *toolchainArm64) ClangLdflags() string {
return "${config.Arm64Ldflags}" return t.ldflags
} }
func (t *toolchainArm64) ClangLldflags() string { func (t *toolchainArm64) ClangLldflags() string {
@@ -258,7 +258,20 @@ func arm64ToolchainFactory(arch android.Arch) Toolchain {
toolchainClangCflags = append(toolchainClangCflags, toolchainClangCflags = append(toolchainClangCflags,
variantOrDefault(arm64ClangCpuVariantCflagsVar, arch.CpuVariant)) variantOrDefault(arm64ClangCpuVariantCflagsVar, arch.CpuVariant))
var extraLdflags string
switch arch.CpuVariant {
case "cortex-a53", "cortex-a73", "kryo", "exynos-m1", "exynos-m2",
// This variant might not need the workaround but leave it
// in the list since it has had the workaround on before.
"denver64":
extraLdflags = "-Wl,--fix-cortex-a53-843419"
}
return &toolchainArm64{ return &toolchainArm64{
ldflags: strings.Join([]string{
"${config.Arm64Ldflags}",
extraLdflags,
}, " "),
toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant), toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant),
toolchainClangCflags: strings.Join(toolchainClangCflags, " "), toolchainClangCflags: strings.Join(toolchainClangCflags, " "),
} }