diff options
| author | Bill Yi <byi@google.com> | 2018-11-30 11:53:47 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-30 11:53:47 -0800 |
| commit | 915838407b318a30fb2ac687cd4c6d188917dfe7 (patch) | |
| tree | 327ea83738ffb3f9bfb7d9e0bccb5b1f777aa565 | |
| parent | a427e814f07d071b4a3c31976a7701b4f80546b5 (diff) | |
| parent | 25ce2ab6bf2b41dd300236b01c47206f12006b75 (diff) | |
| download | build_soong-915838407b318a30fb2ac687cd4c6d188917dfe7.tar.gz build_soong-915838407b318a30fb2ac687cd4c6d188917dfe7.tar.bz2 build_soong-915838407b318a30fb2ac687cd4c6d188917dfe7.zip | |
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
am: 25ce2ab6bf
Change-Id: Ib77908761dcabb10db06e81690065736371b1abe
| -rw-r--r-- | cc/config/arm64_device.go | 9 | ||||
| -rw-r--r-- | cc/config/arm_device.go | 4 | ||||
| -rw-r--r-- | cc/sabi.go | 9 |
3 files changed, 12 insertions, 10 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. @@ -74,8 +74,13 @@ func (sabimod *sabi) flags(ctx ModuleContext, flags Flags) Flags { // RSClang does not support recent mcpu option likes exynos-m2. // So we need overriding mcpu option when we want to use it. - if ctx.Arch().CpuVariant == "exynos-m2" { - flags.ToolingCFlags = append(flags.ToolingCFlags, "-mcpu=cortex-a53") + mappedArch := map[string]string{ + "exynos-m2": "cortex-a53", + "cortex-a55": "cortex-a53", + "cortex-a75": "cortex-a57", + } + if arch, ok := mappedArch[ctx.Arch().CpuVariant]; ok { + flags.ToolingCFlags = append(flags.ToolingCFlags, "-mcpu="+arch) } return flags |