diff options
| author | Alex Naidis <alex.naidis@linux.com> | 2016-08-30 15:56:33 +0200 |
|---|---|---|
| committer | Alex Naidis <alex.naidis@linux.com> | 2017-04-04 19:09:43 +0000 |
| commit | ac01ff5447518986f778be5b5c5a7bb0bf354e9c (patch) | |
| tree | f769b5c990094fe51e4c0695a270ccedc2a9b068 | |
| parent | ae4fc1840653fd5598f81d33ac33a00d09b94607 (diff) | |
| download | build_soong-ac01ff5447518986f778be5b5c5a7bb0bf354e9c.tar.gz build_soong-ac01ff5447518986f778be5b5c5a7bb0bf354e9c.tar.bz2 build_soong-ac01ff5447518986f778be5b5c5a7bb0bf354e9c.zip | |
Add support for an armv8 variant for Kryo
* Use mcpu=cortex-a57, since it is the closest to Kryo.
* Clang doesn't support Kryo as a target yet.
Bug: 36728278
Test: Built and booted a sailfish using Kryo.
Change-Id: Ic0c9588d86fba41896e50e3f0cf0d2b310ffee93
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
| -rw-r--r-- | android/arch.go | 1 | ||||
| -rw-r--r-- | cc/config/arm64_device.go | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/android/arch.go b/android/arch.go index 6f123ea8..f9697bc1 100644 --- a/android/arch.go +++ b/android/arch.go @@ -859,6 +859,7 @@ func getMegaDeviceConfig() []archConfig { {"arm", "armv7-a-neon", "kryo", []string{"armeabi-v7a"}}, {"arm64", "armv8-a", "cortex-a53", []string{"arm64-v8a"}}, {"arm64", "armv8-a", "denver64", []string{"arm64-v8a"}}, + {"arm64", "armv8-a", "kryo", []string{"arm64-v8a"}}, {"mips", "mips32-fp", "", []string{"mips"}}, {"mips", "mips32r2-fp", "", []string{"mips"}}, {"mips", "mips32r2-fp-xburst", "", []string{"mips"}}, diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index 23186e76..60245d0c 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -76,6 +76,11 @@ var ( "cortex-a53": []string{ "-mcpu=cortex-a53", }, + "kryo": []string{ + // Use the cortex-a57 cpu since no compiler supports + // Kryo as a CPU target yet. + "-mcpu=cortex-a57", + }, } arm64ClangCpuVariantCflags = copyVariantFlags(arm64CpuVariantCflags) @@ -89,6 +94,7 @@ func init() { android.RegisterArchVariants(android.Arm64, "armv8_a", "cortex_a53", + "kryo", "denver64") pctx.StaticVariable("arm64GccVersion", arm64GccVersion) @@ -109,17 +115,24 @@ func init() { strings.Join(arm64CpuVariantCflags["cortex-a53"], " ")) pctx.StaticVariable("Arm64ClangCortexA53Cflags", strings.Join(arm64ClangCpuVariantCflags["cortex-a53"], " ")) + + pctx.StaticVariable("Arm64KryoCflags", + strings.Join(arm64CpuVariantCflags["kryo"], " ")) + pctx.StaticVariable("Arm64ClangKryoCflags", + strings.Join(arm64ClangCpuVariantCflags["kryo"], " ")) } var ( arm64CpuVariantCflagsVar = map[string]string{ "": "", "cortex-a53": "${config.Arm64CortexA53Cflags}", + "kryo": "${config.Arm64KryoCflags}", } arm64ClangCpuVariantCflagsVar = map[string]string{ "": "", "cortex-a53": "${config.Arm64ClangCortexA53Cflags}", + "kryo": "${config.Arm64ClangKryoCflags}", } ) |