diff --git a/MODULE.bazel b/MODULE.bazel index 511a2fb4eb72c6..aada3d16c579e0 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -314,6 +314,7 @@ use_repo( "openjdk_linux_aarch64_vanilla", "openjdk_linux_ppc64le_vanilla", "openjdk_linux_riscv64_vanilla", + "openjdk_linux_sw_64_vanilla", "openjdk_linux_s390x_vanilla", "openjdk_linux_vanilla", "openjdk_macos_aarch64_vanilla", diff --git a/src/BUILD b/src/BUILD index 54e76a63aaa40a..839442c07ad703 100644 --- a/src/BUILD +++ b/src/BUILD @@ -175,6 +175,9 @@ filegroup( "//src/conditions:linux_riscv64": [ "@openjdk_linux_riscv64_vanilla//file", ], + "//src/conditions:linux_sw_64": [ + "@openjdk_linux_sw_64_vanilla//file", + ], "//conditions:default": [ "@openjdk_linux_vanilla//file", ], diff --git a/src/conditions/BUILD b/src/conditions/BUILD index 3de0e51aafae3e..6ef645a9d16e77 100644 --- a/src/conditions/BUILD +++ b/src/conditions/BUILD @@ -84,6 +84,15 @@ config_setting( visibility = ["//visibility:public"], ) +config_setting( + name = "linux_sw_64", + constraint_values = [ + "@platforms//os:linux", + "@platforms//cpu:sw_64", + ], + visibility = ["//visibility:public"], +) + config_setting( name = "linux_x86_64", constraint_values = [ diff --git a/src/conditions/BUILD.tools b/src/conditions/BUILD.tools index 04fd16004f1dfa..f6fae8632db557 100644 --- a/src/conditions/BUILD.tools +++ b/src/conditions/BUILD.tools @@ -67,6 +67,15 @@ config_setting( visibility = ["//visibility:public"], ) +config_setting( + name = "linux_sw_64", + constraint_values = [ + "@platforms//os:linux", + "@platforms//cpu:sw_64", + ], + visibility = ["//visibility:public"], +) + config_setting( name = "linux_x86_64", constraint_values = [ 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 6581faddd57d55..fecc833260c2cd 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 @@ -56,6 +56,7 @@ public String convert(String input) throws OptionsParsingException { case S390X -> "s390x"; case MIPS64 -> "mips64"; case RISCV64 -> "riscv64"; + case SW64 -> "sw_64"; default -> "unknown"; }; default -> "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 88ae4a32f3de77..de9db89b455228 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 @@ -29,6 +29,7 @@ public enum CPU { S390X("s390x", ImmutableSet.of("s390x", "s390")), MIPS64("mips64", ImmutableSet.of("mips64el", "mips64")), RISCV64("riscv64", ImmutableSet.of("riscv64")), + SW64("sw_64", ImmutableSet.of("sw_64")), UNKNOWN("unknown", ImmutableSet.of()); private final String canonicalName; diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java index d1639eb590b23d..965d6de7b0ff90 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java @@ -111,6 +111,10 @@ public static void setup( " constraint_setting = ':cpu',", ")", "constraint_value(", + " name = 'sw_64',", + " constraint_setting = ':cpu',", + ")", + "constraint_value(", " name = 's390x',", " constraint_setting = ':cpu',", ")");