diff options
| author | TreeHugger Robot | 2018-06-29 19:46:02 -0500 |
|---|---|---|
| committer | Android (Google) Code Review | 2018-06-29 19:46:02 -0500 |
| commit | a5471138c51014e1cfa84a50bf3c7da26e5a06cb (patch) | |
| tree | 327ea83738ffb3f9bfb7d9e0bccb5b1f777aa565 | |
| parent | 9747eed816fda6b1766f20dfb84b43ffe4abc1be (diff) | |
| parent | 40c869b0aeff3df0d34a6b0540c1a04c142552ff (diff) | |
| download | platform-build-soong-android-9.0.0_r38.tar.gz platform-build-soong-android-9.0.0_r38.tar.xz platform-build-soong-android-9.0.0_r38.zip | |
Merge "Remove workaround for cortex-a55/a75" into pi-devandroid-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16
| -rw-r--r-- | cc/config/arm64_device.go | 9 | ||||
| -rw-r--r-- | 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 ( | |||
| 50 | "-mcpu=cortex-a53", | 50 | "-mcpu=cortex-a53", |
| 51 | }, | 51 | }, |
| 52 | "cortex-a55": []string{ | 52 | "cortex-a55": []string{ |
| 53 | // The cortex-a55 target is not yet supported, | 53 | "-mcpu=cortex-a55", |
| 54 | // so use cortex-a53. | ||
| 55 | "-mcpu=cortex-a53", | ||
| 56 | }, | 54 | }, |
| 57 | "cortex-a75": []string{ | 55 | "cortex-a75": []string{ |
| 58 | // Use the cortex-a53 since it is similar to the little | 56 | // Use the cortex-a55 since it is similar to the little |
| 59 | // core (cortex-a55) and is sensitive to ordering. | 57 | // core (cortex-a55) and is sensitive to ordering. |
| 60 | // The cortex-a55 target is not yet supported. | 58 | "-mcpu=cortex-a55", |
| 61 | "-mcpu=cortex-a53", | ||
| 62 | }, | 59 | }, |
| 63 | "kryo": []string{ | 60 | "kryo": []string{ |
| 64 | // Use the cortex-a57 cpu since some compilers | 61 | // 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 ( | |||
| 98 | "-D__ARM_FEATURE_LPAE=1", | 98 | "-D__ARM_FEATURE_LPAE=1", |
| 99 | }, | 99 | }, |
| 100 | "cortex-a55": []string{ | 100 | "cortex-a55": []string{ |
| 101 | "-mcpu=cortex-a53", | 101 | "-mcpu=cortex-a55", |
| 102 | "-mfpu=neon-fp-armv8", | 102 | "-mfpu=neon-fp-armv8", |
| 103 | // Fake an ARM compiler flag as these processors support LPAE which GCC/clang | 103 | // Fake an ARM compiler flag as these processors support LPAE which GCC/clang |
| 104 | // don't advertise. | 104 | // don't advertise. |
| @@ -107,7 +107,7 @@ var ( | |||
| 107 | "-D__ARM_FEATURE_LPAE=1", | 107 | "-D__ARM_FEATURE_LPAE=1", |
| 108 | }, | 108 | }, |
| 109 | "cortex-a75": []string{ | 109 | "cortex-a75": []string{ |
| 110 | "-mcpu=cortex-a53", | 110 | "-mcpu=cortex-a55", |
| 111 | "-mfpu=neon-fp-armv8", | 111 | "-mfpu=neon-fp-armv8", |
| 112 | // Fake an ARM compiler flag as these processors support LPAE which GCC/clang | 112 | // Fake an ARM compiler flag as these processors support LPAE which GCC/clang |
| 113 | // don't advertise. | 113 | // don't advertise. |