From 77a75963210df6d070b7b2898f86749c1a98d918 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 16 Jul 2025 11:32:39 +0200 Subject: [PATCH 1/2] [Support][BLAKE3] Restore static on blake3_hash4_neon This was dropped in #147948 and causes symbol conflicts if libblake3 is also linked. --- llvm/lib/Support/BLAKE3/blake3_neon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/llvm/lib/Support/BLAKE3/blake3_neon.c b/llvm/lib/Support/BLAKE3/blake3_neon.c index 9629e10836864..a8e723499792a 100644 --- a/llvm/lib/Support/BLAKE3/blake3_neon.c +++ b/llvm/lib/Support/BLAKE3/blake3_neon.c @@ -245,6 +245,7 @@ INLINE void load_counters4(uint64_t counter, bool increment_counter, counter_high(counter + (mask & 2)), counter_high(counter + (mask & 3))); } +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, From dc7dcc6829366b6c12fda1e2c89e87f1172b5dd0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 16 Jul 2025 15:58:13 +0200 Subject: [PATCH 2/2] Update style to match upstream change --- llvm/lib/Support/BLAKE3/blake3_neon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Support/BLAKE3/blake3_neon.c b/llvm/lib/Support/BLAKE3/blake3_neon.c index a8e723499792a..ee36721f87573 100644 --- a/llvm/lib/Support/BLAKE3/blake3_neon.c +++ b/llvm/lib/Support/BLAKE3/blake3_neon.c @@ -245,11 +245,11 @@ INLINE void load_counters4(uint64_t counter, bool increment_counter, counter_high(counter + (mask & 2)), counter_high(counter + (mask & 3))); } -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) { +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]),