diff --git a/compiler-builtins/src/lib.rs b/compiler-builtins/src/lib.rs
index b111dc0bd..a9dd6e531 100644
--- a/compiler-builtins/src/lib.rs
+++ b/compiler-builtins/src/lib.rs
@@ -7,7 +7,6 @@
 #![feature(compiler_builtins)]
 #![feature(core_intrinsics)]
 #![feature(linkage)]
-#![feature(asm_cfg)]
 #![feature(naked_functions)]
 #![feature(repr_simd)]
 #![feature(macro_metavar_expr_concat)]
diff --git a/rust-version b/rust-version
index 8854fb959..71fbbbaa9 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-caccb4d0368bd918ef6668af8e13834d07040417
+47cd7120d9b4e1b64eb27c87522a07888197fae8