Skip to content

Switch TLS implementation for wasi and bump SDK version to 34 #163809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Oct 8, 2026
+11 −7
Merged

Switch TLS implementation for wasi and bump SDK version to 34 #163809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions library/std/src/sys/thread_local/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

cfg_select! {
any(
all(target_family = "wasm", not(target_feature = "atomics"), not(target_env = "p3")),
all(target_family = "wasm", not(target_feature = "atomics"), not(target_os = "wasi")),
target_os = "uefi",
target_os = "zkvm",
target_os = "trusty",
Expand Down Expand Up @@ -66,7 +66,7 @@ cfg_select! {
/// single callback that runs all of the destructors in the list.
#[cfg(all(
target_thread_local,
not(all(target_family = "wasm", not(target_feature = "atomics"), not(target_env = "p3")))
not(all(target_family = "wasm", not(target_feature = "atomics"), not(target_os = "wasi")))
))]
pub(crate) mod destructors {
cfg_select! {
Expand Down Expand Up @@ -106,7 +106,7 @@ pub(crate) mod guard {
pub(crate) use windows::enable;
}
any(
all(target_family = "wasm", not(target_env = "p3")),
all(target_family = "wasm", not(target_os = "wasi")),
target_os = "uefi",
target_os = "zkvm",
target_os = "trusty",
Expand Down Expand Up @@ -154,7 +154,7 @@ pub(crate) mod key {
all(not(target_vendor = "apple"), not(target_family = "wasm"), target_family = "unix"),
all(not(target_thread_local), target_vendor = "apple"),
target_os = "teeos",
all(target_os = "wasi", target_env = "p3"),
target_os = "wasi",
) => {
mod racy;
mod unix;
Expand Down
4 changes: 2 additions & 2 deletions src/doc/rustc/src/platform-support/wasm32-wasip1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ be used instead.
## Building the target in rustc

To build this target first acquire a copy of [`wasi-sdk`]. At this time version
33 is the minimum needed.
34 is the minimum needed.

Next configure the `WASI_SDK_PATH` environment variable to point to where this
is installed. For example:

```text
export WASI_SDK_PATH=/path/to/wasi-sdk-33.0
export WASI_SDK_PATH=/path/to/wasi-sdk-34.0
```

Next be sure to enable LLD when building Rust from source as LLVM's `wasm-ld`
Expand Down
6 changes: 5 additions & 1 deletion tests/run-make/wasm-panic-small/rmake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@ fn test(cfg: &str) {

let bytes = rfs::read("foo.wasm");
println!("{}", bytes.len());
assert!(bytes.len() < 45_000, "bytes len was: {}", bytes.len());
assert!(
bytes.len() < 50_000,
"wasm binary was larger than expected. size in bytes: {}",
bytes.len()
);
}
Loading