diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-11-13 21:11:58 +0100 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-11-13 21:12:19 +0100 |
| commit | 72067656536d158cbf984b5fdc5738725fc556ed (patch) | |
| tree | e6274b346f665d568a2901cc718c1121ffd8c135 | |
| parent | 5e1eaa6520334f165eb75eb3d6e0bf75afd48c5d (diff) | |
| parent | a5471138c51014e1cfa84a50bf3c7da26e5a06cb (diff) | |
| download | build_soong-72067656536d158cbf984b5fdc5738725fc556ed.tar.gz build_soong-72067656536d158cbf984b5fdc5738725fc556ed.tar.bz2 build_soong-72067656536d158cbf984b5fdc5738725fc556ed.zip | |
Merge tag 'android-9.0.0_r16' into lineage-16.0
Android 9.0.0 Release 16 (PQ1A.181105.017.A1)
* tag 'android-9.0.0_r16':
Remove workaround for cortex-a55/a75
Update ToolingCFlags overrides to include other new architectures
Fix VNDK-Ext ABI check regression
Change-Id: I0792d0ba25239273ccd1842e014aa316ef8eba8c
| -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 11625e80..8be33a85 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 |