[llvm] [Bazel] NFC refactor out redundant is_x86_64_non_windows config (PR #180296)

[via llvm-commits]

https://github.com/HighW4y2H3ll updated https://github.com/llvm/llvm-project/pull/180296

>From 3330bb26b43f2d5710441d39340400c143c874f1 Mon Sep 17 00:00:00 2001
From: h2h <h2h at meta.com>
Date: Fri, 6 Feb 2026 14:22:36 -0800
Subject: [PATCH 1/3] [Bazel] NFC refactor out redundant is_x86_64_non_windows
 config

---
 .../llvm-project-overlay/llvm/BUILD.bazel     | 53 ++++---------------
 1 file changed, 10 insertions(+), 43 deletions(-)

diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
index e83a237a5397f..70ccf00220f3a 100644
--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -256,41 +256,6 @@ config_setting(
     flag_values = {"@rules_cc//cc/compiler:compiler": "clang"},
 )
 
-# TODO(zbarsky): Is there a better way to express this?
-config_setting(
-    name = "_stamp_binary_on_check",
-    values = {"stamp": "1"},
-)
-
-config_setting(
-    name = "_stamp_binary_off_check",
-    values = {"stamp": "0"},
-)
-
-selects.config_setting_group(
-    name = "_true",
-    match_any = [
-        ":_stamp_binary_on_check",
-        ":_stamp_binary_off_check",
-    ],
-)
-
-alias(
-    name = "non_windows",
-    actual = select({
-        "@platforms//os:windows": "@platforms//os:macos",
-        "//conditions:default": ":_true",
-    }),
-)
-
-selects.config_setting_group(
-    name = "is_x86_64_non_windows",
-    match_all = [
-        "@platforms//cpu:x86_64",
-        ":non_windows",
-    ],
-)
-
 BLAKE3_x86_64_ASM_SOURCE_PATTERNS = [
     "lib/Support/BLAKE3/blake3_avx2_x86-64_%s.S",
     "lib/Support/BLAKE3/blake3_avx512_x86-64_%s.S",
@@ -326,14 +291,16 @@ cc_library(
         "@platforms//cpu:aarch64": [
             "lib/Support/BLAKE3/blake3_neon.c",
         ],
-        ":is_x86_64_windows_clang_mingw": [
-            pattern % "windows_gnu"
-            for pattern in BLAKE3_x86_64_ASM_SOURCE_PATTERNS
-        ],
-        ":is_x86_64_non_windows": [
-            pattern % "unix"
-            for pattern in BLAKE3_x86_64_ASM_SOURCE_PATTERNS
-        ],
+        "@platforms//cpu:x86_64": select({
+            ":is_x86_64_windows_clang_mingw": [
+                pattern % "windows_gnu"
+                for pattern in BLAKE3_x86_64_ASM_SOURCE_PATTERNS
+            ],
+            "//conditions:default": [
+                pattern % "unix"
+                for pattern in BLAKE3_x86_64_ASM_SOURCE_PATTERNS
+            ],
+        }),
         "//conditions:default": [
         ],
     }),

>From 9301fa8978eb3a93462e1ec4f5ac4914ff18acac Mon Sep 17 00:00:00 2001
From: h2h <h2h at meta.com>
Date: Fri, 6 Feb 2026 14:57:51 -0800
Subject: [PATCH 2/3] Introduce filegroup to aggregate x86_64 blake3 asm

---
 .../llvm-project-overlay/llvm/BUILD.bazel     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
index 70ccf00220f3a..51793cb2482f5 100644
--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -263,6 +263,20 @@ BLAKE3_x86_64_ASM_SOURCE_PATTERNS = [
     "lib/Support/BLAKE3/blake3_sse41_x86-64_%s.S",
 ]
 
+filegroup(
+    name = "blake3_x86_64_asm",
+    srcs = select({
+        ":is_x86_64_windows_clang_mingw": [
+            pattern % "windows_gnu"
+            for pattern in BLAKE3_x86_64_ASM_SOURCE_PATTERNS
+        ],
+        "//conditions:default": [
+            pattern % "unix"
+            for pattern in BLAKE3_x86_64_ASM_SOURCE_PATTERNS
+        ],
+    }),
+)
+
 cc_library(
     name = "Support",
     srcs = glob([
@@ -291,16 +305,7 @@ cc_library(
         "@platforms//cpu:aarch64": [
             "lib/Support/BLAKE3/blake3_neon.c",
         ],
-        "@platforms//cpu:x86_64": select({
-            ":is_x86_64_windows_clang_mingw": [
-                pattern % "windows_gnu"
-                for pattern in BLAKE3_x86_64_ASM_SOURCE_PATTERNS
-            ],
-            "//conditions:default": [
-                pattern % "unix"
-                for pattern in BLAKE3_x86_64_ASM_SOURCE_PATTERNS
-            ],
-        }),
+        "@platforms//cpu:x86_64": ":blake3_x86_64_asm",
         "//conditions:default": [
         ],
     }),

>From 716b08221be13de5f3f89a2c023860afca7a67c0 Mon Sep 17 00:00:00 2001
From: h2h <h2h at meta.com>
Date: Fri, 6 Feb 2026 15:01:54 -0800
Subject: [PATCH 3/3] wrap filegroup taget in array

---
 utils/bazel/llvm-project-overlay/llvm/BUILD.bazel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
index 51793cb2482f5..5d11d04f32001 100644
--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -305,7 +305,7 @@ cc_library(
         "@platforms//cpu:aarch64": [
             "lib/Support/BLAKE3/blake3_neon.c",
         ],
-        "@platforms//cpu:x86_64": ":blake3_x86_64_asm",
+        "@platforms//cpu:x86_64": [":blake3_x86_64_asm"],
         "//conditions:default": [
         ],
     }),