From ab8e222e0910b800ccd19d69ea2195ffc6f52950 Mon Sep 17 00:00:00 2001
From: Jethro Beekman <jethro@fortanix.com>
Date: Mon, 19 Nov 2018 21:32:32 +0530
Subject: [PATCH] Fix build when used as a submodule

---
 library/stdarch/coresimd/aarch64/mod.rs    |  2 +-
 library/stdarch/coresimd/arm/mod.rs        |  2 +-
 library/stdarch/coresimd/mips/mod.rs       |  2 +-
 library/stdarch/coresimd/nvptx/mod.rs      |  2 +-
 library/stdarch/coresimd/powerpc/mod.rs    |  2 +-
 library/stdarch/coresimd/wasm32/mod.rs     |  2 +-
 library/stdarch/coresimd/wasm32/simd128.rs | 11 +++--------
 library/stdarch/coresimd/x86/mod.rs        |  2 +-
 8 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/library/stdarch/coresimd/aarch64/mod.rs b/library/stdarch/coresimd/aarch64/mod.rs
index 8a2dfdd8ad8f..1c4160a03b11 100644
--- a/library/stdarch/coresimd/aarch64/mod.rs
+++ b/library/stdarch/coresimd/aarch64/mod.rs
@@ -22,5 +22,5 @@ use stdsimd_test::assert_instr;
 #[cfg_attr(test, assert_instr(brk))]
 #[inline]
 pub unsafe fn brk() -> ! {
-    ::_core::intrinsics::abort()
+    ::intrinsics::abort()
 }
diff --git a/library/stdarch/coresimd/arm/mod.rs b/library/stdarch/coresimd/arm/mod.rs
index dabd759391aa..b735f1be751d 100644
--- a/library/stdarch/coresimd/arm/mod.rs
+++ b/library/stdarch/coresimd/arm/mod.rs
@@ -55,5 +55,5 @@ use stdsimd_test::assert_instr;
 #[cfg_attr(test, assert_instr(udf))]
 #[inline]
 pub unsafe fn udf() -> ! {
-    ::_core::intrinsics::abort()
+    ::intrinsics::abort()
 }
diff --git a/library/stdarch/coresimd/mips/mod.rs b/library/stdarch/coresimd/mips/mod.rs
index 8ec733e27f4b..e305ffa573e9 100644
--- a/library/stdarch/coresimd/mips/mod.rs
+++ b/library/stdarch/coresimd/mips/mod.rs
@@ -10,5 +10,5 @@ use stdsimd_test::assert_instr;
 #[cfg_attr(test, assert_instr(break))]
 #[inline]
 pub unsafe fn break_() -> ! {
-    ::_core::intrinsics::abort()
+    ::intrinsics::abort()
 }
diff --git a/library/stdarch/coresimd/nvptx/mod.rs b/library/stdarch/coresimd/nvptx/mod.rs
index da78e5e05768..0247d2e44e6d 100644
--- a/library/stdarch/coresimd/nvptx/mod.rs
+++ b/library/stdarch/coresimd/nvptx/mod.rs
@@ -122,5 +122,5 @@ pub unsafe fn _thread_idx_z() -> i32 {
 /// Generates the trap instruction `TRAP`
 #[inline]
 pub unsafe fn trap() -> ! {
-    ::_core::intrinsics::abort()
+    ::intrinsics::abort()
 }
diff --git a/library/stdarch/coresimd/powerpc/mod.rs b/library/stdarch/coresimd/powerpc/mod.rs
index a02dfc805c9e..c7829d30b73e 100644
--- a/library/stdarch/coresimd/powerpc/mod.rs
+++ b/library/stdarch/coresimd/powerpc/mod.rs
@@ -15,5 +15,5 @@ use stdsimd_test::assert_instr;
 #[cfg_attr(test, assert_instr(trap))]
 #[inline]
 pub unsafe fn trap() -> ! {
-    ::_core::intrinsics::abort()
+    ::intrinsics::abort()
 }
diff --git a/library/stdarch/coresimd/wasm32/mod.rs b/library/stdarch/coresimd/wasm32/mod.rs
index a1a5c60eb908..63650f34b534 100644
--- a/library/stdarch/coresimd/wasm32/mod.rs
+++ b/library/stdarch/coresimd/wasm32/mod.rs
@@ -43,5 +43,5 @@ pub mod memory;
 #[cfg_attr(test, assert_instr(unreachable))]
 #[inline]
 pub unsafe fn unreachable() -> ! {
-    ::_core::intrinsics::abort()
+    ::intrinsics::abort()
 }
diff --git a/library/stdarch/coresimd/wasm32/simd128.rs b/library/stdarch/coresimd/wasm32/simd128.rs
index e70c35988dd7..8d44ef578e56 100644
--- a/library/stdarch/coresimd/wasm32/simd128.rs
+++ b/library/stdarch/coresimd/wasm32/simd128.rs
@@ -632,12 +632,7 @@ impl v128 {
             c: [ImmByte; 16],
         }
         // FIXME: https://github.com/rust-lang/rust/issues/53193
-        const C: [ImmByte; 16] = unsafe {
-            U {
-                v: ::_core::u128::MAX,
-            }
-            .c
-        };
+        const C: [ImmByte; 16] = unsafe { U { v: ::u128::MAX }.c };
         Self::xor(v128::const_(C), a)
     }
 
@@ -664,7 +659,7 @@ impl v128 {
     // #[target_feature(enable = "simd128")]
     // FIXME: #[cfg_attr(test, assert_instr($id.load))]
     pub unsafe fn load(m: *const v128) -> v128 {
-        ::_core::ptr::read(m)
+        ::ptr::read(m)
     }
 
     /// Store a `v128` vector to the given heap address.
@@ -672,7 +667,7 @@ impl v128 {
     // #[target_feature(enable = "simd128")]
     // FIXME: #[cfg_attr(test, assert_instr($id.store))]
     pub unsafe fn store(m: *mut v128, a: v128) {
-        ::_core::ptr::write(m, a)
+        ::ptr::write(m, a)
     }
 }
 
diff --git a/library/stdarch/coresimd/x86/mod.rs b/library/stdarch/coresimd/x86/mod.rs
index 1ebc01efccb6..fb4809826a1f 100644
--- a/library/stdarch/coresimd/x86/mod.rs
+++ b/library/stdarch/coresimd/x86/mod.rs
@@ -520,5 +520,5 @@ use stdsimd_test::assert_instr;
 #[cfg_attr(test, assert_instr(ud2))]
 #[inline]
 pub unsafe fn ud2() -> ! {
-    ::_core::intrinsics::abort()
+    ::intrinsics::abort()
 }