Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55e095b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 8bb0f530 e28663fb

cc/config/arm64_device.go

+6 −1
Original line number Diff line number Diff line
@@ -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, " "),

	}