diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index a4592a4f5b5069..ea9cde8bfaceec 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -29,11 +29,6 @@ filegroup(
             ":without-jdk/install.sh",
             ":generate-package-info",
         ],
-        "//src/conditions:darwin_x86_64": [
-            ":with-jdk/install.sh",
-            ":without-jdk/install.sh",
-            ":generate-package-info",
-        ],
         "//conditions:default": [
             ":with-jdk/install.sh",
             ":without-jdk/install.sh",
diff --git a/src/BUILD b/src/BUILD
index 5dc3797b4cf18e..1e19f3d3f82bca 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -24,7 +24,6 @@ md5_cmd = "set -e -o pipefail && %s $(SRCS) | %s | %s > $@"
     outs = ["install_base_key" + suffix],
     cmd = select({
         "//src/conditions:darwin": md5_cmd % ("/sbin/md5", "/sbin/md5", "head -c 32"),
-        "//src/conditions:darwin_x86_64": md5_cmd % ("/sbin/md5", "/sbin/md5", "head -c 32"),
         "//src/conditions:freebsd": md5_cmd % ("/sbin/md5", "/sbin/md5", "head -c 32"),
         # We avoid using the `head` tool's `-c` option, since it does not exist
         # on OpenBSD.
@@ -133,9 +132,6 @@ JAVA_TOOLS = [
                "//src/conditions:darwin": [
                    ":darwin_tools",
                ],
-               "//src/conditions:darwin_x86_64": [
-                   ":darwin_tools",
-               ],
                "//conditions:default": [
                    ":dummy_darwin_tools",
                ],
@@ -173,9 +169,6 @@ filegroup(
         "//src/conditions:darwin": [
             "@openjdk_macos//file",
         ],
-        "//src/conditions:darwin_x86_64": [
-            "@openjdk_macos//file",
-        ],
         "//src/conditions:windows": [
             "@openjdk_win//file",
         ],
@@ -195,9 +188,6 @@ filegroup(
         "//src/conditions:darwin": [
             "@openjdk_macos_minimal//file",
         ],
-        "//src/conditions:darwin_x86_64": [
-            "@openjdk_macos_minimal//file",
-        ],
         "//src/conditions:windows": [
             "@openjdk_win_minimal//file",
         ],
@@ -217,9 +207,6 @@ filegroup(
         "//src/conditions:darwin": [
             "@openjdk_macos_vanilla//file",
         ],
-        "//src/conditions:darwin_x86_64": [
-            "@openjdk_macos_vanilla//file",
-        ],
         "//src/conditions:windows": [
             "@openjdk_win_vanilla//file",
         ],
@@ -625,9 +612,8 @@ JAVA_VERSIONS = ("11",)
             "--platform",
         ] + select({
             "//src/conditions:darwin": ["darwin"],
-            "//src/conditions:darwin_x86_64": ["darwin_x86_64"],
             "//src/conditions:windows": ["windows"],
-            "//src/conditions:linux_x86_64": ["linux"],
+            "//src/conditions:linux": ["linux"],
             "//conditions:default": ["unknown"],
         }),
         data = [":java_tools_dist_java" + java_version],
@@ -716,9 +702,8 @@ JAVA_VERSIONS = ("11",)
             "--platform",
         ] + select({
             "//src/conditions:darwin": ["darwin"],
-            "//src/conditions:darwin_x86_64": ["darwin_x86_64"],
             "//src/conditions:windows": ["windows"],
-            "//src/conditions:linux_x86_64": ["linux"],
+            "//src/conditions:linux": ["linux"],
             "//conditions:default": ["unknown"],
         }),
         data = [":java_tools_java" + java_version + "_zip"],
diff --git a/src/conditions/BUILD b/src/conditions/BUILD
index 44c206149edd2b..122459c9eafb01 100644
--- a/src/conditions/BUILD
+++ b/src/conditions/BUILD
@@ -13,66 +13,96 @@ filegroup(
     visibility = ["//src:__pkg__"],
 )
 
-# There is no config_setting for "linux".
-# See https://github.com/bazelbuild/bazel/issues/11107
+config_setting(
+    name = "linux",
+    constraint_values = ["@platforms//os:linux"],
+    visibility = ["//visibility:public"],
+)
 
 config_setting(
     name = "linux_aarch64",
-    values = {"cpu": "aarch64"},
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:aarch64",
+    ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_arm",
-    values = {"cpu": "arm"},
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:arm",
+    ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_ppc",
-    values = {"cpu": "ppc"},
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:ppc",
+    ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_ppc64le",
-    values = {"cpu": "ppc"},
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:ppc",
+    ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_s390x",
-    values = {"cpu": "s390x"},
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:s390x",
+    ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_x86_64",
-    values = {"cpu": "k8"},
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+    ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "darwin",
-    values = {"cpu": "darwin"},
+    constraint_values = ["@platforms//os:macos"],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "darwin_x86_64",
-    values = {"cpu": "darwin_x86_64"},
+    constraint_values = [
+        "@platforms//os:macos",
+        "@platforms//cpu:x86_64",
+    ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "darwin_arm64",
-    values = {"cpu": "darwin_arm64"},
+    constraint_values = [
+        "@platforms//os:macos",
+        "@platforms//cpu:arm64",
+    ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "darwin_arm64e",
-    values = {"cpu": "darwin_arm64e"},
+    constraint_values = [
+        "@platforms//os:macos",
+        "@platforms//cpu:arm64e",
+    ],
     visibility = ["//visibility:public"],
 )
 
@@ -84,25 +114,25 @@ config_setting(
 
 config_setting(
     name = "freebsd",
-    values = {"cpu": "freebsd"},
+    constraint_values = ["@platforms//os:freebsd"],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "openbsd",
-    values = {"cpu": "openbsd"},
+    constraint_values = ["@platforms//os:openbsd"],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "windows",
-    values = {"cpu": "x64_windows"},
+    constraint_values = ["@platforms//os:windows"],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "arm",
-    values = {"cpu": "arm"},
+    constraint_values = ["@platforms//cpu:arm"],
     visibility = ["//visibility:public"],
 )
 
diff --git a/src/conditions/BUILD.tools b/src/conditions/BUILD.tools
index 75d60f334b2801..385487712c8e1e 100644
--- a/src/conditions/BUILD.tools
+++ b/src/conditions/BUILD.tools
@@ -1,105 +1,82 @@
 config_setting(
     name = "freebsd",
-    values = {"cpu": "freebsd"},
+    constraint_values = [ "@platforms//os:freebsd"],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "openbsd",
-    values = {"cpu": "openbsd"},
+    constraint_values = [ "@platforms//os:openbsd"],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "darwin",
-    values = {"cpu": "darwin"},
+    constraint_values = [ "@platforms//os:macos" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_ppc",
-    values = {"cpu": "ppc"},
+    constraint_values = [ "@platforms//os:linux", "@platforms//cpu:ppc" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_ppc64le",
-    values = {"cpu": "ppc"},
+    constraint_values = [ "@platforms//os:linux", "@platforms//cpu:ppc" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_s390x",
-    values = {"cpu": "s390x"},
+    constraint_values = [ "@platforms//os:linux", "@platforms//cpu:s390x" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_x86_64",
-    values = {"cpu": "k8"},
+    constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "linux_aarch64",
-    values = {"cpu": "aarch64"},
+    constraint_values = [ "@platforms//os:linux", "@platforms//cpu:aarch64" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "darwin_x86_64",
-    values = {"cpu": "darwin_x86_64"},
+    constraint_values = [ "@platforms//os:macos", "@platforms//cpu:x86_64" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "darwin_arm64",
-    values = {"cpu": "darwin_arm64"},
+    constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "darwin_arm64e",
-    values = {"cpu": "darwin_arm64e"},
+    constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64e" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "windows",
-    values = {"cpu": "x64_windows"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows_msvc",
-    values = {"cpu": "x64_windows_msvc"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows_msys",
-    values = {"cpu": "x64_windows_msys"},
+    constraint_values = [ "@platforms//os:windows"],
     visibility = ["//visibility:public"],
 )
 
+# TODO: figure out how to base this selection on constraints
 config_setting(
     name = "host_windows",
     values = {"host_cpu": "x64_windows"},
     visibility = ["//visibility:public"],
 )
 
-config_setting(
-    name = "host_windows_msvc",
-    values = {"host_cpu": "x64_windows_msvc"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "host_windows_msys",
-    values = {"host_cpu": "x64_windows_msys"},
-    visibility = ["//visibility:public"],
-)
-
 config_setting(
     name = "remote",
     values = {"define": "EXECUTOR=remote"},
diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD
index f8c86f2031e2ac..e3b030b204a641 100644
--- a/src/main/cpp/BUILD
+++ b/src/main/cpp/BUILD
@@ -24,18 +24,6 @@ cc_library(
             "blaze_util_darwin.cc",
             "blaze_util_posix.cc",
         ],
-        "//src/conditions:darwin_x86_64": [
-            "blaze_util_darwin.cc",
-            "blaze_util_posix.cc",
-        ],
-        "//src/conditions:darwin_arm64": [
-            "blaze_util_darwin.cc",
-            "blaze_util_posix.cc",
-        ],
-        "//src/conditions:darwin_arm64e": [
-            "blaze_util_darwin.cc",
-            "blaze_util_posix.cc",
-        ],
         "//src/conditions:freebsd": [
             "blaze_util_bsd.cc",
             "blaze_util_posix.cc",
@@ -60,15 +48,6 @@ cc_library(
         "//src/conditions:darwin": [
             "-framework CoreFoundation",
         ],
-        "//src/conditions:darwin_x86_64": [
-            "-framework CoreFoundation",
-        ],
-        "//src/conditions:darwin_arm64": [
-            "-framework CoreFoundation",
-        ],
-        "//src/conditions:darwin_arm64e": [
-            "-framework CoreFoundation",
-        ],
         "//src/conditions:freebsd": [
         ],
         "//src/conditions:openbsd": [
@@ -128,12 +107,6 @@ cc_binary(
     linkopts = select({
         "//src/conditions:darwin": [
         ],
-        "//src/conditions:darwin_x86_64": [
-        ],
-        "//src/conditions:darwin_arm64": [
-        ],
-        "//src/conditions:darwin_arm64e": [
-        ],
         "//src/conditions:freebsd": [
             "-lprocstat",
             "-lm",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
index b7ef2f02039546..57576bd61edf82 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
@@ -70,7 +70,6 @@ filegroup(
     name = "qemu2_x86",
     srcs = ["emulator/emulator"] + select({
         "@bazel_tools//src/conditions:darwin": ["emulator/qemu/darwin-x86_64/qemu-system-i386"],
-        "@bazel_tools//src/conditions:darwin_x86_64": ["emulator/qemu/darwin-x86_64/qemu-system-i386"],
         "//conditions:default": ["emulator/qemu/linux-x86_64/qemu-system-i386"],
     }),
 )
diff --git a/src/main/java/net/starlark/java/eval/BUILD b/src/main/java/net/starlark/java/eval/BUILD
index 93fd2958e01c78..3ee51dfa23a20d 100644
--- a/src/main/java/net/starlark/java/eval/BUILD
+++ b/src/main/java/net/starlark/java/eval/BUILD
@@ -95,13 +95,7 @@ cc_binary(
     name = "libcpu_profiler.so",
     srcs = select({
         "//src/conditions:darwin": ["cpu_profiler_posix.cc"],
-        # There is no config_setting for Linux.
-        # See https://github.com/bazelbuild/bazel/issues/11107
-        "//src/conditions:linux_aarch64": ["cpu_profiler_posix.cc"],
-        "//src/conditions:linux_arm": ["cpu_profiler_posix.cc"],
-        "//src/conditions:linux_ppc": ["cpu_profiler_posix.cc"],
-        "//src/conditions:linux_s390x": ["cpu_profiler_posix.cc"],
-        "//src/conditions:linux_x86_64": ["cpu_profiler_posix.cc"],
+        "//src/conditions:linux": ["cpu_profiler_posix.cc"],
         "//conditions:default": ["cpu_profiler_unimpl.cc"],
     }),
     linkshared = 1,
diff --git a/src/main/native/BUILD b/src/main/native/BUILD
index bee852e15637ec..89266ce4375747 100644
--- a/src/main/native/BUILD
+++ b/src/main/native/BUILD
@@ -4,7 +4,6 @@ genrule(
     name = "copy_link_jni_md_header",
     srcs = select({
         "//src/conditions:darwin": ["//tools/jdk:jni_md_header-darwin"],
-        "//src/conditions:darwin_x86_64": ["//tools/jdk:jni_md_header-darwin"],
         "//src/conditions:freebsd": ["//tools/jdk:jni_md_header-freebsd"],
         "//src/conditions:openbsd": ["//tools/jdk:jni_md_header-openbsd"],
         "//src/conditions:windows": ["//tools/jdk:jni_md_header-windows"],
@@ -30,10 +29,6 @@ filegroup(
             "unix_jni_darwin.cc",
             "fsevents.cc",
         ],
-        "//src/conditions:darwin_x86_64": [
-            "unix_jni_darwin.cc",
-            "fsevents.cc",
-        ],
         "//src/conditions:freebsd": ["unix_jni_bsd.cc"],
         "//src/conditions:openbsd": ["unix_jni_bsd.cc"],
         "//conditions:default": ["unix_jni_linux.cc"],
@@ -69,7 +64,6 @@ cc_binary(
     includes = ["."],  # For jni headers.
     linkopts = select({
         "//src/conditions:darwin": ["-framework CoreServices"],
-        "//src/conditions:darwin_x86_64": ["-framework CoreServices"],
         "//conditions:default": [],
     }),
     linkshared = 1,
diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD
index 91b26df7999396..9f64e096a88349 100644
--- a/src/main/tools/BUILD
+++ b/src/main/tools/BUILD
@@ -74,9 +74,6 @@ cc_binary(
     name = "linux-sandbox",
     srcs = select({
         "//src/conditions:darwin": ["dummy-sandbox.c"],
-        "//src/conditions:darwin_x86_64": ["dummy-sandbox.c"],
-        "//src/conditions:darwin_arm64": ["dummy-sandbox.c"],
-        "//src/conditions:darwin_arm64e": ["dummy-sandbox.c"],
         "//src/conditions:freebsd": ["dummy-sandbox.c"],
         "//src/conditions:openbsd": ["dummy-sandbox.c"],
         "//src/conditions:windows": ["dummy-sandbox.c"],
@@ -92,9 +89,6 @@ cc_binary(
     linkopts = ["-lm"],
     deps = select({
         "//src/conditions:darwin": [],
-        "//src/conditions:darwin_x86_64": [],
-        "//src/conditions:darwin_arm64": [],
-        "//src/conditions:darwin_arm64e": [],
         "//src/conditions:freebsd": [],
         "//src/conditions:openbsd": [],
         "//src/conditions:windows": [],
diff --git a/src/test/java/com/google/devtools/build/lib/remote/BUILD b/src/test/java/com/google/devtools/build/lib/remote/BUILD
index 6510f13c22cc22..e4f9c2766696cb 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/remote/BUILD
@@ -26,8 +26,7 @@ NATIVE_SSL_TEST = ["NativeSslTest.java"]
 NATIVE_SSL_TEST_MAYBE = select({
     "//src/conditions:windows": NATIVE_SSL_TEST,
     "//src/conditions:darwin": NATIVE_SSL_TEST,
-    "//src/conditions:darwin_x86_64": NATIVE_SSL_TEST,
-    "//src/conditions:linux_x86_64": NATIVE_SSL_TEST,
+    "//src/conditions:linux": NATIVE_SSL_TEST,
     "//conditions:default": [],
 })
 
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index 11d766edc2083c..3b8365aac81fca 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -72,10 +72,6 @@ java_test(
             ["*.java"],
             exclude = CROSS_PLATFORM_WINDOWS_TESTS,
         ),
-        "//src/conditions:darwin_x86_64": glob(
-            ["*.java"],
-            exclude = CROSS_PLATFORM_WINDOWS_TESTS,
-        ),
         "//conditions:default": glob(
             ["*.java"],
             exclude = ["MacOSXFsEventsDiffAwarenessTest.java"] + CROSS_PLATFORM_WINDOWS_TESTS,
@@ -94,11 +90,6 @@ java_test(
             "//src/main/java/com/google/devtools/build/lib/skyframe:local_diff_awareness",
             "//src/main/java/com/google/devtools/build/lib/testing/common:fake-options",
         ],
-        "//src/conditions:darwin_x86_64": [
-            "//src/main/java/com/google/devtools/build/lib/skyframe:incompatible_view_exception",
-            "//src/main/java/com/google/devtools/build/lib/skyframe:local_diff_awareness",
-            "//src/main/java/com/google/devtools/build/lib/testing/common:fake-options",
-        ],
         "//conditions:default": [],
     }) + [
         ":testutil",
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 8ee8e245d03e00..27f69e91396fba 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -189,9 +189,8 @@ sh_test(
     ] + select({
         # --javabase and --host_javabase values
         "//src/conditions:darwin": ["@openjdk14_darwin_archive//:runtime"],
-        "//src/conditions:darwin_x86_64": ["@openjdk14_darwin_archive//:runtime"],
         "//src/conditions:windows": ["@openjdk14_windows_archive//:runtime"],
-        "//src/conditions:linux_x86_64": ["@openjdk14_linux_archive//:runtime"],
+        "//src/conditions:linux": ["@openjdk14_linux_archive//:runtime"],
     }),
     data = [
         ":test-deps",
@@ -213,9 +212,8 @@ sh_test(
     ] + select({
         # --javabase and --host_javabase values
         "//src/conditions:darwin": ["@openjdk15_darwin_archive//:runtime"],
-        "//src/conditions:darwin_x86_64": ["@openjdk15_darwin_archive//:runtime"],
         "//src/conditions:windows": ["@openjdk15_windows_archive//:runtime"],
-        "//src/conditions:linux_x86_64": ["@openjdk15_linux_archive//:runtime"],
+        "//src/conditions:linux": ["@openjdk15_linux_archive//:runtime"],
     }),
     data = [
         ":test-deps",
@@ -260,9 +258,8 @@ JAVA_VERSIONS = ("11", "14", "15")
             # --javabase value
         ] + select({
             "//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
-            "//src/conditions:darwin_x86_64": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
             "//src/conditions:windows": ["@openjdk" + java_version + "_windows_archive//:runtime"],
-            "//src/conditions:linux_x86_64": ["@openjdk" + java_version + "_linux_archive//:runtime"],
+            "//src/conditions:linux": ["@openjdk" + java_version + "_linux_archive//:runtime"],
         }),
         data = [
             ":test-deps",
@@ -289,9 +286,8 @@ JAVA_VERSIONS = ("11", "14", "15")
             # --javabase value
         ] + select({
             "//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
-            "//src/conditions:darwin_x86_64": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
             "//src/conditions:windows": ["@openjdk" + java_version + "_windows_archive//:runtime"],
-            "//src/conditions:linux_x86_64": ["@openjdk" + java_version + "_linux_archive//:runtime"],
+            "//src/conditions:linux": ["@openjdk" + java_version + "_linux_archive//:runtime"],
         }),
         data = [
             ":test-deps",
@@ -318,9 +314,8 @@ JAVA_VERSIONS = ("11", "14", "15")
             # --javabase value
         ] + select({
             "//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
-            "//src/conditions:darwin_x86_64": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
             "//src/conditions:windows": ["@openjdk" + java_version + "_windows_archive//:runtime"],
-            "//src/conditions:linux_x86_64": ["@openjdk" + java_version + "_linux_archive//:runtime"],
+            "//src/conditions:linux": ["@openjdk" + java_version + "_linux_archive//:runtime"],
         }),
         data = [
             ":test-deps",
@@ -521,9 +516,8 @@ sh_test(
         srcs = ["bazel_coverage_java_test.sh"],
         args = select({
             "//src/conditions:darwin": ["@remote_java_tools_javac11_test_darwin//:toolchain"],
-            "//src/conditions:darwin_x86_64": ["@remote_java_tools_javac11_test_darwin//:toolchain"],
             "//src/conditions:windows": ["@remote_java_tools_javac11_test_windows//:toolchain"],
-            "//src/conditions:linux_x86_64": ["@remote_java_tools_javac11_test_linux//:toolchain"],
+            "//src/conditions:linux": ["@remote_java_tools_javac11_test_linux//:toolchain"],
         }) + [
             # java_tools zip to test
             "released",
@@ -532,9 +526,8 @@ sh_test(
             # --javabase value
         ] + select({
             "//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
-            "//src/conditions:darwin_x86_64": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
             "//src/conditions:windows": ["@openjdk" + java_version + "_windows_archive//:runtime"],
-            "//src/conditions:linux_x86_64": ["@openjdk" + java_version + "_linux_archive//:runtime"],
+            "//src/conditions:linux": ["@openjdk" + java_version + "_linux_archive//:runtime"],
         }),
         data = [
             ":test-deps",
@@ -562,9 +555,8 @@ sh_test(
             # --javabase value
         ] + select({
             "//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
-            "//src/conditions:darwin_x86_64": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
             "//src/conditions:windows": ["@openjdk" + java_version + "_windows_archive//:runtime"],
-            "//src/conditions:linux_x86_64": ["@openjdk" + java_version + "_linux_archive//:runtime"],
+            "//src/conditions:linux": ["@openjdk" + java_version + "_linux_archive//:runtime"],
         }),
         data = [
             ":test-deps",
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 62bc22c8fb9bdd..201096f1a7f2b8 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -134,8 +134,7 @@ java_runtime_files(
 # See test_jni in third_party/bazel/src/test/shell/bazel/bazel_java_test.sh for
 # an example of using Bazel to build a Java program that calls a C function.
 #
-# TODO(adonovan): add cases for //src/conditions:linux_arm when released in Bazel.
-# TODO(adonovan): why is there no //src/conditions target meaning "just linux"?
+# TODO(ilist): use //src:condition:linux when released in Bazel
 cc_library(
     name = "jni",
     hdrs = [":jni_header"] + select({
@@ -292,7 +291,6 @@ alias(
     name = "proguard",
     actual = select({
         "//src/conditions:darwin": "@remote_java_tools_darwin//:proguard",
-        "//src/conditions:darwin_x86_64": "@remote_java_tools_darwin//:proguard",
         "//src/conditions:windows": "@remote_java_tools_windows//:proguard",
         "//src/conditions:linux_x86_64": "@remote_java_tools_linux//:proguard",
         # On different platforms the linux repository can be used because the
@@ -378,7 +376,6 @@ alias(
     name = "toolchain",
     actual = select({
         "//src/conditions:darwin": "@remote_java_tools_darwin//:toolchain",
-        "//src/conditions:darwin_x86_64": "@remote_java_tools_darwin//:toolchain",
         "//src/conditions:windows": "@remote_java_tools_windows//:toolchain",
         "//src/conditions:linux_x86_64": "@remote_java_tools_linux//:toolchain",
         "//conditions:default": "@bazel_tools//tools/jdk:legacy_toolchain",
@@ -389,7 +386,6 @@ alias(
     name = "remote_toolchain",
     actual = select({
         "//src/conditions:darwin": "@remote_java_tools_darwin//:toolchain",
-        "//src/conditions:darwin_x86_64": "@remote_java_tools_darwin//:toolchain",
         "//src/conditions:windows": "@remote_java_tools_windows//:toolchain",
         "//src/conditions:linux_x86_64": "@remote_java_tools_linux//:toolchain",
         "//conditions:default": "@bazel_tools//tools/jdk:legacy_toolchain",
@@ -508,7 +504,6 @@ alias(
     actual = select(
         {
             "//src/conditions:darwin": "@remotejdk11_macos//:jdk",
-            "//src/conditions:darwin_x86_64": "@remotejdk11_macos//:jdk",
             "//src/conditions:windows": "@remotejdk11_win//:jdk",
             "//src/conditions:linux_aarch64": "@remotejdk11_linux_aarch64//:jdk",
             "//src/conditions:linux_x86_64": "@remotejdk11_linux//:jdk",
diff --git a/tools/jdk/remote_java_tools_aliases.bzl b/tools/jdk/remote_java_tools_aliases.bzl
index 94691b8c87d2bc..d66fcd158ee306 100644
--- a/tools/jdk/remote_java_tools_aliases.bzl
+++ b/tools/jdk/remote_java_tools_aliases.bzl
@@ -16,11 +16,11 @@
 
 load("@rules_java//java:defs.bzl", "java_import")
 
+# TODO(ilist) use //src/conditions:linux after Bazel release
 def _get_args(target, attr, **kwargs):
     workspace_target_dict = {
         "//src/conditions:linux_x86_64": ["@remote_java_tools_linux//" + target],
         "//src/conditions:darwin": ["@remote_java_tools_darwin//" + target],
-        "//src/conditions:darwin_x86_64": ["@remote_java_tools_darwin//" + target],
         "//src/conditions:windows": ["@remote_java_tools_windows//" + target],
         # On different platforms the linux repository can be used.
         # The deploy jars inside the linux repository are platform-agnostic.