Skip to content

Revert "[gn build] Guard the BLAKE3 assembly sources with platform"#185077

Merged
aeubanks merged 1 commit intomainfrom
revert-70110-dev/gn/blake3-assembly-condition
Mar 6, 2026
Merged

Revert "[gn build] Guard the BLAKE3 assembly sources with platform"#185077
aeubanks merged 1 commit intomainfrom
revert-70110-dev/gn/blake3-assembly-condition

Conversation

@aeubanks
Copy link
Copy Markdown
Contributor

@aeubanks aeubanks commented Mar 6, 2026

Reverts #70110

Breaks gn build

@aeubanks aeubanks enabled auto-merge (squash) March 6, 2026 18:33
@llvmbot
Copy link
Copy Markdown
Member

llvmbot commented Mar 6, 2026

@llvm/pr-subscribers-llvm-support

Author: Arthur Eubanks (aeubanks)

Changes

Reverts llvm/llvm-project#70110

Breaks gn build


Full diff: https://github.com/llvm/llvm-project/pull/185077.diff

1 Files Affected:

  • (modified) llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn (+12-19)
diff --git a/llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn
index 18f382ea3086c..e980be728ed4e 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn
@@ -15,23 +15,16 @@ static_library("BLAKE3") {
   ]
 }
 
-if (current_cpu == "x64") {
-  source_set("hack") {
-    sources = [ "blake3_neon.c " ]
-    if (current_os == "linux") {
-      sources += [
-        "blake3_avx2_x86-64_unix.S",
-        "blake3_avx512_x86-64_unix.S",
-        "blake3_sse2_x86-64_unix.S",
-        "blake3_sse41_x86-64_unix.S",
-      ]
-    } else if (current_os == "win") {
-      sources += [
-        "blake3_avx2_x86-64_windows_gnu.S",
-        "blake3_avx512_x86-64_windows_gnu.S",
-        "blake3_sse2_x86-64_windows_gnu.S",
-        "blake3_sse41_x86-64_windows_gnu.S",
-      ]
-    }
-  }
+source_set("hack") {
+  sources = [
+    "blake3_avx2_x86-64_unix.S",
+    "blake3_avx2_x86-64_windows_gnu.S",
+    "blake3_avx512_x86-64_unix.S",
+    "blake3_avx512_x86-64_windows_gnu.S",
+    "blake3_neon.c",
+    "blake3_sse2_x86-64_unix.S",
+    "blake3_sse2_x86-64_windows_gnu.S",
+    "blake3_sse41_x86-64_unix.S",
+    "blake3_sse41_x86-64_windows_gnu.S",
+  ]
 }

@aeubanks aeubanks disabled auto-merge March 6, 2026 18:34
@aeubanks aeubanks merged commit 42f3726 into main Mar 6, 2026
8 of 11 checks passed
@aeubanks aeubanks deleted the revert-70110-dev/gn/blake3-assembly-condition branch March 6, 2026 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants