Add cortex-a73 support.
Also, update flags for cortex-a53.
Bug: 37647380
Test: Built target with cortex-a73 for both 32 bit/64 bit.
Test: Built target with cortex-a53.cortex-a57 for both 32 bit/64 bit.
Test: Ran bionic unit tests, ran art target tests.
(cherry picked from commit 1d9aa26d44
)
Change-Id: I3325f60add7f424f8cca53c22919fc481ef5e787
This commit is contained in:
parent
02f3add3a3
commit
6df46f5d93
2 changed files with 23 additions and 5 deletions
|
@ -93,7 +93,8 @@ const (
|
|||
func init() {
|
||||
android.RegisterArchVariants(android.Arm64,
|
||||
"armv8_a",
|
||||
"cortex_a53",
|
||||
"cortex-a53",
|
||||
"cortex-a73",
|
||||
"kryo",
|
||||
"denver64")
|
||||
|
||||
|
@ -129,12 +130,14 @@ var (
|
|||
arm64CpuVariantCflagsVar = map[string]string{
|
||||
"": "",
|
||||
"cortex-a53": "${config.Arm64CortexA53Cflags}",
|
||||
"cortex-a73": "${config.Arm64CortexA53Cflags}",
|
||||
"kryo": "${config.Arm64KryoCflags}",
|
||||
}
|
||||
|
||||
arm64ClangCpuVariantCflagsVar = map[string]string{
|
||||
"": "",
|
||||
"cortex-a53": "${config.Arm64ClangCortexA53Cflags}",
|
||||
"cortex-a73": "${config.Arm64ClangCortexA53Cflags}",
|
||||
"kryo": "${config.Arm64ClangKryoCflags}",
|
||||
}
|
||||
)
|
||||
|
|
|
@ -127,6 +127,15 @@ var (
|
|||
// better solution comes around. See Bug 27340895
|
||||
"-D__ARM_FEATURE_LPAE=1",
|
||||
},
|
||||
"cortex-a53": []string{
|
||||
"-mcpu=cortex-a53",
|
||||
"-mfpu=neon-fp-armv8",
|
||||
// Fake an ARM compiler flag as these processors support LPAE which GCC/clang
|
||||
// don't advertise.
|
||||
// TODO This is a hack and we need to add it for each processor that supports LPAE until some
|
||||
// better solution comes around. See Bug 27340895
|
||||
"-D__ARM_FEATURE_LPAE=1",
|
||||
},
|
||||
"krait": []string{
|
||||
"-mcpu=cortex-a15",
|
||||
"-mfpu=neon-vfpv4",
|
||||
|
@ -169,6 +178,7 @@ func init() {
|
|||
"cortex-a15",
|
||||
"cortex-a53",
|
||||
"cortex-a53-a57",
|
||||
"cortex-a73",
|
||||
"krait",
|
||||
"kryo",
|
||||
"denver")
|
||||
|
@ -207,6 +217,7 @@ func init() {
|
|||
pctx.StaticVariable("ArmCortexA7Cflags", strings.Join(armCpuVariantCflags["cortex-a7"], " "))
|
||||
pctx.StaticVariable("ArmCortexA8Cflags", strings.Join(armCpuVariantCflags["cortex-a8"], " "))
|
||||
pctx.StaticVariable("ArmCortexA15Cflags", strings.Join(armCpuVariantCflags["cortex-a15"], " "))
|
||||
pctx.StaticVariable("ArmCortexA53Cflags", strings.Join(armCpuVariantCflags["cortex-a53"], " "))
|
||||
pctx.StaticVariable("ArmKraitCflags", strings.Join(armCpuVariantCflags["krait"], " "))
|
||||
pctx.StaticVariable("ArmKryoCflags", strings.Join(armCpuVariantCflags["kryo"], " "))
|
||||
|
||||
|
@ -237,6 +248,8 @@ func init() {
|
|||
strings.Join(armClangCpuVariantCflags["cortex-a8"], " "))
|
||||
pctx.StaticVariable("ArmClangCortexA15Cflags",
|
||||
strings.Join(armClangCpuVariantCflags["cortex-a15"], " "))
|
||||
pctx.StaticVariable("ArmClangCortexA53Cflags",
|
||||
strings.Join(armClangCpuVariantCflags["cortex-a53"], " "))
|
||||
pctx.StaticVariable("ArmClangKraitCflags",
|
||||
strings.Join(armClangCpuVariantCflags["krait"], " "))
|
||||
pctx.StaticVariable("ArmClangKryoCflags",
|
||||
|
@ -255,8 +268,9 @@ var (
|
|||
"cortex-a7": "${config.ArmCortexA7Cflags}",
|
||||
"cortex-a8": "${config.ArmCortexA8Cflags}",
|
||||
"cortex-a15": "${config.ArmCortexA15Cflags}",
|
||||
"cortex-a53": "${config.ArmCortexA7Cflags}",
|
||||
"cortex-a53.a57": "${config.ArmCortexA7Cflags}",
|
||||
"cortex-a53": "${config.ArmCortexA53Cflags}",
|
||||
"cortex-a53.a57": "${config.ArmCortexA53Cflags}",
|
||||
"cortex-a73": "${config.ArmCortexA53Cflags}",
|
||||
"krait": "${config.ArmKraitCflags}",
|
||||
"kryo": "${config.ArmKryoCflags}",
|
||||
"denver": "${config.ArmCortexA15Cflags}",
|
||||
|
@ -273,8 +287,9 @@ var (
|
|||
"cortex-a7": "${config.ArmClangCortexA7Cflags}",
|
||||
"cortex-a8": "${config.ArmClangCortexA8Cflags}",
|
||||
"cortex-a15": "${config.ArmClangCortexA15Cflags}",
|
||||
"cortex-a53": "${config.ArmClangCortexA7Cflags}",
|
||||
"cortex-a53.a57": "${config.ArmClangCortexA7Cflags}",
|
||||
"cortex-a53": "${config.ArmClangCortexA53Cflags}",
|
||||
"cortex-a53.a57": "${config.ArmClangCortexA53Cflags}",
|
||||
"cortex-a73": "${config.ArmClangCortexA53Cflags}",
|
||||
"krait": "${config.ArmClangKraitCflags}",
|
||||
"kryo": "${config.ArmClangKryoCflags}",
|
||||
"denver": "${config.ArmClangCortexA15Cflags}",
|
||||
|
|
Loading…
Reference in a new issue