Skip to content

Commit 58bbca9

Browse files
BlackHoleFoxBlackHoleFox
committed
Raise minimum supported macOS to 10.12
1 parent 4e5b31c commit 58bbca9

File tree

12 files changed

+33
-45
lines changed

12 files changed

+33
-45
lines changed

‎.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ jobs:
305305
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
306306
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
307307
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
308-
MACOSX_DEPLOYMENT_TARGET: 10.7
308+
MACOSX_DEPLOYMENT_TARGET: 10.12
309309
SELECT_XCODE: /Applications/Xcode_13.4.1.app
310310
NO_LLVM_ASSERTIONS: 1
311311
NO_DEBUG_ASSERTIONS: 1
@@ -317,7 +317,7 @@ jobs:
317317
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
318318
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
319319
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
320-
MACOSX_DEPLOYMENT_TARGET: 10.7
320+
MACOSX_DEPLOYMENT_TARGET: 10.12
321321
SELECT_XCODE: /Applications/Xcode_13.4.1.app
322322
NO_LLVM_ASSERTIONS: 1
323323
NO_DEBUG_ASSERTIONS: 1
@@ -328,8 +328,8 @@ jobs:
328328
SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
329329
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
330330
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
331-
MACOSX_DEPLOYMENT_TARGET: 10.8
332-
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
331+
MACOSX_DEPLOYMENT_TARGET: 10.12
332+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
333333
NO_LLVM_ASSERTIONS: 1
334334
NO_DEBUG_ASSERTIONS: 1
335335
NO_OVERFLOW_CHECKS: 1
@@ -339,8 +339,8 @@ jobs:
339339
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
340340
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
341341
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
342-
MACOSX_DEPLOYMENT_TARGET: 10.8
343-
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
342+
MACOSX_DEPLOYMENT_TARGET: 10.12
343+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
344344
NO_LLVM_ASSERTIONS: 1
345345
NO_DEBUG_ASSERTIONS: 1
346346
NO_OVERFLOW_CHECKS: 1

‎compiler/rustc_target/src/spec/apple_base.rs

+10-21
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,16 @@ impl Arch {
6767
Armv7s => "cortex-a9",
6868
Arm64 => "apple-a7",
6969
Arm64_32 => "apple-s4",
70-
I386 | I686 => "yonah",
71-
X86_64 | X86_64_sim => "core2",
70+
// Only macOS 10.12+ is supported, which means
71+
// all x86_64/x86 CPUs must be running at least penryn
72+
// https://github.com/llvm/llvm-project/blob/01f924d0e37a5deae51df0d77e10a15b63aa0c0f/clang/lib/Driver/ToolChains/Arch/X86.cpp#L79-L82
73+
I386 | I686 => "penryn",
74+
X86_64 | X86_64_sim => "penryn",
75+
X86_64_macabi => "penryn",
7276
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
7377
// comments (and disabled features) in `x86_64h_apple_darwin` for
74-
// details.
78+
// details. It is a higher baseline then `penryn` however.
7579
X86_64h => "core-avx2",
76-
X86_64_macabi => "core2",
7780
Arm64_macabi => "apple-a12",
7881
Arm64_sim => "apple-a12",
7982
}
@@ -115,20 +118,8 @@ fn pre_link_args(os: &'static str, arch: Arch, abi: &'static str) -> LinkArgs {
115118
}
116119

