Add native support for linux on ARM Cpu (32 bits)

--
Change-Id: Ia70ca1b8482e10bc1ac91799aa238f8613e5c824
Reviewed-on: https://bazel-review.googlesource.com/#/c/1801
MOS_MIGRATED_REVID=100476467

2 files changed, 3 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index b2e9f1a4dd..8b526ff75d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -405,6 +405,8 @@ public final class BuildConfiguration {
                 return "piii";
               case X86_64:
                 return "k8";
+              case ARM:
+                return "arm";
             }
         }
         return "unknown";
diff --git a/src/main/java/com/google/devtools/build/lib/util/CPU.java b/src/main/java/com/google/devtools/build/lib/util/CPU.java
index fd54ddd69f..0bfce8a6ba 100644
--- a/src/main/java/com/google/devtools/build/lib/util/CPU.java
+++ b/src/main/java/com/google/devtools/build/lib/util/CPU.java
@@ -23,6 +23,7 @@ import java.util.Set;
 public enum CPU {
   X86_32("x86_32", ImmutableSet.of("i386", "i486", "i586", "i686", "i786", "x86")),
   X86_64("x86_64", ImmutableSet.of("amd64", "x86_64", "x64")),
+  ARM("arm", ImmutableSet.of("arm", "armv7l")),
   UNKNOWN("unknown", ImmutableSet.<String>of());
 
   private final String canonicalName;