Skip to content

Commit f36e26e

Browse files
authored
Unrolled build for rust-lang#128592
Rollup merge of rust-lang#128592 - evelynharthbrooke:master, r=Mark-Simulacrum Promote aarch64-apple-darwin to Tier 1 This promotes aarch64-apple-darwin to Tier 1 status as per rust-lang/rfcs#3671 and tracking issue rust-lang#73908. Not sure what else is necessary for this to impement the aforementioned RFC, however I figured I'd try. I did read in previous issues and PRs that the necessary infrastructure was already in place for the aarch64-apple-darwin target, and the RFC mentions the same. So this should be all thats necessary in order for the target to be promoted. This is a recreation of my previous PR because I accidentally did an incorrect git rebase which caused unnecessary changes to various commit SHAs. So this PR is a recreation of my previous PR without said stumble. My bad.
2 parents 730d5d4 + 1c02e2b commit f36e26e

File tree

6 files changed

+4
-8
lines changed

6 files changed

+4
-8
lines changed

compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
llvm_target: macos_llvm_target(arch).into(),
1818
metadata: crate::spec::TargetMetadata {
1919
description: Some("ARM64 macOS (11.0+, Big Sur+)".into()),
20-
tier: Some(2),
20+
tier: Some(1),
2121
host_tools: Some(true),
2222
std: Some(true),
2323
},

src/bootstrap/src/core/build_steps/llvm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ pub(crate) fn is_ci_llvm_available(config: &Config, asserts: bool) -> bool {
194194
let supported_platforms = [
195195
// tier 1
196196
("aarch64-unknown-linux-gnu", false),
197+
("aarch64-apple-darwin", false),
197198
("i686-pc-windows-gnu", false),
198199
("i686-pc-windows-msvc", false),
199200
("i686-unknown-linux-gnu", false),
@@ -202,7 +203,6 @@ pub(crate) fn is_ci_llvm_available(config: &Config, asserts: bool) -> bool {
202203
("x86_64-pc-windows-gnu", true),
203204
("x86_64-pc-windows-msvc", true),
204205
// tier 2 with host tools
205-
("aarch64-apple-darwin", false),
206206
("aarch64-pc-windows-msvc", false),
207207
("aarch64-unknown-linux-musl", false),
208208
("arm-unknown-linux-gnueabi", false),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ All tier 1 targets with host tools support the full standard library.
3333
target | notes
3434
-------|-------
3535
`aarch64-unknown-linux-gnu` | ARM64 Linux (kernel 4.1, glibc 2.17+)
36+
[`aarch64-apple-darwin`](platform-support/apple-darwin.md) | ARM64 macOS (11.0+, Big Sur+)
3637
`i686-pc-windows-gnu` | 32-bit MinGW (Windows 10+, Windows Server 2016+) [^x86_32-floats-return-ABI]
3738
`i686-pc-windows-msvc` | 32-bit MSVC (Windows 10+, Windows Server 2016+) [^x86_32-floats-return-ABI]
3839
`i686-unknown-linux-gnu` | 32-bit Linux (kernel 3.2+, glibc 2.17+) [^x86_32-floats-return-ABI]
@@ -86,7 +87,6 @@ so Rustup may install the documentation for a similar tier 1 target instead.
8687

8788
target | notes
8889
-------|-------
89-
[`aarch64-apple-darwin`](platform-support/apple-darwin.md) | ARM64 macOS (11.0+, Big Sur+)
9090
`aarch64-pc-windows-msvc` | ARM64 Windows MSVC
9191
`aarch64-unknown-linux-musl` | ARM64 Linux with musl 1.2.3
9292
`arm-unknown-linux-gnueabi` | Armv6 Linux (kernel 3.2, glibc 2.17)

src/doc/rustc/src/platform-support/apple-darwin.md

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ Apple macOS targets.
55
**Tier: 1**
66

77
- `x86_64-apple-darwin`: macOS on 64-bit x86.
8-
9-
**Tier: 2 (with Host Tools)**
10-
118
- `aarch64-apple-darwin`: macOS on ARM64 (M1-family or later Apple Silicon CPUs).
129

1310
## Target maintainers

src/tools/miri/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ degree documented below):
212212
- All Rust [Tier 1 targets](https://doc.rust-lang.org/rustc/platform-support.html) are supported by
213213
Miri. They are all checked on Miri's CI, and some (at least one per OS) are even checked on every
214214
Rust PR, so the shipped Miri should always work on these targets.
215-
- `aarch64-apple-darwin` is supported.
216215
- `s390x-unknown-linux-gnu` is supported as our "big-endian target of choice".
217216
- For every other target with OS `linux`, `macos`, or `windows`, Miri should generally work, but we
218217
make no promises and we don't run tests for such targets.

src/tools/miri/ci/ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ case $HOST_TARGET in
137137
MANY_SEEDS=16 TEST_TARGET=x86_64-pc-windows-gnu run_tests
138138
;;
139139
aarch64-apple-darwin)
140-
# Host (tier 2)
140+
# Host
141141
GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
142142
# Extra tier 1
143143
MANY_SEEDS=64 TEST_TARGET=i686-pc-windows-gnu run_tests

0 commit comments

Comments
 (0)