From 87ec21a3e7f9ad0d40c6073475977eafd92c3ad8 Mon Sep 17 00:00:00 2001
From: Max Dexheimer <maxdexh03@gmail.com>
Date: Mon, 5 Oct 2026 15:09:28 +0200
Subject: [PATCH] Adjust the adjustment to wasi TLS to no longer adjust

---
 library/std/src/sys/thread_local/mod.rs             | 8 ++++----
 src/doc/rustc/src/platform-support/wasm32-wasip1.md | 4 ++--
 tests/run-make/wasm-panic-small/rmake.rs            | 6 +++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/library/std/src/sys/thread_local/mod.rs b/library/std/src/sys/thread_local/mod.rs
index 809ef5cfe9c60..f86d25e38efb5 100644
--- a/library/std/src/sys/thread_local/mod.rs
+++ b/library/std/src/sys/thread_local/mod.rs
@@ -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",
@@ -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! {
@@ -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",
@@ -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;
diff --git a/src/doc/rustc/src/platform-support/wasm32-wasip1.md b/src/doc/rustc/src/platform-support/wasm32-wasip1.md
index 16499659291a0..3cc0f5a96c597 100644
--- a/src/doc/rustc/src/platform-support/wasm32-wasip1.md
+++ b/src/doc/rustc/src/platform-support/wasm32-wasip1.md
@@ -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`
diff --git a/tests/run-make/wasm-panic-small/rmake.rs b/tests/run-make/wasm-panic-small/rmake.rs
index f6504830a5263..64c17571437c5 100644
--- a/tests/run-make/wasm-panic-small/rmake.rs
+++ b/tests/run-make/wasm-panic-small/rmake.rs
@@ -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()
+    );
 }