diff options
author | Arielle Albon <arielle@hopeless-newbie.co.uk> | 2018-06-20 05:51:18 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-20 05:53:02 -0700 |
commit | 886d01c89fca32e46f5841081eb3288e5b4f313b (patch) | |
tree | 99d3601c166bc492637542cab9babe8b495af730 /src/main | |
parent | 7508195014ccbe63069fa9b51835ce26019df8ee (diff) |
Add Arm64 support
Based on work of Sun Zhiyi <zhiyisun@gmail.com>.
Closes #5360.
PiperOrigin-RevId: 201339882
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/util/CPU.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java b/src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java index d63ffdd630..32d25c8309 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java @@ -55,6 +55,8 @@ public class AutoCpuConverter implements Converter<String> { return "ppc"; case ARM: return "arm"; + case AARCH64: + return "aarch64"; case S390X: return "s390x"; default: 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 e210eb5c43..a3f7308ad6 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 @@ -24,7 +24,8 @@ 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")), PPC("ppc", ImmutableSet.of("ppc", "ppc64", "ppc64le")), - ARM("arm", ImmutableSet.of("aarch64", "arm", "armv7l")), + ARM("arm", ImmutableSet.of("arm", "armv7l")), + AARCH64("aarch64", ImmutableSet.of("aarch64")), S390X("s390x", ImmutableSet.of("s390x", "s390")), UNKNOWN("unknown", ImmutableSet.<String>of()); |