11 files changed, 8 insertions, 11 deletions
diff --git a/library/stdarch/crates/core_arch/README.md b/library/stdarch/crates/core_arch/README.md
index a5f490bcf5d..fc18a5759db 100644
--- a/library/stdarch/crates/core_arch/README.md
+++ b/library/stdarch/crates/core_arch/README.md
@@ -7,8 +7,6 @@ The `core::arch` module implements architecture-dependent intrinsics (e.g. SIMD)
 
 `core::arch` is available as part of `libcore` and it is re-exported by
 `libstd`. Prefer using it via `core::arch` or `std::arch` than via this crate.
-Unstable features are often available in nightly Rust via the
-`feature(stdsimd)`.
 
 Using `core::arch` via this crate requires nightly Rust, and it can (and does)
 break often. The only cases in which you should consider using it via this crate
diff --git a/library/stdarch/crates/intrinsic-test/src/main.rs b/library/stdarch/crates/intrinsic-test/src/main.rs
index 15bc021c757..162d3a72bd3 100644
--- a/library/stdarch/crates/intrinsic-test/src/main.rs
+++ b/library/stdarch/crates/intrinsic-test/src/main.rs
@@ -166,7 +166,6 @@ fn generate_rust_program(notices: &str, intrinsic: &Intrinsic, a32: bool) -> Str
     format!(
         r#"{notices}#![feature(simd_ffi)]
 #![feature(link_llvm_intrinsics)]
-#![feature(stdsimd)]
 #![allow(overflowing_literals)]
 #![allow(non_upper_case_globals)]
 use core_arch::arch::{target_arch}::*;
diff --git a/library/stdarch/crates/std_detect/README.md b/library/stdarch/crates/std_detect/README.md
index 5211771047f..3611daaf40f 100644
--- a/library/stdarch/crates/std_detect/README.md
+++ b/library/stdarch/crates/std_detect/README.md
@@ -9,7 +9,7 @@ supports certain features, like SIMD instructions.
 
 `std::detect` APIs are available as part of `libstd`. Prefer using it via the
 standard library than through this crate. Unstable features of `std::detect` are
-available on nightly Rust behind the `feature(stdsimd)` feature-gate.
+available on nightly Rust behind various feature-gates.
 
 If you need run-time feature detection in `#[no_std]` environments, Rust `core`
 library cannot help you. By design, Rust `core` is platform independent, but
diff --git a/library/stdarch/crates/std_detect/src/detect/macros.rs b/library/stdarch/crates/std_detect/src/detect/macros.rs
index d1bc990dd2c..5321ef2252e 100644
--- a/library/stdarch/crates/std_detect/src/detect/macros.rs
+++ b/library/stdarch/crates/std_detect/src/detect/macros.rs
@@ -26,7 +26,7 @@ macro_rules! features {
     ) => {
         #[macro_export]
         $(#[$macro_attrs])*
-        #[allow_internal_unstable(stdarch_internal, stdsimd)]
+        #[allow_internal_unstable(stdarch_internal)]
         #[cfg($cfg)]
         #[doc(cfg($cfg))]
         macro_rules! $macro_name {
diff --git a/library/stdarch/crates/std_detect/src/lib.rs b/library/stdarch/crates/std_detect/src/lib.rs
index 14359686f3c..1ff42000992 100644
--- a/library/stdarch/crates/std_detect/src/lib.rs
+++ b/library/stdarch/crates/std_detect/src/lib.rs
@@ -20,6 +20,8 @@
 #![cfg_attr(test, allow(unused_imports))]
 #![no_std]
 #![allow(internal_features)]
+// Temporary hack: needed to build against toolchains from before the mass feature renaming.
+#![feature(stdsimd)]
 
 #[cfg(test)]
 #[macro_use]
diff --git a/library/stdarch/crates/std_detect/tests/cpu-detection.rs b/library/stdarch/crates/std_detect/tests/cpu-detection.rs
index f93212d24f6..01a9040da84 100644
--- a/library/stdarch/crates/std_detect/tests/cpu-detection.rs
+++ b/library/stdarch/crates/std_detect/tests/cpu-detection.rs
@@ -1,4 +1,4 @@
-#![feature(stdsimd)]
+#![feature(stdarch_internal, stdarch_arm_feature_detection)]
 #![allow(clippy::unwrap_used, clippy::use_debug, clippy::print_stdout)]
 #![cfg(any(
     target_arch = "arm",
diff --git a/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs b/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs
index cd597af73cb..3a5d062f82b 100644
--- a/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs
+++ b/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs
@@ -1,4 +1,4 @@
-#![feature(stdsimd)]
+#![feature(stdarch_arm_feature_detection)]
 #![allow(clippy::unwrap_used, clippy::use_debug, clippy::print_stdout)]
 
 #[cfg(any(
diff --git a/library/stdarch/crates/std_detect/tests/x86-specific.rs b/library/stdarch/crates/std_detect/tests/x86-specific.rs
index 38512c758d4..54bcab7b1ec 100644
--- a/library/stdarch/crates/std_detect/tests/x86-specific.rs
+++ b/library/stdarch/crates/std_detect/tests/x86-specific.rs
@@ -1,4 +1,3 @@
-#![feature(stdsimd)]
 #![cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 
 extern crate cupid;
diff --git a/library/stdarch/examples/connect5.rs b/library/stdarch/examples/connect5.rs
index 805108c24ce..6298255421a 100644
--- a/library/stdarch/examples/connect5.rs
+++ b/library/stdarch/examples/connect5.rs
@@ -28,7 +28,7 @@
 //! You should see a game self-playing. In the end of the game, it shows the average time for
 //! each move.
 
-#![feature(stdsimd, avx512_target_feature)]
+#![feature(avx512_target_feature, stdarch_x86_avx512)]
 #![feature(stmt_expr_attributes)]
 
 use rand::seq::SliceRandom;
diff --git a/library/stdarch/examples/hex.rs b/library/stdarch/examples/hex.rs
index a961793a045..490556e8bf7 100644
--- a/library/stdarch/examples/hex.rs
+++ b/library/stdarch/examples/hex.rs
@@ -12,7 +12,7 @@
 //!
 //! and you should see `746573740a` get printed out.
 
-#![feature(stdsimd, wasm_target_feature)]
+#![feature(wasm_target_feature)]
 #![cfg_attr(test, feature(test))]
 #![allow(
     clippy::unwrap_used,
diff --git a/library/stdarch/examples/wasm.rs b/library/stdarch/examples/wasm.rs
index 6b92ae9b87d..8a95ed54e14 100644
--- a/library/stdarch/examples/wasm.rs
+++ b/library/stdarch/examples/wasm.rs
@@ -1,6 +1,5 @@
 //! A simple slab allocator for pages in wasm
 
-#![feature(stdsimd)]
 #![cfg(target_arch = "wasm32")]
 
 use std::ptr;