std: Adjust cfgs again for TLS on WASI - #160868
Merged
rust-bors[bot] merged 1 commit intoAug 12, 2026
Merged
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
r? @clarfonthey rustbot has assigned @clarfonthey. Use Why was this reviewer chosen?The reviewer was selected based on:
|
This comment has been minimized.
This comment has been minimized.
lqd
reviewed
Aug 10, 2026
This commit adjusts the changes made in 159733. A wasi-libc bug was discovered in 160828 which is present in certain situations which means that the changes in 159733 expose this bug. The purpose of this PR is to get wasip1/wasip2 targets fixed again while preserving a working implementation for wasip3. This upstream bug is already fixed in wasi-libc meaning that this PR won't be necessary once wasi-sdk-34 is published and used in rust-lang/rust. Until that time, however, this effectively reverts 159733 for wasip1/wasip2. The wasip3 target is Tier 3 still and requires wasi-sdk-34 anyway which is why that's left unchanged. Closes 160828
alexcrichton
force-pushed
the
adjust-wasi-tls-again
branch
from
August 10, 2026 17:48
61e15de to
dd905cd
Compare
Contributor
|
These are some gnarly cfgs, but I'll trust that you've verified they work on the existing wasi envs. r=me, like the past WASI PR I reviewed for you I'll let you merge since you have r+ privs and I'm not sure if you wanted to add anything more. |
Member
Author
|
@bors r=clarfonthey Agreed yeah I'd ideally like to clean these up, but I'm not quite prepared to take up the mantle of "clean up every OS at once" vs just the one that I'm personally working on alas :( |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
Contributor
Yeah, no worries, that's why I figured this should be fine for now. These only affect WASI, and I assume you're taking care to not break p1 or p2 when working on p3. I have some plans for a proposal to clean this up but that's a more lofty goal. |
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 11, 2026
…, r=clarfonthey std: Adjust cfgs again for TLS on WASI This commit adjusts the changes made in rust-lang#159733. A wasi-libc bug was discovered in rust-lang#160828 which is present in certain situations which means that the changes in rust-lang#159733 expose this bug. The purpose of this PR is to get wasip1/wasip2 targets fixed again while preserving a working implementation for wasip3. This upstream bug is already fixed in wasi-libc meaning that this PR won't be necessary once wasi-sdk-34 is published and used in rust-lang/rust. Until that time, however, this effectively reverts rust-lang#159733 for wasip1/wasip2. The wasip3 target is Tier 3 still and requires wasi-sdk-34 anyway which is why that's left unchanged. Closes rust-lang#160828
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 11, 2026
…uwer Rollup of 10 pull requests Successful merges: - #160620 (Do not pass `-no-pie` on Windows) - #160731 (Arc: Remove unnecessary fmt::Display use for overflow assertion) - #160760 (Miri: give the incremental session a chance to finish) - #160854 (Add -Zwasm-proc-macros flag) - #160868 (std: Adjust cfgs again for TLS on WASI) - #160894 (Allow running an arbitrary number of try jobs per PR) - #160790 (rustc-book: update sys-v abi link) - #160878 (Add rust_analyzer to check-cfg names) - #160909 (tests/run-make-cargo/thumb-none-cortex-m: bump `cortex-m` dependency) - #160920 (No longer mention the removed generic)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 11, 2026
…, r=clarfonthey std: Adjust cfgs again for TLS on WASI This commit adjusts the changes made in rust-lang#159733. A wasi-libc bug was discovered in rust-lang#160828 which is present in certain situations which means that the changes in rust-lang#159733 expose this bug. The purpose of this PR is to get wasip1/wasip2 targets fixed again while preserving a working implementation for wasip3. This upstream bug is already fixed in wasi-libc meaning that this PR won't be necessary once wasi-sdk-34 is published and used in rust-lang/rust. Until that time, however, this effectively reverts rust-lang#159733 for wasip1/wasip2. The wasip3 target is Tier 3 still and requires wasi-sdk-34 anyway which is why that's left unchanged. Closes rust-lang#160828
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 11, 2026
…, r=clarfonthey std: Adjust cfgs again for TLS on WASI This commit adjusts the changes made in rust-lang#159733. A wasi-libc bug was discovered in rust-lang#160828 which is present in certain situations which means that the changes in rust-lang#159733 expose this bug. The purpose of this PR is to get wasip1/wasip2 targets fixed again while preserving a working implementation for wasip3. This upstream bug is already fixed in wasi-libc meaning that this PR won't be necessary once wasi-sdk-34 is published and used in rust-lang/rust. Until that time, however, this effectively reverts rust-lang#159733 for wasip1/wasip2. The wasip3 target is Tier 3 still and requires wasi-sdk-34 anyway which is why that's left unchanged. Closes rust-lang#160828
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 11, 2026
…uwer Rollup of 14 pull requests Successful merges: - #160620 (Do not pass `-no-pie` on Windows) - #160731 (Arc: Remove unnecessary fmt::Display use for overflow assertion) - #160760 (Miri: give the incremental session a chance to finish) - #160854 (Add -Zwasm-proc-macros flag) - #160868 (std: Adjust cfgs again for TLS on WASI) - #160894 (Allow running an arbitrary number of try jobs per PR) - #160790 (rustc-book: update sys-v abi link) - #160878 (Add rust_analyzer to check-cfg names) - #160909 (tests/run-make-cargo/thumb-none-cortex-m: bump `cortex-m` dependency) - #160920 (No longer mention the removed generic) - #160921 (rustdoc: Fix invalid CSS classes generated for notable items) - #160924 (split up `rustc_session`) - #160934 (Ensure TLS accesses don't call the global allocator through panic) - #160937 (Store the names of `Fn` trait parameters in the AST, fix rustfmt bug)
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 12, 2026
Rollup of 14 pull requests Successful merges: - #160620 (Do not pass `-no-pie` on Windows) - #160731 (Arc: Remove unnecessary fmt::Display use for overflow assertion) - #160854 (Add -Zwasm-proc-macros flag) - #160868 (std: Adjust cfgs again for TLS on WASI) - #160882 (Add basic `splat` support to `rustdoc`) - #160894 (Allow running an arbitrary number of try jobs per PR) - #160790 (rustc-book: update sys-v abi link) - #160878 (Add rust_analyzer to check-cfg names) - #160909 (tests/run-make-cargo/thumb-none-cortex-m: bump `cortex-m` dependency) - #160920 (No longer mention the removed generic) - #160921 (rustdoc: Fix invalid CSS classes generated for notable items) - #160924 (split up `rustc_session`) - #160934 (Ensure TLS accesses don't call the global allocator through panic) - #160937 (Store the names of `Fn` trait parameters in the AST, fix rustfmt bug)
rust-timer
added a commit
that referenced
this pull request
Aug 12, 2026
Rollup merge of #160868 - alexcrichton:adjust-wasi-tls-again, r=clarfonthey std: Adjust cfgs again for TLS on WASI This commit adjusts the changes made in #159733. A wasi-libc bug was discovered in #160828 which is present in certain situations which means that the changes in #159733 expose this bug. The purpose of this PR is to get wasip1/wasip2 targets fixed again while preserving a working implementation for wasip3. This upstream bug is already fixed in wasi-libc meaning that this PR won't be necessary once wasi-sdk-34 is published and used in rust-lang/rust. Until that time, however, this effectively reverts #159733 for wasip1/wasip2. The wasip3 target is Tier 3 still and requires wasi-sdk-34 anyway which is why that's left unchanged. Closes #160828
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
Aug 17, 2026
Rollup of 14 pull requests Successful merges: - rust-lang/rust#160620 (Do not pass `-no-pie` on Windows) - rust-lang/rust#160731 (Arc: Remove unnecessary fmt::Display use for overflow assertion) - rust-lang/rust#160854 (Add -Zwasm-proc-macros flag) - rust-lang/rust#160868 (std: Adjust cfgs again for TLS on WASI) - rust-lang/rust#160882 (Add basic `splat` support to `rustdoc`) - rust-lang/rust#160894 (Allow running an arbitrary number of try jobs per PR) - rust-lang/rust#160790 (rustc-book: update sys-v abi link) - rust-lang/rust#160878 (Add rust_analyzer to check-cfg names) - rust-lang/rust#160909 (tests/run-make-cargo/thumb-none-cortex-m: bump `cortex-m` dependency) - rust-lang/rust#160920 (No longer mention the removed generic) - rust-lang/rust#160921 (rustdoc: Fix invalid CSS classes generated for notable items) - rust-lang/rust#160924 (split up `rustc_session`) - rust-lang/rust#160934 (Ensure TLS accesses don't call the global allocator through panic) - rust-lang/rust#160937 (Store the names of `Fn` trait parameters in the AST, fix rustfmt bug)
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 commit adjusts the changes made in #159733. A wasi-libc bug was discovered in #160828 which is present in certain situations which means that the changes in #159733 expose this bug. The purpose of this PR is to get wasip1/wasip2 targets fixed again while preserving a working implementation for wasip3. This upstream bug is already fixed in wasi-libc meaning that this PR won't be necessary once wasi-sdk-34 is published and used in rust-lang/rust. Until that time, however, this effectively reverts #159733 for wasip1/wasip2. The wasip3 target is Tier 3 still and requires wasi-sdk-34 anyway which is why that's left unchanged.
Closes #160828