Skip to content

release/21.x: [Support][BLAKE3] Restore static on blake3_hash4_neon (#149046)#149126

Merged
tru merged 1 commit into
llvm:release/21.xfrom
llvmbot:issue149046
Jul 17, 2025
Merged

release/21.x: [Support][BLAKE3] Restore static on blake3_hash4_neon (#149046)#149126
tru merged 1 commit into
llvm:release/21.xfrom
llvmbot:issue149046

Conversation

@llvmbot

@llvmbot llvmbot commented Jul 16, 2025

Copy link
Copy Markdown
Member

Backport 1754a7d

Requested by: @nikic

@llvmbot

llvmbot commented Jul 16, 2025

Copy link
Copy Markdown
Member Author

@slydiman What do you think about merging this PR to the release branch?

@llvmbot

llvmbot commented Jul 16, 2025

Copy link
Copy Markdown
Member Author

@llvm/pr-subscribers-llvm-support

Author: None (llvmbot)

Changes

Backport 1754a7d

Requested by: @nikic


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

1 Files Affected:

  • (modified) llvm/lib/Support/BLAKE3/blake3_neon.c (+5-4)
diff --git a/llvm/lib/Support/BLAKE3/blake3_neon.c b/llvm/lib/Support/BLAKE3/blake3_neon.c
index 9629e10836864..ee36721f87573 100644
--- a/llvm/lib/Support/BLAKE3/blake3_neon.c
+++ b/llvm/lib/Support/BLAKE3/blake3_neon.c
@@ -245,10 +245,11 @@ INLINE void load_counters4(uint64_t counter, bool increment_counter,
       counter_high(counter + (mask & 2)), counter_high(counter + (mask & 3)));
 }
 
-void blake3_hash4_neon(const uint8_t *const *inputs, size_t blocks,
-                       const uint32_t key[8], uint64_t counter,
-                       bool increment_counter, uint8_t flags,
-                       uint8_t flags_start, uint8_t flags_end, uint8_t *out) {
+static void blake3_hash4_neon(const uint8_t *const *inputs, size_t blocks,
+                              const uint32_t key[8], uint64_t counter,
+                              bool increment_counter, uint8_t flags,
+                              uint8_t flags_start, uint8_t flags_end,
+                              uint8_t *out) {
   uint32x4_t h_vecs[8] = {
       set1_128(key[0]), set1_128(key[1]), set1_128(key[2]), set1_128(key[3]),
       set1_128(key[4]), set1_128(key[5]), set1_128(key[6]), set1_128(key[7]),

@nikic nikic moved this from Needs Triage to Needs Review in LLVM Release Status Jul 16, 2025
@tru

tru commented Jul 17, 2025

Copy link
Copy Markdown
Contributor

@nikic can you approve?

@github-project-automation github-project-automation Bot moved this from Needs Review to Needs Merge in LLVM Release Status Jul 17, 2025
This was dropped in llvm#147948 and causes symbol conflicts if libblake3 is
also linked.

(cherry picked from commit 1754a7d)
@tru tru merged commit 194dd66 into llvm:release/21.x Jul 17, 2025
@github-project-automation github-project-automation Bot moved this from Needs Merge to Done in LLVM Release Status Jul 17, 2025
@github-actions

Copy link
Copy Markdown

@nikic (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Development

Successfully merging this pull request may close these issues.

3 participants