From 18342789a16cf06d5c880346a8af0488dcf5848a Mon Sep 17 00:00:00 2001
From: "Dr.-Ing. Patrick Siegl" <patrick@siegl.it>
Date: Tue, 25 Jun 2019 17:58:31 +0200
Subject: [PATCH] Fix ARMv6 on Linux vs Android (#81)

---
 src/cpuinfo_arm.c        | 6 +++++-
 test/cpuinfo_arm_test.cc | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/cpuinfo_arm.c b/src/cpuinfo_arm.c
index eb27298..16cf748 100644
--- a/src/cpuinfo_arm.c
+++ b/src/cpuinfo_arm.c
@@ -102,7 +102,11 @@ static bool HandleArmLine(const LineResult result, ArmInfo* const info,
       const StringView digits =
           CpuFeatures_StringView_KeepFront(value, IndexOfNonDigit(value));
       info->architecture = CpuFeatures_StringView_ParsePositiveNumber(digits);
-    } else if (CpuFeatures_StringView_IsEquals(key, str("Processor"))) {
+    } else if (CpuFeatures_StringView_IsEquals(key, str("Processor"))
+               || CpuFeatures_StringView_IsEquals(key, str("model name")) ) {
+      // Android reports this in a non-Linux standard "Processor" but sometimes
+      // also in "model name", Linux reports it only in "model name"
+      // see RaspberryPiZero (Linux) vs InvalidArmv7 (Android) test-cases
       proc_info->processor_reports_armv6 =
           CpuFeatures_StringView_IndexOf(value, str("(v6l)")) >= 0;
     } else if (CpuFeatures_StringView_IsEquals(key, str("Hardware"))) {
diff --git a/test/cpuinfo_arm_test.cc b/test/cpuinfo_arm_test.cc
index 811434c..59d8022 100644
--- a/test/cpuinfo_arm_test.cc
+++ b/test/cpuinfo_arm_test.cc
@@ -83,6 +83,7 @@ CPU revision    : 3)");
   EXPECT_FALSE(info.features.crc32);
 }
 
+// Linux test-case
 TEST(CpuinfoArmTest, RaspberryPiZero) {
   DisableHardwareCapabilities();
   auto& fs = GetEmptyFilesystem();
@@ -104,7 +105,7 @@ Serial          : 000000006cd946f3)");
   EXPECT_EQ(info.variant, 0x0);
   EXPECT_EQ(info.part, 0xb76);
   EXPECT_EQ(info.revision, 7);
-  EXPECT_EQ(info.architecture, 7);
+  EXPECT_EQ(info.architecture, 6);
 
   EXPECT_TRUE(info.features.half);
   EXPECT_TRUE(info.features.thumb);
@@ -127,6 +128,7 @@ Serial          : 000000006cd946f3)");
   EXPECT_FALSE(info.features.crc32);
 }
 
+// Android test-case
 // http://code.google.com/p/android/issues/detail?id=10812
 TEST(CpuinfoArmTest, InvalidArmv7) {
   DisableHardwareCapabilities();
@@ -168,6 +170,7 @@ Serial          : 33323613546d00ec )");
   EXPECT_FALSE(info.features.crc32);
 }
 
+// Android test-case
 // https://crbug.com/341598.
 TEST(CpuinfoArmTest, InvalidNeon) {
   auto& fs = GetEmptyFilesystem();