From 77c14a5c5f1ac709961222f95ebbd808e6d59f35 Mon Sep 17 00:00:00 2001
From: gnzlbg <gonzalobg88@gmail.com>
Date: Mon, 15 Jul 2019 13:53:44 +0200
Subject: [PATCH] Update the stdarch submodule

---
 .gitmodules               | 6 +++---
 src/bootstrap/dist.rs     | 2 +-
 src/libcore/lib.rs        | 4 ++--
 src/libstd/Cargo.toml     | 4 ++--
 src/libstd/lib.rs         | 4 ++--
 src/stdarch               | 1 +
 src/stdsimd               | 1 -
 src/tools/tidy/src/lib.rs | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 create mode 160000 src/stdarch
 delete mode 160000 src/stdsimd

diff --git a/.gitmodules b/.gitmodules
index dd74d49828f..9dd9f33cd0e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,9 +31,9 @@
 [submodule "src/llvm-emscripten"]
 	path = src/llvm-emscripten
 	url = https://github.com/rust-lang/llvm.git
-[submodule "src/stdsimd"]
-	path = src/stdsimd
-	url = https://github.com/rust-lang-nursery/stdsimd.git
+[submodule "src/stdarch"]
+	path = src/stdarch
+	url = https://github.com/rust-lang/stdarch.git
 [submodule "src/doc/rustc-guide"]
 	path = src/doc/rustc-guide
 	url = https://github.com/rust-lang/rustc-guide.git
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 3e9596f446b..bd012a887c2 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -903,7 +903,7 @@ fn run(self, builder: &Builder<'_>) -> PathBuf {
             "src/libtest",
             "src/libterm",
             "src/libprofiler_builtins",
-            "src/stdsimd",
+            "src/stdarch",
             "src/libproc_macro",
             "src/tools/rustc-std-workspace-core",
             "src/tools/rustc-std-workspace-alloc",
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 04253858bf7..cfac8eb78bd 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -228,12 +228,12 @@
 mod unit;
 
 // Pull in the `core_arch` crate directly into libcore. The contents of
-// `core_arch` are in a different repository: rust-lang-nursery/stdsimd.
+// `core_arch` are in a different repository: rust-lang/stdarch.
 //
 // `core_arch` depends on libcore, but the contents of this module are
 // set up in such a way that directly pulling it here works such that the
 // crate uses the this crate as its libcore.
-#[path = "../stdsimd/crates/core_arch/src/mod.rs"]
+#[path = "../stdarch/crates/core_arch/src/mod.rs"]
 #[allow(missing_docs, missing_debug_implementations, dead_code, unused_imports)]
 #[unstable(feature = "stdsimd", issue = "48556")]
 mod core_arch;
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 38df1f26d95..6da77ab57d1 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -80,8 +80,8 @@ wasm_syscall = []
 # current thread id and accessing/getting the current thread's TCB
 wasm-bindgen-threads = []
 
-# Enable std_detect default features for stdsimd:
-# https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/Cargo.toml
+# Enable std_detect default features for stdarch/crates/std_detect:
+# https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.toml
 std_detect_file_io = []
 std_detect_dlsym_getauxval = []
 
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index fb9a228880e..f394195d77a 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -492,12 +492,12 @@ pub mod task {
 pub mod rt;
 
 // Pull in the `std_detect` crate directly into libstd. The contents of
-// `std_detect` are in a different repository: rust-lang-nursery/stdsimd.
+// `std_detect` are in a different repository: rust-lang/stdarch.
 //
 // `std_detect` depends on libstd, but the contents of this module are
 // set up in such a way that directly pulling it here works such that the
 // crate uses the this crate as its libstd.
-#[path = "../stdsimd/crates/std_detect/src/mod.rs"]
+#[path = "../stdarch/crates/std_detect/src/mod.rs"]
 #[allow(missing_debug_implementations, missing_docs, dead_code)]
 #[unstable(feature = "stdsimd", issue = "48556")]
 #[cfg(not(test))]
diff --git a/src/stdarch b/src/stdarch
new file mode 160000
index 00000000000..8cb42c97023
--- /dev/null
+++ b/src/stdarch
@@ -0,0 +1 @@
+Subproject commit 8cb42c97023fc1cd69f8f81e351b8ba18dcf233b
diff --git a/src/stdsimd b/src/stdsimd
deleted file mode 160000
index 4bf456c35e8..00000000000
--- a/src/stdsimd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4bf456c35e85fcca5cf95008401af8ab25abf850
diff --git a/src/tools/tidy/src/lib.rs b/src/tools/tidy/src/lib.rs
index a0bf0b07354..06c1a8c18ba 100644
--- a/src/tools/tidy/src/lib.rs
+++ b/src/tools/tidy/src/lib.rs
@@ -59,7 +59,7 @@ fn filter_dirs(path: &Path) -> bool {
         "src/tools/lld",
         "src/tools/lldb",
         "src/target",
-        "src/stdsimd",
+        "src/stdarch",
         "src/rust-sgx",
         "target",
         "vendor",