Skip to content

Commit 77a8ed9

Browse files
committed
Auto merge of #51828 - kennytm:no-simd-swap-for-mac, r=<try>
[DO NOT MERGE] Disable SIMD in mem::swap on macOS Tries to address the various TLS segfault on macOS 10.10.
2 parents 9cc3d44 + f2422bd commit 77a8ed9

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ matrix:
1616
if: type = pull_request OR branch = auto
1717

1818
- env: IMAGE=dist-x86_64-linux DEPLOY=1
19-
if: branch = try OR branch = auto
19+
if: branch = auto
2020

2121
# "alternate" deployments, these are "nightlies" but have LLVM assertions
2222
# turned on, they're deployed to a different location primarily for
2323
# additional testing.
2424
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 CI_JOB_NAME=dist-x86_64-linux-alt
25-
if: branch = try OR branch = auto
25+
if: branch = auto
2626

2727
- env: >
2828
RUST_CHECK_TARGET=dist
@@ -105,7 +105,7 @@ matrix:
105105
CI_JOB_NAME=dist-x86_64-apple
106106
os: osx
107107
osx_image: xcode9.3-moar
108-
if: branch = auto
108+
if: branch = try OR branch = auto
109109
110110
# Linux builders, remaining docker images
111111
- env: IMAGE=arm-android

src/libcore/ptr.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,11 @@ unsafe fn swap_nonoverlapping_bytes(x: *mut u8, y: *mut u8, len: usize) {
194194
// Haswell E processors. LLVM is more able to optimize if we give a struct a
195195
// #[repr(simd)], even if we don't actually use this struct directly.
196196
//
197-
// FIXME repr(simd) broken on emscripten and redox
197+
// FIXME repr(simd) broken on emscripten and redox and macOS
198198
// It's also broken on big-endian powerpc64 and s390x. #42778
199+
// It's also broken on macOS 10.10. #51794/#51758/#48866/#44056
199200
#[cfg_attr(not(any(target_os = "emscripten", target_os = "redox",
201+
target_os = "macos",
200202
target_endian = "big")),
201203
repr(simd))]
202204
struct Block(u64, u64, u64, u64);

0 commit comments

Comments
 (0)