From 89c57da20b238c7e306f520271b7552587fd43aa Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Wed, 8 Mar 2023 11:12:12 +0100
Subject: [PATCH 1/2] Fix doc, threads are enabled by default now

---
 lib/c-api/src/wasm_c_api/unstable/features.rs | 4 ++--
 lib/cli/src/common.rs                         | 6 +++---
 lib/cli/src/store.rs                          | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/c-api/src/wasm_c_api/unstable/features.rs b/lib/c-api/src/wasm_c_api/unstable/features.rs
index 349e69f704b..b00cffb5b0b 100644
--- a/lib/c-api/src/wasm_c_api/unstable/features.rs
+++ b/lib/c-api/src/wasm_c_api/unstable/features.rs
@@ -72,12 +72,12 @@ pub extern "C" fn wasmer_features_delete(_features: Option<Box<wasmer_features_t
 ///
 /// The [WebAssembly threads proposal][threads] is not currently fully
 /// standardized and is undergoing development. Support for this feature can
-/// be enabled through this method for appropriate WebAssembly modules.
+/// be disabled through this method for appropriate WebAssembly modules.
 ///
 /// This feature gates items such as shared memories and atomic
 /// instructions.
 ///
-/// This is `false` by default.
+/// This is `true` by default.
 ///
 /// [threads]: https://github.com/webassembly/threads
 ///
diff --git a/lib/cli/src/common.rs b/lib/cli/src/common.rs
index 474e9aae6ec..fdb277c4ff6 100644
--- a/lib/cli/src/common.rs
+++ b/lib/cli/src/common.rs
@@ -13,9 +13,9 @@ pub struct WasmFeatures {
     #[clap(long = "enable-simd")]
     pub simd: bool,
 
-    /// Enable support for the threads proposal.
-    #[clap(long = "enable-threads")]
-    pub threads: bool,
+    /// Disable support for the threads proposal.
+    #[clap(long = "disable-threads")]
+    pub disable_threads: bool,
 
     /// Enable support for the reference types proposal.
     #[clap(long = "enable-reference-types")]
diff --git a/lib/cli/src/store.rs b/lib/cli/src/store.rs
index c78390c03a6..54c514916c1 100644
--- a/lib/cli/src/store.rs
+++ b/lib/cli/src/store.rs
@@ -83,9 +83,12 @@ impl CompilerOptions {
 
     /// Get the enaled Wasm features.
     pub fn get_features(&self, mut features: Features) -> Result<Features> {
-        if self.features.threads || self.features.all {
+        if !self.features.disable_threads || self.features.all {
             features.threads(true);
         }
+        if self.features.disable_threads && !self.features.all {
+            features.threads(false);
+        }
         if self.features.multi_value || self.features.all {
             features.multi_value(true);
         }

From 51697bf11ca5a3bb552e8e60e7004c027f255787 Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Wed, 8 Mar 2023 12:09:19 +0100
Subject: [PATCH 2/2] Do not remove enable-thread, just mark at as deprecated

---
 lib/cli/src/common.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/cli/src/common.rs b/lib/cli/src/common.rs
index fdb277c4ff6..a4fd8eb1ccf 100644
--- a/lib/cli/src/common.rs
+++ b/lib/cli/src/common.rs
@@ -17,6 +17,10 @@ pub struct WasmFeatures {
     #[clap(long = "disable-threads")]
     pub disable_threads: bool,
 
+    /// Deprecated, threads are enabled by default.
+    #[clap(long = "enable-threads")]
+    pub _threads: bool,
+
     /// Enable support for the reference types proposal.
     #[clap(long = "enable-reference-types")]
     pub reference_types: bool,