diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-10-21 16:40:31 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-21 16:40:31 -0700 |
| commit | 2e5131ce0db9a11be1406d4e6b5a27993a0d1bd5 (patch) | |
| tree | 9815069c209d5b9a4a86156592585f2fba79799f /runtime | |
| parent | ead3f39d3e80a90a1863e79822bf5acfae50e9ca (diff) | |
| parent | 7f0ee796911440a825aaf5d69b7d861893529a4a (diff) | |
| download | art-2e5131ce0db9a11be1406d4e6b5a27993a0d1bd5.zip art-2e5131ce0db9a11be1406d4e6b5a27993a0d1bd5.tar.gz art-2e5131ce0db9a11be1406d4e6b5a27993a0d1bd5.tar.bz2 | |
Merge branch 'm' of git://codeaurora.org/platform/art into cm-13.0
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/arm64/instruction_set_features_arm64.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/arm64/instruction_set_features_arm64.cc b/runtime/arch/arm64/instruction_set_features_arm64.cc index 395cee8..613bb5c 100644 --- a/runtime/arch/arm64/instruction_set_features_arm64.cc +++ b/runtime/arch/arm64/instruction_set_features_arm64.cc @@ -39,7 +39,7 @@ const Arm64InstructionSetFeatures* Arm64InstructionSetFeatures::FromVariant( if (!needs_a53_835769_fix) { // Check to see if this is an expected variant. static const char* arm64_known_variants[] = { - "denver64" + "denver64", "kryo" }; if (!FindVariantInArray(arm64_known_variants, arraysize(arm64_known_variants), variant)) { std::ostringstream os; |