https://github.com/llvmbot created https://github.com/llvm/llvm-project/pull/149048
Backport 60579ec3059b2b6cc9dad90eaac1ed363fc395a7 Requested by: @nikic >From e521ecc3c0c5c4e58aea38596e1fbe84dbf424f4 Mon Sep 17 00:00:00 2001 From: Jordan Rupprecht <ruppre...@google.com> Date: Wed, 16 Jul 2025 04:31:48 -0500 Subject: [PATCH] [Support][BLAKE3] Prefix more blake3 methods (#149007) Added by #147948, blake3_xof_many and blake3_compress_subtree_wide cause conflicts when linking llvm and blake3 statically into the same binary. Similar to #148607. (cherry picked from commit 60579ec3059b2b6cc9dad90eaac1ed363fc395a7) --- llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h b/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h index d5be360815add..d24657465dd8f 100644 --- a/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h +++ b/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h @@ -10,7 +10,9 @@ #define blake3_hasher llvm_blake3_hasher #define blake3_chunk_state llvm_blake3_chunk_state #define blake3_compress_in_place llvm_blake3_compress_in_place +#define blake3_compress_subtree_wide llvm_blake3_compress_subtree_wide #define blake3_compress_xof llvm_blake3_compress_xof +#define blake3_xof_many llvm_blake3_xof_many #define blake3_hash_many llvm_blake3_hash_many #define blake3_simd_degree llvm_blake3_simd_degree #define blake3_compress_in_place_portable llvm_blake3_compress_in_place_portable _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
