From 02f8dfc592e6f30e5d83c22895b5582b8095d60c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 23 Jul 2026 15:03:19 -0700
Subject: [PATCH] Change `cabi_realloc` gates to WASIp1-only

These were originally added when Rust first added `target_env = "p1"`
but that's been there long enough now. These are only needed on WASIp1
and WASIp2/3 targets have this symbol provided by wasi-libc.
---
 crates/guest-rust/src/rt/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/guest-rust/src/rt/mod.rs b/crates/guest-rust/src/rt/mod.rs
index e62c52640..c5696f928 100644
--- a/crates/guest-rust/src/rt/mod.rs
+++ b/crates/guest-rust/src/rt/mod.rs
@@ -111,7 +111,7 @@ impl<K: core::hash::Hash + Eq, V> WitMap<K, V> for std::collections::HashMap<K,
 }
 
 /// For more information about this see `./ci/rebuild-libwit-bindgen-cabi.sh`.
-#[cfg(not(target_env = "p2"))]
+#[cfg(target_env = "p1")]
 mod wit_bindgen_cabi_realloc;
 
 /// This function is called from generated bindings and will be deleted by
@@ -122,7 +122,7 @@ mod wit_bindgen_cabi_realloc;
 ///
 /// For more information about this see `./ci/rebuild-libwit-bindgen-cabi.sh`.
 pub fn maybe_link_cabi_realloc() {
-    #[cfg(all(target_family = "wasm", not(target_env = "p2")))]
+    #[cfg(target_env = "p1")]
     {
         unsafe extern "C" {
             fn cabi_realloc(
@@ -153,7 +153,7 @@ pub fn maybe_link_cabi_realloc() {
 /// `cabi_realloc` module above. It's otherwise never explicitly called.
 ///
 /// For more information about this see `./ci/rebuild-libwit-bindgen-cabi.sh`.
-#[cfg(not(target_env = "p2"))]
+#[cfg(target_env = "p1")]
 pub unsafe fn cabi_realloc(
     old_ptr: *mut u8,
     old_len: usize,