Skip to content

Commit 971a146

Browse files
nicholasbishopnicholasbishop
committed
Promote {aarch64,i686,x86_64}-unknown-uefi to Tier 2
MCP: rust-lang/compiler-team#555
1 parent 160b194 commit 971a146

File tree

4 files changed

+17
-33
lines changed

4 files changed

+17
-33
lines changed

‎src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ ENV TARGETS=$TARGETS,armv7-unknown-linux-gnueabi
118118
ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabi
119119
ENV TARGETS=$TARGETS,i686-unknown-freebsd
120120
ENV TARGETS=$TARGETS,x86_64-unknown-none
121+
ENV TARGETS=$TARGETS,aarch64-unknown-uefi
122+
ENV TARGETS=$TARGETS,i686-unknown-uefi
123+
ENV TARGETS=$TARGETS,x86_64-unknown-uefi
121124

122125
# As per https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1300211
123126
# we need asm in the search path for gcc-8 (for gnux32) but not in the search path of the

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ target | std | notes
128128
[`aarch64-linux-android`](platform-support/android.md) | ✓ | ARM64 Android
129129
`aarch64-unknown-none-softfloat` | * | Bare ARM64, softfloat
130130
`aarch64-unknown-none` | * | Bare ARM64, hardfloat
131+
[`aarch64-unknown-uefi`](platform-support/unknown-uefi.md) | * | ARM64 UEFI
131132
[`arm-linux-androideabi`](platform-support/android.md) | ✓ | ARMv7 Android
132133
`arm-unknown-linux-musleabi` | ✓ | ARMv6 Linux with MUSL
133134
`arm-unknown-linux-musleabihf` | ✓ | ARMv6 Linux with MUSL, hardfloat
@@ -149,6 +150,7 @@ target | std | notes
149150
[`i686-linux-android`](platform-support/android.md) | ✓ | 32-bit x86 Android
150151
`i686-unknown-freebsd` | ✓ | 32-bit FreeBSD
151152
`i686-unknown-linux-musl` | ✓ | 32-bit Linux with MUSL
153+
[`i686-unknown-uefi`](platform-support/unknown-uefi.md) | * | 32-bit UEFI
152154
`mips-unknown-linux-musl` | ✓ | MIPS Linux with MUSL
153155
`mips64-unknown-linux-muslabi64` | ✓ | MIPS64 Linux, n64 ABI, MUSL
154156
`mips64el-unknown-linux-muslabi64` | ✓ | MIPS64 (LE) Linux, n64 ABI, MUSL
@@ -181,6 +183,7 @@ target | std | notes
181183
`x86_64-unknown-linux-gnux32` | ✓ | 64-bit Linux (x32 ABI) (kernel 4.15, glibc 2.27)
182184
[`x86_64-unknown-none`](platform-support/x86_64-unknown-none.md) | * | Freestanding/bare-metal x86_64, softfloat
183185
`x86_64-unknown-redox` | ✓ | Redox OS
186+
[`x86_64-unknown-uefi`](platform-support/unknown-uefi.md) | * | 64-bit UEFI
184187

185188
[Fortanix ABI]: https://edp.fortanix.com/
186189

