[Support][BLAKE3] Restore static on blake3_hash4_neon #149046
Merged
+5
−4
Conversation
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
This was dropped in llvm#147948 and causes symbol conflicts if libblake3 is also linked.
|
@llvm/pr-subscribers-llvm-support Author: Nikita Popov (nikic) ChangesThis was dropped in #147948 and causes symbol conflicts if libblake3 is also linked. Full diff: https://github.com/llvm/llvm-project/pull/149046.diff 1 Files Affected:
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,
|
|
Also upstreamed in BLAKE3-team/BLAKE3#497 to avoid this in the future. |
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
|
/cherry-pick 1754a7d |
This comment was marked as outdated.
This comment was marked as outdated.
|
/pull-request #149126 |
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
This was dropped in llvm#147948 and causes symbol conflicts if libblake3 is also linked. (cherry picked from commit 1754a7d)
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`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 was dropped in #147948 and causes symbol conflicts if libblake3 is also linked.