prtest:full

Signed-off-by: James Sturtevant <jstur@microsoft.com>

Author: jsturtevant

crates/wasi-tls/src/lib.rs

@@ -1,3 +1,5 @@
+#![cfg(not(any(target_arch = "riscv64", target_arch = "s390x")))]
+
 //! # Wasmtime's [wasi-tls] (Transport Layer Security) Implementation
 //!
 //! This crate provides the Wasmtime host implementation for the [wasi-tls] API.
@@ -60,7 +62,6 @@
 //!     })?;
 //!
 //!     // ... use `linker` to instantiate within `store` ...
-//!
 //!     Ok(())
 //! }
 //!

crates/wasi-tls/tests/main.rs

@@ -1,3 +1,5 @@
+#![cfg(not(any(target_arch = "riscv64", target_arch = "s390x")))]
+
 use anyhow::{anyhow, Result};
 use test_programs_artifacts::{foreach_tls, TLS_SAMPLE_APPLICATION_COMPONENT};
 use wasmtime::{

src/commands/run.rs

@@ -32,7 +32,10 @@ use wasmtime_wasi_http::{
 #[cfg(feature = "wasi-keyvalue")]
 use wasmtime_wasi_keyvalue::{WasiKeyValue, WasiKeyValueCtx, WasiKeyValueCtxBuilder};
 
-#[cfg(feature = "wasi-tls")]
+#[cfg(all(
+    feature = "wasi-tls",
+    not(any(target_arch = "riscv64", target_arch = "s390x"))
+))]
 use wasmtime_wasi_tls::WasiTlsCtx;
 
 fn parse_preloads(s: &str) -> Result<(String, PathBuf)> {
@@ -829,11 +832,22 @@ impl RunCommand {
         }
 
         if self.run.common.wasi.tls == Some(true) {
-            #[cfg(not(all(feature = "wasi-tls", feature = "component-model")))]
+            #[cfg(any(target_arch = "riscv64", target_arch = "s390x"))]
+            {
+                bail!("Unsupported architecture for wasi-tls");
+            }
+            #[cfg(all(
+                not(any(target_arch = "riscv64", target_arch = "s390x")),
+                not(all(feature = "wasi-tls", feature = "component-model"))
+            ))]
             {
                 bail!("Cannot enable wasi-tls when the binary is not compiled with this feature.");
             }
-            #[cfg(all(feature = "wasi-tls", feature = "component-model"))]
+            #[cfg(all(
+                feature = "wasi-tls",
+                feature = "component-model",
+                not(any(target_arch = "riscv64", target_arch = "s390x"))
+            ))]
             {
                 match linker {
                     CliLinker::Core(_) => {