From 8c01f5c596f383c072f523ba3ad0f36ec0a82892 Mon Sep 17 00:00:00 2001 From: Junmo Park Date: Wed, 27 Apr 2016 16:51:50 +0900 Subject: [PATCH] ART: add exynos-m1 to a53 #835769 & #843419 erratum exception list Exynos-M1 is custom-designed 64-bit ARM CPU and does not need this A53 erratum handling. Bug: 28412250 Signed-off-by: Junmo Park (cherry picked from commit 2bd7d2d6d92daa796ee33e70bb788d3dae1f2fc9) Change-Id: Id460e4e98baafeed1cf3540cec754b30044cda11 --- runtime/arch/arm64/instruction_set_features_arm64.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/arch/arm64/instruction_set_features_arm64.cc b/runtime/arch/arm64/instruction_set_features_arm64.cc index 613bb5c76..cad13b29d 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", "kryo" + "denver64", "kryo", "exynos-m1" }; if (!FindVariantInArray(arm64_known_variants, arraysize(arm64_known_variants), variant)) { std::ostringstream os; -- 2.11.0