Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
9 changes: 9 additions & 0 deletions src/conditions/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
9 changes: 9 additions & 0 deletions src/conditions/BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/google/devtools/build/lib/util/CPU.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.<String>of());

private final String canonicalName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',",
")");
Expand Down