diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-06-21 10:40:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 10:40:16 -0400 |
| commit | 30a7bfcaae402980a529233cd8d5588c226b66d9 (patch) | |
| tree | 24d5635c53fc4d2c9832c6e0003578392b5ca86e | |
| parent | d33e2c5181488c15b14a48bd84dec8b28049dd33 (diff) | |
| parent | c83a22c44a22b8bc8c7c4db42f191da077602773 (diff) | |
| download | rust-30a7bfcaae402980a529233cd8d5588c226b66d9.tar.gz rust-30a7bfcaae402980a529233cd8d5588c226b66d9.zip | |
Rollup merge of #42762 - jackpot51:patch-1, r=sfackler
Disable repr(simd) in mem::swap on Redox This addresses https://github.com/rust-lang/rust/issues/42761
| -rw-r--r-- | src/libcore/mem.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index 3924034fea2..509b396f211 100644 --- 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); |