Fixes to compile with latest Rust nightly

3 files changed, 3 insertions, 5 deletions

diff --git a/library/stdarch/crates/assert-instr-macro/src/lib.rs b/library/stdarch/crates/assert-instr-macro/src/lib.rs
index 96b86d93bbc..13c3c3851b4 100644
--- a/library/stdarch/crates/assert-instr-macro/src/lib.rs
+++ b/library/stdarch/crates/assert-instr-macro/src/lib.rs
@@ -124,8 +124,10 @@ pub fn assert_instr(
         let target = std::env::var("TARGET").unwrap();
         if target.contains("x86_64") {
             syn::LitStr::new("sysv64", proc_macro2::Span::call_site())
-        } else {
+        } else if target.contains("86") {
             syn::LitStr::new("vectorcall", proc_macro2::Span::call_site())
+        } else {
+            syn::LitStr::new("C", proc_macro2::Span::call_site())
         }
     } else {
         syn::LitStr::new("C", proc_macro2::Span::call_site())
diff --git a/library/stdarch/crates/core_arch/src/lib.rs b/library/stdarch/crates/core_arch/src/lib.rs
index 3a760fe276e..2b35208feff 100644
--- a/library/stdarch/crates/core_arch/src/lib.rs
+++ b/library/stdarch/crates/core_arch/src/lib.rs
@@ -33,10 +33,8 @@
     decl_macro,
     generic_arg_infer,
     asm_experimental_arch,
-    sha512_sm_x86,
     x86_amx_intrinsics,
     f16,
-    keylocker_x86,
     aarch64_unstable_target_feature,
     bigint_helper_methods
 )]
diff --git a/library/stdarch/crates/std_detect/tests/x86-specific.rs b/library/stdarch/crates/std_detect/tests/x86-specific.rs
index 04080f639c9..d9ec79821ba 100644
--- a/library/stdarch/crates/std_detect/tests/x86-specific.rs
+++ b/library/stdarch/crates/std_detect/tests/x86-specific.rs
@@ -2,10 +2,8 @@
 #![allow(internal_features)]
 #![feature(
     stdarch_internal,
-    sha512_sm_x86,
     x86_amx_intrinsics,
     xop_target_feature,
-    keylocker_x86,
     movrs_target_feature
 )]