[Support][BLAKE3] Prefix blake3_xof_many_avx512#148607
Merged
Merged
Conversation
This symbol was introduced in llvm#147948, but not prefixed, resulting in conflicts if libblake3 and LLVM are both linked statically into the same binary.
Member
|
@llvm/pr-subscribers-llvm-support Author: Nikita Popov (nikic) ChangesThis symbol was introduced in #147948, but not prefixed, resulting in conflicts if libblake3 and LLVM are both linked statically into the same binary. Full diff: https://github.com/llvm/llvm-project/pull/148607.diff 1 Files Affected:
diff --git a/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h b/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h
index 3cee3691e4cf7..d5be360815add 100644
--- a/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h
+++ b/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h
@@ -34,6 +34,8 @@
#define _blake3_compress_in_place_avx512 _llvm_blake3_compress_in_place_avx512
#define blake3_compress_xof_avx512 llvm_blake3_compress_xof_avx512
#define _blake3_compress_xof_avx512 _llvm_blake3_compress_xof_avx512
+#define blake3_xof_many_avx512 llvm_blake3_xof_many_avx512
+#define _blake3_xof_many_avx512 _llvm_blake3_xof_many_avx512
#define blake3_hash_many_avx512 llvm_blake3_hash_many_avx512
#define _blake3_hash_many_avx512 _llvm_blake3_hash_many_avx512
#define blake3_hash_many_neon llvm_blake3_hash_many_neon
|
8 tasks
akyrtzi
approved these changes
Jul 14, 2025
Contributor
|
Thank you for the catch and fix! |
Contributor
|
(merging since this should fix our CI) |
rust-bors Bot
added a commit
to rust-lang/rust
that referenced
this pull request
Jul 15, 2025
Update to LLVM 21 Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 r? `@ghost`
rupprecht
added a commit
to rupprecht/llvm-project
that referenced
this pull request
Jul 16, 2025
Added by llvm#147948, blake3_xof_many and blake3_compress_subtree_wide cause conflicts when linking llvm and blake3 statically into the same binary. Similar to llvm#148607.
rust-bors Bot
added a commit
to rust-lang/rust
that referenced
this pull request
Jul 16, 2025
Update to LLVM 21 Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 r? `@ghost` try-job: aarch64-gnu try-job: aarch64-gnu-debug try-job: dist-aarch64-linux
nikic
pushed a commit
that referenced
this pull request
Jul 16, 2025
rust-bors Bot
added a commit
to rust-lang/rust
that referenced
this pull request
Jul 16, 2025
Update to LLVM 21 Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [ ] llvm/llvm-project#149046 r? `@ghost` try-job: aarch64-gnu try-job: aarch64-gnu-debug try-job: dist-aarch64-linux
rust-bors Bot
added a commit
to rust-lang/rust
that referenced
this pull request
Jul 16, 2025
Update to LLVM 21 Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [ ] llvm/llvm-project#149046 r? `@ghost` try-job: dist-x86_64-apple try-job: dist-apple-various try-job: x86_64-apple-1 try-job: x86_64-apple-2 try-job: dist-aarch64-apple try-job: aarch64-apple
rust-bors Bot
added a commit
to rust-lang/rust
that referenced
this pull request
Jul 16, 2025
Update to LLVM 21 Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [ ] llvm/llvm-project#149046 * [ ] llvm/llvm-project#149097 r? `@ghost` try-job: x86_64-mingw-1 try-job: x86_64-mingw-2 try-job: dist-i686-mingw try-job: dist-x86_64-mingw try-job: aarch64-msvc-1 try-job: aarch64-msvc-2 try-job: dist-aarch64-msvc
rust-bors Bot
added a commit
to rust-lang/rust
that referenced
this pull request
Jul 17, 2025
Update to LLVM 21 Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [ ] llvm/llvm-project#149097 r? `@ghost` try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: x86_64-msvc-ext1 try-job: x86_64-msvc-ext2 try-job: x86_64-msvc-ext3 try-job: dist-x86_64-msvc try-job: dist-i686-msvc try-job: dist-x86_64-msvc-alt
tru
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Jul 17, 2025
Added by llvm#147948, blake3_xof_many and blake3_compress_subtree_wide cause conflicts when linking llvm and blake3 statically into the same binary. Similar to llvm#148607. (cherry picked from commit 60579ec)
rust-bors Bot
added a commit
to rust-lang/rust
that referenced
this pull request
Jul 17, 2025
Update to LLVM 21 Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [ ] llvm/llvm-project#149097 r? `@ghost`
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Aug 5, 2025
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] #144116 r? `@ghost`
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Aug 5, 2025
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] #144116 r? `@ghost`
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Aug 5, 2025
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] #144116 r? `@ghost`
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Aug 6, 2025
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] #144116 r? `@ghost`
github-actions Bot
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Aug 7, 2025
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] rust-lang/rust#144116 r? `@ghost`
github-actions Bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Aug 8, 2025
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] rust-lang/rust#144116 r? `@ghost`
github-actions Bot
pushed a commit
to rust-lang/rust-analyzer
that referenced
this pull request
Aug 11, 2025
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] rust-lang/rust#144116 r? `@ghost`
Kobzol
pushed a commit
to Kobzol/rustc_codegen_gcc
that referenced
this pull request
Dec 21, 2025
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] rust-lang/rust#144116 r? `@ghost`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This symbol was introduced in #147948, but not prefixed, resulting in conflicts if libblake3 and LLVM are both linked statically into the same binary.