@@ -213,7 +216,6 @@ target | std | host | notes
213216
[`aarch64-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | ✓ |
214217
`aarch64-unknown-freebsd` | ✓ | ✓ | ARM64 FreeBSD
215218
`aarch64-unknown-hermit` | ✓ | | ARM64 HermitCore
216-
[`aarch64-unknown-uefi`](platform-support/unknown-uefi.md) | * | | ARM64 UEFI
217219
`aarch64-unknown-linux-gnu_ilp32` | ✓ | ✓ | ARM64 Linux (ILP32 ABI)
218220
`aarch64-unknown-netbsd` | ✓ | ✓ |
219221
[`aarch64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | ARM64 OpenBSD
@@ -252,7 +254,6 @@ target | std | host | notes
252254
`i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku
253255
`i686-unknown-netbsd` | ✓ | ✓ | NetBSD/i386 with SSE2
254256
[`i686-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 32-bit OpenBSD
255-
[`i686-unknown-uefi`](platform-support/unknown-uefi.md) | * | | 32-bit UEFI
256257
`i686-uwp-windows-gnu` | ? | |
257258
`i686-uwp-windows-msvc` | ? | |
258259
`i686-wrs-vxworks` | ? | |
@@ -311,7 +312,6 @@ target | std | host | notes
311312
`x86_64-unknown-l4re-uclibc` | ? | |
312313
`x86_64-unknown-none-linuxkernel` | * | | Linux kernel modules
313314
[`x86_64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 64-bit OpenBSD
314-
[`x86_64-unknown-uefi`](platform-support/unknown-uefi.md) | * | | 64-bit UEFI
315315
`x86_64-uwp-windows-gnu` | ✓ | |
316316
`x86_64-uwp-windows-msvc` | ✓ | |
317317
`x86_64-wrs-vxworks` | ? | |

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

+8-30
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# `*-unknown-uefi`
22

3-
**Tier: 3**
3+
**Tier: 2**
44

55
Unified Extensible Firmware Interface (UEFI) targets for application, driver,
66
and core UEFI binaries.
@@ -72,28 +72,14 @@ target = ["x86_64-unknown-uefi"]
7272

7373
## Building Rust programs
7474

75-
Rust does not yet ship pre-compiled artifacts for this target. To compile for
76-
this target, you will either need to build Rust with the target enabled (see
77-
"Building rust for UEFI targets" above), or build your own copy of `core` by
78-
using `build-std`, `cargo-buildx`, or similar.
79-
80-
A native build with the unstable `build-std`-feature can be achieved via:
81-
82-
```sh
83-
cargo +nightly build \
84-
-Zbuild-std=core,compiler_builtins \
85-
-Zbuild-std-features=compiler-builtins-mem \
86-
--target x86_64-unknown-uefi
87-
```
88-
89-
Alternatively, you can install `cargo-xbuild` via
90-
`cargo install --force cargo-xbuild` and build for the UEFI targets via:
75+
Starting with Rust 1.67, precompiled artifacts are provided via
76+
`rustup`. For example, to use `x86_64-unknown-uefi`:
9177

9278
```sh
93-
cargo \
94-
+nightly \
95-
xbuild \
96-
--target x86_64-unknown-uefi
79+
# install cross-compile toolchain
80+
rustup target add x86_64-unknown-uefi
81+
# target flag may be used with any cargo or rustc command
82+
cargo build --target x86_64-unknown-uefi
9783
```
9884

9985
## Testing
@@ -167,18 +153,10 @@ The following code is a valid UEFI application returning immediately upon
167153
execution with an exit code of 0. A panic handler is provided. This is executed
168154
by rust on panic. For simplicity, we simply end up in an infinite loop.
169155

170-
Note that as of rust-1.31.0, all features used here are stabilized. No unstable
171-
features are required, nor do we rely on nightly compilers. However, if you do
172-
not compile rustc for the UEFI targets, you need a nightly compiler to support
173-
the `-Z build-std` flag.
174-
175156
This example can be compiled as binary crate via `cargo`:
176157

177158
```sh
178-
cargo +nightly build \
179-
-Zbuild-std=core,compiler_builtins \
180-
-Zbuild-std-features=compiler-builtins-mem \
181-
--target x86_64-unknown-uefi
159+
cargo build --target x86_64-unknown-uefi
182160
```
183161

184162
```rust,ignore (platform-specific,eh-personality-is-unstable)

‎src/tools/build-manifest/src/main.rs

+3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ static TARGETS: &[&str] = &[
6464
"aarch64-unknown-none",
6565
"aarch64-unknown-none-softfloat",
6666
"aarch64-unknown-redox",
67+
"aarch64-unknown-uefi",
6768
"arm-linux-androideabi",
6869
"arm-unknown-linux-gnueabi",
6970
"arm-unknown-linux-gnueabihf",
@@ -99,6 +100,7 @@ static TARGETS: &[&str] = &[
99100
"i686-unknown-freebsd",
100101
"i686-unknown-linux-gnu",
101102
"i686-unknown-linux-musl",
103+
"i686-unknown-uefi",
102104
"m68k-unknown-linux-gnu",
103105
"mips-unknown-linux-gnu",
104106
"mips-unknown-linux-musl",
@@ -155,6 +157,7 @@ static TARGETS: &[&str] = &[
155157
"x86_64-unknown-none",
156158
"x86_64-unknown-redox",
157159
"x86_64-unknown-hermit",
160+
"x86_64-unknown-uefi",
158161
];
159162

160163
/// This allows the manifest to contain rust-docs for hosts that don't build

0 commit comments

Comments
 (0)