Disable stdsimd in libstd too

diff --git a/0001-Disable-stdsimd-in-libcore.patch b/0001-Disable-stdsimd-in-libcore.patch
deleted file mode 100644 (file)
index dbbaf6c..0000000
--- a/0001-Disable-stdsimd-in-libcore.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 09ba4e4d2574ba591524cffe18eb11e05e6726a4 Mon Sep 17 00:00:00 2001
-From: bjorn3 <bjorn3@users.noreply.github.com>
-Date: Mon, 24 Sep 2018 18:50:20 +0200
-Subject: [PATCH] Disable stdsimd in libcore
-
----
- src/libcore/lib.rs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
-index 3b7646f..d349a49 100644
---- a/src/libcore/lib.rs
-+++ b/src/libcore/lib.rs
-@@ -226,6 +226,7 @@ mod nonzero;
- mod tuple;
- mod unit;
- 
-+/*
- // Pull in the the `coresimd` crate directly into libcore. This is where all the
- // architecture-specific (and vendor-specific) intrinsics are defined. AKA
- // things like SIMD and such. Note that the actual source for all this lies in a
-@@ -256,3 +257,4 @@ mod coresimd;
- #[stable(feature = "simd_arch", since = "1.27.0")]
- #[cfg(not(stage0))]
- pub use coresimd::arch;
-+*/
--- 
-2.11.0
-

diff --git a/0001-Disable-stdsimd.patch b/0001-Disable-stdsimd.patch
new file mode 100644 (file)
index 0000000..cd299b3
--- /dev/null
+++ b/0001-Disable-stdsimd.patch
@@ -0,0 +1,50 @@
+From 17e82251ba8f36149c03aee327de8b4054e6c88e Mon Sep 17 00:00:00 2001
+From: bjorn3 <bjorn3@users.noreply.github.com>
+Date: Sat, 6 Oct 2018 11:07:31 +0200
+Subject: [PATCH] Disable stdsimd
+
+---
+ src/libcore/lib.rs | 2 ++
+ src/libstd/lib.rs  | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
+index 0211b05..cd224f1 100644
+--- a/src/libcore/lib.rs
++++ b/src/libcore/lib.rs
+@@ -226,6 +226,7 @@ mod nonzero;
+ mod tuple;
+ mod unit;
+ 
++/*
+ // Pull in the the `coresimd` crate directly into libcore. This is where all the
+ // architecture-specific (and vendor-specific) intrinsics are defined. AKA
+ // things like SIMD and such. Note that the actual source for all this lies in a
+@@ -254,3 +255,4 @@ mod coresimd;
+ #[stable(feature = "simd_arch", since = "1.27.0")]
+ #[cfg(not(stage0))]
+ pub use coresimd::arch;
++*/
+diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
+index c58bd36..4768e8b 100644
+--- a/src/libstd/lib.rs
++++ b/src/libstd/lib.rs
+@@ -501,6 +501,7 @@ mod memchr;
+ // compiler
+ pub mod rt;
+ 
++/*
+ // Pull in the the `stdsimd` crate directly into libstd. This is the same as
+ // libcore's arch/simd modules where the source of truth here is in a different
+ // repository, but we pull things in here manually to get it into libstd.
+@@ -525,6 +526,7 @@ mod coresimd {
+ #[stable(feature = "simd_arch", since = "1.27.0")]
+ #[cfg(all(not(stage0), not(test)))]
+ pub use stdsimd::arch;
++*/
+ 
+ // Include a number of private modules that exist solely to provide
+ // the rustdoc documentation for primitive types. Using `include!`
+-- 
+2.17.1 (Apple Git-112)
+