diff --git a/android/arch.go b/android/arch.go index c5f242f00..57899cd53 100644 --- a/android/arch.go +++ b/android/arch.go @@ -959,6 +959,7 @@ func getMegaDeviceConfig() []archConfig { {"arm", "armv7-a-neon", "cortex-a15", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "cortex-a53", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "cortex-a53.a57", []string{"armeabi-v7a"}}, + {"arm", "armv7-a-neon", "cortex-a72", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "cortex-a73", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "cortex-a75", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "denver", []string{"armeabi-v7a"}}, @@ -967,6 +968,7 @@ func getMegaDeviceConfig() []archConfig { {"arm", "armv7-a-neon", "exynos-m1", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "exynos-m2", []string{"armeabi-v7a"}}, {"arm64", "armv8-a", "cortex-a53", []string{"arm64-v8a"}}, + {"arm64", "armv8-a", "cortex-a72", []string{"arm64-v8a"}}, {"arm64", "armv8-a", "cortex-a73", []string{"arm64-v8a"}}, {"arm64", "armv8-a", "denver64", []string{"arm64-v8a"}}, {"arm64", "armv8-a", "kryo", []string{"arm64-v8a"}}, diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index 6fdd524f7..12e911447 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -86,6 +86,7 @@ func init() { "armv8_2a", "cortex-a53", "cortex-a55", + "cortex-a72", "cortex-a73", "cortex-a75", "kryo", @@ -146,6 +147,7 @@ var ( "": "", "cortex-a53": "${config.Arm64CortexA53Cflags}", "cortex-a55": "${config.Arm64CortexA55Cflags}", + "cortex-a72": "${config.Arm64CortexA53Cflags}", "cortex-a73": "${config.Arm64CortexA53Cflags}", "cortex-a75": "${config.Arm64CortexA55Cflags}", "kryo": "${config.Arm64KryoCflags}", @@ -162,6 +164,7 @@ var ( "": "", "cortex-a53": "${config.Arm64ClangCortexA53Cflags}", "cortex-a55": "${config.Arm64ClangCortexA55Cflags}", + "cortex-a72": "${config.Arm64ClangCortexA53Cflags}", "cortex-a73": "${config.Arm64ClangCortexA53Cflags}", "cortex-a75": "${config.Arm64ClangCortexA55Cflags}", "kryo": "${config.Arm64ClangKryoCflags}", @@ -257,7 +260,7 @@ func arm64ToolchainFactory(arch android.Arch) Toolchain { var extraLdflags string switch arch.CpuVariant { - case "cortex-a53", "cortex-a73", "kryo", "exynos-m1", "exynos-m2", + case "cortex-a53", "cortex-a72", "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": diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go index 4135179d1..c1c2c7b65 100644 --- a/cc/config/arm_device.go +++ b/cc/config/arm_device.go @@ -162,6 +162,7 @@ func init() { "cortex-a53", "cortex-a53-a57", "cortex-a55", + "cortex-a72", "cortex-a73", "cortex-a75", "krait", @@ -269,6 +270,7 @@ var ( "cortex-a53": "${config.ArmCortexA53Cflags}", "cortex-a53.a57": "${config.ArmCortexA53Cflags}", "cortex-a55": "${config.ArmCortexA55Cflags}", + "cortex-a72": "${config.ArmCortexA53Cflags}", "cortex-a73": "${config.ArmCortexA53Cflags}", "cortex-a75": "${config.ArmCortexA55Cflags}", "krait": "${config.ArmKraitCflags}", @@ -292,6 +294,7 @@ var ( "cortex-a53": "${config.ArmClangCortexA53Cflags}", "cortex-a53.a57": "${config.ArmClangCortexA53Cflags}", "cortex-a55": "${config.ArmClangCortexA55Cflags}", + "cortex-a72": "${config.ArmClangCortexA53Cflags}", "cortex-a73": "${config.ArmClangCortexA53Cflags}", "cortex-a75": "${config.ArmClangCortexA55Cflags}", "krait": "${config.ArmClangKraitCflags}",