Rollup merge of rust-lang#42762 - jackpot51:patch-1, r=sfackler

Disable repr(simd) in mem::swap on Redox This addresses rust-lang#42761
frewsxcv · Jun 21, 2017 · 30a7bfc · 30a7bfc
2 parents d33e2c5 + c83a22c
commit 30a7bfc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
@@ -504,8 +504,8 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
         // Haswell E processors. LLVM is more able to optimize if we give a struct a
         // #[repr(simd)], even if we don't actually use this struct directly.
         //
-        // FIXME repr(simd) broken on emscripten
-        #[cfg_attr(not(target_os = "emscripten"), repr(simd))]
+        // FIXME repr(simd) broken on emscripten and redox
+        #[cfg_attr(not(any(target_os = "emscripten", target_os = "redox")), repr(simd))]
         struct Block(u64, u64, u64, u64);
         struct UnalignedBlock(u64, u64, u64, u64);