Revert changes to bootstrap, rustc_driver and fix {core,std}simd

1 files changed, 4 insertions, 4 deletions

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index d79f851a3d7..d73cb1f8349 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -523,22 +523,22 @@ pub mod rt;
 #[path = "../stdsimd/stdsimd/mod.rs"]
 #[allow(missing_debug_implementations, missing_docs, dead_code)]
 #[unstable(feature = "stdsimd", issue = "48556")]
-#[cfg(all(not(stage0), not(test), codegen_backend="llvm"))]
+#[cfg(all(not(stage0), not(test)))]
 mod stdsimd;
 
 // A "fake" module needed by the `stdsimd` module to compile, not actually
 // exported though.
-#[cfg(all(not(stage0), codegen_backend="llvm"))]
+#[cfg(not(stage0))]
 mod coresimd {
     pub use core::arch;
     pub use core::simd;
 }
 
 #[unstable(feature = "stdsimd", issue = "48556")]
-#[cfg(all(not(stage0), not(test), codegen_backend="llvm"))]
+#[cfg(all(not(stage0), not(test)))]
 pub use stdsimd::simd;
 #[stable(feature = "simd_arch", since = "1.27.0")]
-#[cfg(all(not(stage0), not(test), codegen_backend="llvm"))]
+#[cfg(all(not(stage0), not(test)))]
 pub use stdsimd::arch;
 
 // Include a number of private modules that exist solely to provide