Remove workaround for cortex-a55/a75
Test: m checkbuild
Test: boot on a55/a75 device, pass bionic tests
Bug: 110235326
Change-Id: I5ab2102352a6efe1173b3097875e6e779d4a1a09
Merged-In: I5ab2102352a6efe1173b3097875e6e779d4a1a09
(cherry picked from commit 9a350e644b4e5762df5838e007a55af68449c937)
(cherry picked from commit 40c869b0aeff3df0d34a6b0540c1a04c142552ff)
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index b2b0764..00c29f5 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -50,15 +50,12 @@
"-mcpu=cortex-a53",
},
"cortex-a55": []string{
- // The cortex-a55 target is not yet supported,
- // so use cortex-a53.
- "-mcpu=cortex-a53",
+ "-mcpu=cortex-a55",
},
"cortex-a75": []string{
- // Use the cortex-a53 since it is similar to the little
+ // Use the cortex-a55 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",
+ "-mcpu=cortex-a55",
},
"kryo": []string{
// Use the cortex-a57 cpu since some compilers
diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index 4e0f6e0..cad1b16 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -98,7 +98,7 @@
"-D__ARM_FEATURE_LPAE=1",
},
"cortex-a55": []string{
- "-mcpu=cortex-a53",
+ "-mcpu=cortex-a55",
"-mfpu=neon-fp-armv8",
// Fake an ARM compiler flag as these processors support LPAE which GCC/clang
// don't advertise.
@@ -107,7 +107,7 @@
"-D__ARM_FEATURE_LPAE=1",
},
"cortex-a75": []string{
- "-mcpu=cortex-a53",
+ "-mcpu=cortex-a55",
"-mfpu=neon-fp-armv8",
// Fake an ARM compiler flag as these processors support LPAE which GCC/clang
// don't advertise.
