diff options
author | Richard Fung | 2018-09-24 18:33:45 -0500 |
---|---|---|
committer | Praneeth Bajjuri | 2019-05-22 14:07:18 -0500 |
commit | 6e13f1a72add9005f26cd3202eab8abb85acc73d (patch) | |
tree | 84cb6224a9d128ded45b343cd62e5d20fd58bc65 | |
parent | a427e814f07d071b4a3c31976a7701b4f80546b5 (diff) | |
download | platform-build-soong-6e13f1a72add9005f26cd3202eab8abb85acc73d.tar.gz platform-build-soong-6e13f1a72add9005f26cd3202eab8abb85acc73d.tar.xz platform-build-soong-6e13f1a72add9005f26cd3202eab8abb85acc73d.zip |
Add support for cortex-a72d-pie-core-release
Bug: 113346253
Test: lunch cheets_arm64-eng; m
Change-Id: I02dd1cfe75f97767eac7424d472ff643987c276b
[praneeth@ti.com: cherry-pick from master to pie and build test]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r-- | android/arch.go | 2 | ||||
-rw-r--r-- | cc/config/arm64_device.go | 5 | ||||
-rw-r--r-- | cc/config/arm_device.go | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/android/arch.go b/android/arch.go index 88f9f659..0478f237 100644 --- a/android/arch.go +++ b/android/arch.go | |||
@@ -955,6 +955,7 @@ func getMegaDeviceConfig() []archConfig { | |||
955 | {"arm", "armv7-a-neon", "cortex-a15", []string{"armeabi-v7a"}}, | 955 | {"arm", "armv7-a-neon", "cortex-a15", []string{"armeabi-v7a"}}, |
956 | {"arm", "armv7-a-neon", "cortex-a53", []string{"armeabi-v7a"}}, | 956 | {"arm", "armv7-a-neon", "cortex-a53", []string{"armeabi-v7a"}}, |
957 | {"arm", "armv7-a-neon", "cortex-a53.a57", []string{"armeabi-v7a"}}, | 957 | {"arm", "armv7-a-neon", "cortex-a53.a57", []string{"armeabi-v7a"}}, |
958 | {"arm", "armv7-a-neon", "cortex-a72", []string{"armeabi-v7a"}}, | ||
958 | {"arm", "armv7-a-neon", "cortex-a73", []string{"armeabi-v7a"}}, | 959 | {"arm", "armv7-a-neon", "cortex-a73", []string{"armeabi-v7a"}}, |
959 | {"arm", "armv7-a-neon", "cortex-a75", []string{"armeabi-v7a"}}, | 960 | {"arm", "armv7-a-neon", "cortex-a75", []string{"armeabi-v7a"}}, |
960 | {"arm", "armv7-a-neon", "denver", []string{"armeabi-v7a"}}, | 961 | {"arm", "armv7-a-neon", "denver", []string{"armeabi-v7a"}}, |
@@ -963,6 +964,7 @@ func getMegaDeviceConfig() []archConfig { | |||
963 | {"arm", "armv7-a-neon", "exynos-m1", []string{"armeabi-v7a"}}, | 964 | {"arm", "armv7-a-neon", "exynos-m1", []string{"armeabi-v7a"}}, |
964 | {"arm", "armv7-a-neon", "exynos-m2", []string{"armeabi-v7a"}}, | 965 | {"arm", "armv7-a-neon", "exynos-m2", []string{"armeabi-v7a"}}, |
965 | {"arm64", "armv8-a", "cortex-a53", []string{"arm64-v8a"}}, | 966 | {"arm64", "armv8-a", "cortex-a53", []string{"arm64-v8a"}}, |
967 | {"arm64", "armv8-a", "cortex-a72", []string{"arm64-v8a"}}, | ||
966 | {"arm64", "armv8-a", "cortex-a73", []string{"arm64-v8a"}}, | 968 | {"arm64", "armv8-a", "cortex-a73", []string{"arm64-v8a"}}, |
967 | {"arm64", "armv8-a", "denver64", []string{"arm64-v8a"}}, | 969 | {"arm64", "armv8-a", "denver64", []string{"arm64-v8a"}}, |
968 | {"arm64", "armv8-a", "kryo", []string{"arm64-v8a"}}, | 970 | {"arm64", "armv8-a", "kryo", []string{"arm64-v8a"}}, |
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index b2b07648..100a4948 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go | |||
@@ -86,6 +86,7 @@ func init() { | |||
86 | "armv8_2a", | 86 | "armv8_2a", |
87 | "cortex-a53", | 87 | "cortex-a53", |
88 | "cortex-a55", | 88 | "cortex-a55", |
89 | "cortex-a72", | ||
89 | "cortex-a73", | 90 | "cortex-a73", |
90 | "cortex-a75", | 91 | "cortex-a75", |
91 | "kryo", | 92 | "kryo", |
@@ -144,6 +145,7 @@ var ( | |||
144 | "": "", | 145 | "": "", |
145 | "cortex-a53": "${config.Arm64CortexA53Cflags}", | 146 | "cortex-a53": "${config.Arm64CortexA53Cflags}", |
146 | "cortex-a55": "${config.Arm64CortexA55Cflags}", | 147 | "cortex-a55": "${config.Arm64CortexA55Cflags}", |
148 | "cortex-a72": "${config.Arm64CortexA53Cflags}", | ||
147 | "cortex-a73": "${config.Arm64CortexA53Cflags}", | 149 | "cortex-a73": "${config.Arm64CortexA53Cflags}", |
148 | "cortex-a75": "${config.Arm64CortexA55Cflags}", | 150 | "cortex-a75": "${config.Arm64CortexA55Cflags}", |
149 | "kryo": "${config.Arm64KryoCflags}", | 151 | "kryo": "${config.Arm64KryoCflags}", |
@@ -160,6 +162,7 @@ var ( | |||
160 | "": "", | 162 | "": "", |
161 | "cortex-a53": "${config.Arm64ClangCortexA53Cflags}", | 163 | "cortex-a53": "${config.Arm64ClangCortexA53Cflags}", |
162 | "cortex-a55": "${config.Arm64ClangCortexA55Cflags}", | 164 | "cortex-a55": "${config.Arm64ClangCortexA55Cflags}", |
165 | "cortex-a72": "${config.Arm64ClangCortexA53Cflags}", | ||
163 | "cortex-a73": "${config.Arm64ClangCortexA53Cflags}", | 166 | "cortex-a73": "${config.Arm64ClangCortexA53Cflags}", |
164 | "cortex-a75": "${config.Arm64ClangCortexA55Cflags}", | 167 | "cortex-a75": "${config.Arm64ClangCortexA55Cflags}", |
165 | "kryo": "${config.Arm64ClangKryoCflags}", | 168 | "kryo": "${config.Arm64ClangKryoCflags}", |
@@ -251,7 +254,7 @@ func arm64ToolchainFactory(arch android.Arch) Toolchain { | |||
251 | 254 | ||
252 | var extraLdflags string | 255 | var extraLdflags string |
253 | switch arch.CpuVariant { | 256 | switch arch.CpuVariant { |
254 | case "cortex-a53", "cortex-a73", "kryo", "exynos-m1", "exynos-m2", | 257 | case "cortex-a53", "cortex-a72", "cortex-a73", "kryo", "exynos-m1", "exynos-m2", |
255 | // This variant might not need the workaround but leave it | 258 | // This variant might not need the workaround but leave it |
256 | // in the list since it has had the workaround on before. | 259 | // in the list since it has had the workaround on before. |
257 | "denver64": | 260 | "denver64": |
diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go index 4e0f6e05..1dda739b 100644 --- a/cc/config/arm_device.go +++ b/cc/config/arm_device.go | |||
@@ -160,6 +160,7 @@ func init() { | |||
160 | "cortex-a53", | 160 | "cortex-a53", |
161 | "cortex-a53-a57", | 161 | "cortex-a53-a57", |
162 | "cortex-a55", | 162 | "cortex-a55", |
163 | "cortex-a72", | ||
163 | "cortex-a73", | 164 | "cortex-a73", |
164 | "cortex-a75", | 165 | "cortex-a75", |
165 | "krait", | 166 | "krait", |
@@ -265,6 +266,7 @@ var ( | |||
265 | "cortex-a53": "${config.ArmCortexA53Cflags}", | 266 | "cortex-a53": "${config.ArmCortexA53Cflags}", |
266 | "cortex-a53.a57": "${config.ArmCortexA53Cflags}", | 267 | "cortex-a53.a57": "${config.ArmCortexA53Cflags}", |
267 | "cortex-a55": "${config.ArmCortexA55Cflags}", | 268 | "cortex-a55": "${config.ArmCortexA55Cflags}", |
269 | "cortex-a72": "${config.ArmCortexA53Cflags}", | ||
268 | "cortex-a73": "${config.ArmCortexA53Cflags}", | 270 | "cortex-a73": "${config.ArmCortexA53Cflags}", |
269 | "cortex-a75": "${config.ArmCortexA55Cflags}", | 271 | "cortex-a75": "${config.ArmCortexA55Cflags}", |
270 | "krait": "${config.ArmKraitCflags}", | 272 | "krait": "${config.ArmKraitCflags}", |
@@ -288,6 +290,7 @@ var ( | |||
288 | "cortex-a53": "${config.ArmClangCortexA53Cflags}", | 290 | "cortex-a53": "${config.ArmClangCortexA53Cflags}", |
289 | "cortex-a53.a57": "${config.ArmClangCortexA53Cflags}", | 291 | "cortex-a53.a57": "${config.ArmClangCortexA53Cflags}", |
290 | "cortex-a55": "${config.ArmClangCortexA55Cflags}", | 292 | "cortex-a55": "${config.ArmClangCortexA55Cflags}", |
293 | "cortex-a72": "${config.ArmClangCortexA53Cflags}", | ||
291 | "cortex-a73": "${config.ArmClangCortexA53Cflags}", | 294 | "cortex-a73": "${config.ArmClangCortexA53Cflags}", |
292 | "cortex-a75": "${config.ArmClangCortexA55Cflags}", | 295 | "cortex-a75": "${config.ArmClangCortexA55Cflags}", |
293 | "krait": "${config.ArmClangKraitCflags}", | 296 | "krait": "${config.ArmClangKraitCflags}", |