diff options
Diffstat (limited to 'cc/config/arm64_device.go')
| -rw-r--r-- | cc/config/arm64_device.go | 52 |
1 files changed, 50 insertions, 2 deletions
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index 5bb7749a..c4426e31 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -27,6 +27,15 @@ var ( "-Werror=implicit-function-declaration", } + arm64ArchVariantCflags = map[string][]string{ + "armv8-a": []string{ + "-march=armv8-a", + }, + "armv8-2a": []string{ + "-march=armv8.2a", + }, + } + arm64Ldflags = []string{ "-Wl,-m,aarch64_elf64_le_vec", "-Wl,--hash-style=gnu", @@ -41,6 +50,17 @@ var ( "cortex-a53": []string{ "-mcpu=cortex-a53", }, + "cortex-a55": []string{ + // The cortex-a55 target is not yet supported, + // so use cortex-a53. + "-mcpu=cortex-a53", + }, + "cortex-a75": []string{ + // Use the cortex-a53 since it is similar to the little + // core (cortex-a55) and is sensitive to ordering. + // The cortex-a55 target is not yet supported. + "-mcpu=cortex-a53", + }, "kryo": []string{ // Use the cortex-a57 cpu since some compilers // don't support a Kryo specific target yet. @@ -64,8 +84,11 @@ const ( func init() { android.RegisterArchVariants(android.Arm64, "armv8_a", + "armv8_2a", "cortex-a53", + "cortex-a55", "cortex-a73", + "cortex-a75", "kryo", "exynos-m1", "exynos-m2", @@ -88,11 +111,19 @@ func init() { pctx.StaticVariable("Arm64ClangLdflags", strings.Join(ClangFilterUnknownCflags(arm64Ldflags), " ")) pctx.StaticVariable("Arm64ClangCppflags", strings.Join(ClangFilterUnknownCflags(arm64Cppflags), " ")) + pctx.StaticVariable("Arm64ClangArmv8ACflags", strings.Join(arm64ArchVariantCflags["armv8-a"], " ")) + pctx.StaticVariable("Arm64ClangArmv82ACflags", strings.Join(arm64ArchVariantCflags["armv8-2a"], " ")) + pctx.StaticVariable("Arm64CortexA53Cflags", strings.Join(arm64CpuVariantCflags["cortex-a53"], " ")) pctx.StaticVariable("Arm64ClangCortexA53Cflags", strings.Join(arm64ClangCpuVariantCflags["cortex-a53"], " ")) + pctx.StaticVariable("Arm64CortexA55Cflags", + strings.Join(arm64CpuVariantCflags["cortex-a55"], " ")) + pctx.StaticVariable("Arm64ClangCortexA55Cflags", + strings.Join(arm64ClangCpuVariantCflags["cortex-a55"], " ")) + pctx.StaticVariable("Arm64KryoCflags", strings.Join(arm64CpuVariantCflags["kryo"], " ")) pctx.StaticVariable("Arm64ClangKryoCflags", @@ -113,16 +144,25 @@ var ( arm64CpuVariantCflagsVar = map[string]string{ "": "", "cortex-a53": "${config.Arm64CortexA53Cflags}", + "cortex-a55": "${config.Arm64CortexA55Cflags}", "cortex-a73": "${config.Arm64CortexA53Cflags}", + "cortex-a75": "${config.Arm64CortexA55Cflags}", "kryo": "${config.Arm64KryoCflags}", "exynos-m1": "${config.Arm64ExynosM1Cflags}", "exynos-m2": "${config.Arm64ExynosM2Cflags}", } + arm64ClangArchVariantCflagsVar = map[string]string{ + "armv8-a": "${config.Arm64ClangArmv8ACflags}", + "armv8-2a": "${config.Arm64ClangArmv82ACflags}", + } + arm64ClangCpuVariantCflagsVar = map[string]string{ "": "", "cortex-a53": "${config.Arm64ClangCortexA53Cflags}", + "cortex-a55": "${config.Arm64ClangCortexA55Cflags}", "cortex-a73": "${config.Arm64ClangCortexA53Cflags}", + "cortex-a75": "${config.Arm64ClangCortexA55Cflags}", "kryo": "${config.Arm64ClangKryoCflags}", "exynos-m1": "${config.Arm64ClangExynosM1Cflags}", "exynos-m2": "${config.Arm64ClangExynosM2Cflags}", @@ -197,13 +237,21 @@ func (toolchainArm64) SanitizerRuntimeLibraryArch() string { } func arm64ToolchainFactory(arch android.Arch) Toolchain { - if arch.ArchVariant != "armv8-a" { + switch arch.ArchVariant { + case "armv8-a": + case "armv8-2a": + // Nothing extra for armv8-a/armv8-2a + default: panic(fmt.Sprintf("Unknown ARM architecture version: %q", arch.ArchVariant)) } + toolchainClangCflags := []string{arm64ClangArchVariantCflagsVar[arch.ArchVariant]} + toolchainClangCflags = append(toolchainClangCflags, + variantOrDefault(arm64ClangCpuVariantCflagsVar, arch.CpuVariant)) + return &toolchainArm64{ toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant), - toolchainClangCflags: variantOrDefault(arm64ClangCpuVariantCflagsVar, arch.CpuVariant), + toolchainClangCflags: strings.Join(toolchainClangCflags, " "), } } |