diff --git a/crates/core_arch/src/aarch64/mod.rs b/crates/core_arch/src/aarch64/mod.rs
index 1f07f02472..34fa5c8179 100644
--- a/crates/core_arch/src/aarch64/mod.rs
+++ b/crates/core_arch/src/aarch64/mod.rs
@@ -6,13 +6,6 @@
 //! [arm_ref]: http://infocenter.arm.com/help/topic/com.arm.doc.ihi0073a/IHI0073A_arm_neon_intrinsics_ref.pdf
 //! [arm_dat]: https://developer.arm.com/technologies/neon/intrinsics
 
-#![cfg_attr(
-    all(target_arch = "aarch64", target_abi = "softfloat"),
-    // Just allow the warning: anyone soundly using the intrinsics has to enable
-    // the target feature, and that will generate a warning for them.
-    allow(aarch64_softfloat_neon)
-)]
-
 mod mte;
 #[unstable(feature = "stdarch_aarch64_mte", issue = "129010")]
 pub use self::mte::*;
diff --git a/crates/core_arch/src/arm_shared/mod.rs b/crates/core_arch/src/arm_shared/mod.rs
index 8074648a28..072743a69f 100644
--- a/crates/core_arch/src/arm_shared/mod.rs
+++ b/crates/core_arch/src/arm_shared/mod.rs
@@ -47,12 +47,6 @@
 //!
 //! - [ACLE Q2 2018](https://developer.arm.com/docs/101028/latest)
 
-#![cfg_attr(
-    all(target_arch = "aarch64", target_abi = "softfloat"),
-    // Just allow the warning: anyone soundly using the intrinsics has to enable
-    // the target feature, and that will generate a warning for them.
-    allow(aarch64_softfloat_neon)
-)]
 // Only for 'neon' submodule
 #![allow(non_camel_case_types)]
 
diff --git a/crates/core_arch/src/mod.rs b/crates/core_arch/src/mod.rs
index 2483d07b23..ab787590a2 100644
--- a/crates/core_arch/src/mod.rs
+++ b/crates/core_arch/src/mod.rs
@@ -1,6 +1,9 @@
 //! `core_arch`
 
 #![allow(unknown_lints, unnecessary_transmutes)]
+// Allow these FCW: anyone soundly using the intrinsics has to enable
+// the target feature, and that will generate a warning for them.
+#![allow(aarch64_softfloat_neon, x86_softfloat_sse)]
 
 #[macro_use]
 mod macros;
diff --git a/rust-version b/rust-version
index 61a4b2d8c0..7b17062661 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-1e5ee356374211706221b71b6106d297a646ee57
+da5114692c9ebe46b869488c5f34f92eb10b98c1