From 40c869b0aeff3df0d34a6b0540c1a04c142552ff Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Sun, 17 Jun 2018 02:15:24 -0700 Subject: 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) --- cc/config/arm64_device.go | 9 +++------ cc/config/arm_device.go | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index b2b07648..00c29f53 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -50,15 +50,12 @@ var ( "-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 4e0f6e05..cad1b161 100644 --- a/cc/config/arm_device.go +++ b/cc/config/arm_device.go @@ -98,7 +98,7 @@ var ( "-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 @@ var ( "-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. -- cgit v1.2.3