117120
pub fn opts(os: &'static str, arch: Arch) -> TargetOptions {
118-
// Static TLS is only available in macOS 10.7+. If you try to compile for 10.6
119-
// either the linker will complain if it is used or the binary will end up
120-
// segfaulting at runtime when run on 10.6. Rust by default supports macOS
121-
// 10.7+, but there is a standard environment variable,
122-
// MACOSX_DEPLOYMENT_TARGET, which is used to signal targeting older
123-
// versions of macOS. For example compiling on 10.10 with
124-
// MACOSX_DEPLOYMENT_TARGET set to 10.6 will cause the linker to generate
125-
// warnings about the usage of static TLS.
126-
//
127-
// Here we detect what version is being requested, defaulting to 10.7. Static
128-
// TLS is flagged as enabled if it looks to be supported. The architecture
129-
// only matters for default deployment target which is 11.0 for ARM64 and
130-
// 10.7 for everything else.
131-
let has_thread_local = os == "macos" && macos_deployment_target(Arch::X86_64) >= (10, 7);
121+
// TODO: iOS 10+ always has TLS too.
122+
let has_thread_local = os == "macos";
132123

133124
let abi = arch.target_abi();
134125

@@ -239,9 +230,7 @@ fn macos_default_deployment_target(arch: Arch) -> (u32, u32) {
239230
match arch {
240231
// Note: Arm64_sim is not included since macOS has no simulator.
241232
Arm64 | Arm64_macabi => (11, 0),
242-
// x86_64h-apple-darwin only supports macOS 10.8 and later
243-
X86_64h => (10, 8),
244-
_ => (10, 7),
233+
_ => (10, 12),
245234
}
246235
}
247236

‎compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::spec::{StackProbeType, Target, TargetOptions};
55
pub fn target() -> Target {
66
let arch = Arch::X86_64;
77
let mut base = opts("macos", arch);
8-
base.max_atomic_width = Some(128); // core2 supports cmpxchg16b
8+
base.max_atomic_width = Some(128); // penryn+ supports cmpxchg16b
99
base.frame_pointer = FramePointer::Always;
1010
base.add_pre_link_args(LinkerFlavor::Darwin(Cc::Yes, Lld::No), &["-m64"]);
1111
base.stack_probes = StackProbeType::X86;

‎library/std/src/sys/unix/thread_parking/darwin.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
//!
33
//! Darwin actually has futex syscalls (`__ulock_wait`/`__ulock_wake`), but they
44
//! cannot be used in `std` because they are non-public (their use will lead to
5-
//! rejection from the App Store) and because they are only available starting
6-
//! with macOS version 10.12, even though the minimum target version is 10.7.
5+
//! rejection from the App Store).
76
//!
87
//! Therefore, we need to look for other synchronization primitives. Luckily, Darwin
98
//! supports semaphores, which allow us to implement the behaviour we need with

‎src/ci/github-actions/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ jobs:
484484
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
485485
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin
486486
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
487-
MACOSX_DEPLOYMENT_TARGET: 10.7
487+
MACOSX_DEPLOYMENT_TARGET: 10.12
488488
SELECT_XCODE: /Applications/Xcode_13.4.1.app
489489
NO_LLVM_ASSERTIONS: 1
490490
NO_DEBUG_ASSERTIONS: 1
@@ -497,7 +497,7 @@ jobs:
497497
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
498498
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
499499
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
500-
MACOSX_DEPLOYMENT_TARGET: 10.7
500+
MACOSX_DEPLOYMENT_TARGET: 10.12
501501
SELECT_XCODE: /Applications/Xcode_13.4.1.app
502502
NO_LLVM_ASSERTIONS: 1
503503
NO_DEBUG_ASSERTIONS: 1
@@ -509,8 +509,8 @@ jobs:
509509
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
510510
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
511511
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
512-
MACOSX_DEPLOYMENT_TARGET: 10.8
513-
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
512+
MACOSX_DEPLOYMENT_TARGET: 10.12
513+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
514514
NO_LLVM_ASSERTIONS: 1
515515
NO_DEBUG_ASSERTIONS: 1
516516
NO_OVERFLOW_CHECKS: 1

‎src/doc/rustc/src/platform-support.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ target | notes
3636
`i686-pc-windows-gnu` | 32-bit MinGW (Windows 7+) [^windows-support]
3737
`i686-pc-windows-msvc` | 32-bit MSVC (Windows 7+) [^windows-support]
3838
`i686-unknown-linux-gnu` | 32-bit Linux (kernel 3.2+, glibc 2.17+)
39-
`x86_64-apple-darwin` | 64-bit macOS (10.7+, Lion+)
39+
`x86_64-apple-darwin` | 64-bit macOS (10.12+, Sierra+)
4040
`x86_64-pc-windows-gnu` | 64-bit MinGW (Windows 7+) [^windows-support]
4141
`x86_64-pc-windows-msvc` | 64-bit MSVC (Windows 7+) [^windows-support]
4242
`x86_64-unknown-linux-gnu` | 64-bit Linux (kernel 3.2+, glibc 2.17+)
@@ -264,7 +264,7 @@ target | std | host | notes
264264
`hexagon-unknown-linux-musl` | ? | |
265265
`i386-apple-ios` | ✓ | | 32-bit x86 iOS
266266
[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS |
267-
`i686-apple-darwin` | ✓ | ✓ | 32-bit macOS (10.7+, Lion+)
267+
`i686-apple-darwin` | ✓ | ✓ | 32-bit macOS (10.12+, Sierra+)
268268
`i686-pc-windows-msvc` | * | | 32-bit Windows XP support
269269
`i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku
270270
[`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 with SSE2

‎src/etc/installer/pkg/Distribution.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true" />
88
<volume-check>
99
<allowed-os-versions>
10-
<os-version min="10.7"/>
10+
<os-version min="10.12"/>
1111
</allowed-os-versions>
1212
</volume-check>
1313
<choices-outline>

‎tests/codegen/macos/i686-macosx-deployment-target.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// compile-flags: -O --target=i686-apple-darwin --crate-type=rlib
66
// needs-llvm-components: x86
7-
// rustc-env:MACOSX_DEPLOYMENT_TARGET=10.9
7+
// rustc-env:MACOSX_DEPLOYMENT_TARGET=10.14
88
#![feature(no_core, lang_items)]
99
#![no_core]
1010

@@ -20,7 +20,7 @@ pub struct Bool {
2020
b: bool,
2121
}
2222

23-
// CHECK: target triple = "i686-apple-macosx10.9.0"
23+
// CHECK: target triple = "i686-apple-macosx10.14.0"
2424
#[no_mangle]
2525
pub extern "C" fn structbool() -> Bool {
2626
Bool { b: true }

‎tests/codegen/macos/i686-no-macosx-deployment-target.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub struct Bool {
2020
b: bool,
2121
}
2222

23-
// CHECK: target triple = "i686-apple-macosx10.7.0"
23+
// CHECK: target triple = "i686-apple-macosx10.12.0"
2424
#[no_mangle]
2525
pub extern "C" fn structbool() -> Bool {
2626
Bool { b: true }

‎tests/codegen/macos/x86_64-macosx-deployment-target.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// compile-flags: -O --target=x86_64-apple-darwin --crate-type=rlib
66
// needs-llvm-components: x86
7-
// rustc-env:MACOSX_DEPLOYMENT_TARGET=10.9
7+
// rustc-env:MACOSX_DEPLOYMENT_TARGET=10.14
88
#![feature(no_core, lang_items)]
99
#![no_core]
1010

@@ -20,7 +20,7 @@ pub struct Bool {
2020
b: bool,
2121
}
2222

23-
// CHECK: target triple = "x86_64-apple-macosx10.9.0"
23+
// CHECK: target triple = "x86_64-apple-macosx10.14.0"
2424
#[no_mangle]
2525
pub extern "C" fn structbool() -> Bool {
2626
Bool { b: true }

‎tests/codegen/macos/x86_64-no-macosx-deployment-target.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub struct Bool {
2020
b: bool,
2121
}
2222

23-
// CHECK: target triple = "x86_64-apple-macosx10.7.0"
23+
// CHECK: target triple = "x86_64-apple-macosx10.12.0"
2424
#[no_mangle]
2525
pub extern "C" fn structbool() -> Bool {
2626
Bool { b: true }

‎tests/run-make/macos-deployment-target/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ include ../tools.mk
99
ifeq ($(strip $(shell uname -m)),arm64)
1010
GREP_PATTERN = "minos 11.0"
1111
else
12-
GREP_PATTERN = "version 10.9"
12+
GREP_PATTERN = "version 10.13"
1313
endif
1414

1515
OUT_FILE=$(TMPDIR)/with_deployment_target.dylib
1616
all:
17-
env MACOSX_DEPLOYMENT_TARGET=10.9 $(RUSTC) with_deployment_target.rs -o $(OUT_FILE)
17+
env MACOSX_DEPLOYMENT_TARGET=10.13 $(RUSTC) with_deployment_target.rs -o $(OUT_FILE)
1818
# XXX: The check is for either the x86_64 minimum OR the aarch64 minimum (M1 starts at macOS 11).
1919
# They also use different load commands, so we let that change with each too. The aarch64 check
2020
# isn't as robust as the x86 one, but testing both seems unneeded.

0 commit comments

Comments
 (0)