Adds support for ARMv6.

runtime/vm/cpu_arm.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/cpu.h"
 #include "vm/cpuinfo.h"
@@ skipping 36 matching lines @@
 #if !defined(HOST_ARCH_ARM)
   "sim"
 #endif  // !defined(HOST_ARCH_ARM)
   "arm";
 }
 
 
 bool HostCPUFeatures::integer_division_supported_ = false;
 bool HostCPUFeatures::neon_supported_ = false;
 const char* HostCPUFeatures::hardware_ = NULL;
+ARMVersion HostCPUFeatures::arm_version_ = ARMvUnknown;
 #if defined(DEBUG)
 bool HostCPUFeatures::initialized_ = false;
 #endif
 
 
 #if defined(HOST_ARCH_ARM)
 void HostCPUFeatures::InitOnce() {
   CpuInfo::InitOnce();
   hardware_ = CpuInfo::GetCpuModel();
-  // Implements ARMv7.
-  ASSERT(CpuInfo::FieldContains(kCpuInfoProcessor, "ARMv7"));
+  // Check for ARMv6 or ARMv7. It can be in either the Processor or
+  // Model information fields.
+  if (CpuInfo::FieldContains(kCpuInfoProcessor, "ARMv6") ||
+      CpuInfo::FieldContains(kCpuInfoModel, "ARMv6")) {
+    arm_version_ = ARMv6;
+  } else {
+    ASSERT(CpuInfo::FieldContains(kCpuInfoProcessor, "ARMv7") ||
+           CpuInfo::FieldContains(kCpuInfoModel, "ARMv7"));
+    arm_version_ = ARMv7;
+  }
   // Has floating point unit.
   ASSERT(CpuInfo::FieldContains(kCpuInfoFeatures, "vfp"));
   // Has integer division.
-  bool is_krait = CpuInfo::FieldContains(kCpuInfoModel, "QCT APQ8064");
+  bool is_krait = CpuInfo::FieldContains(kCpuInfoHardware, "QCT APQ8064");
   if (is_krait) {
     // Special case for Qualcomm Krait CPUs in Nexus 4 and 7.
     integer_division_supported_ = true;
   } else {
     integer_division_supported_ =
         CpuInfo::FieldContains(kCpuInfoFeatures, "idiva");
   }
   neon_supported_ = CpuInfo::FieldContains(kCpuInfoFeatures, "neon");
 #if defined(DEBUG)
   initialized_ = true;
@@ skipping 12 matching lines @@
   CpuInfo::Cleanup();
 }
 
 #else
 
 void HostCPUFeatures::InitOnce() {
   CpuInfo::InitOnce();
   hardware_ = CpuInfo::GetCpuModel();
   integer_division_supported_ = true;
   neon_supported_ = true;
+  arm_version_ = ARMv7;
 #if defined(DEBUG)
   initialized_ = true;
 #endif
 }
 
 
 void HostCPUFeatures::Cleanup() {
   DEBUG_ASSERT(initialized_);
 #if defined(DEBUG)
   initialized_ = false;
 #endif
   ASSERT(hardware_ != NULL);
   free(const_cast<char*>(hardware_));
   hardware_ = NULL;
   CpuInfo::Cleanup();
 }
 #endif  // defined(HOST_ARCH_ARM)
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM