Skip to content

Commit 8cf135e

Browse files
borsbors
committed
Auto merge of #121712 - mati865:provide-prebuilt-std-for-gnullvm, r=Mark-Simulacrum
Provide prebuilt std for gnullvm targets Revival of #114346 which waiting on MCP that was accepted recently: rust-lang/compiler-team#710 (comment)
2 parents c3ceb00 + cd4c0da commit 8cf135e

File tree

4 files changed

+46
-15
lines changed

4 files changed

+46
-15
lines changed

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

+10-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ RUN ./install-riscv64-none-elf.sh
5555
COPY host-x86_64/dist-various-1/install-riscv32-none-elf.sh /build
5656
RUN ./install-riscv32-none-elf.sh
5757

58+
COPY host-x86_64/dist-various-1/install-llvm-mingw.sh /build
59+
RUN ./install-llvm-mingw.sh
60+
5861
# Suppress some warnings in the openwrt toolchains we downloaded
5962
ENV STAGING_DIR=/tmp
6063

@@ -111,6 +114,9 @@ ENV TARGETS=$TARGETS,armv7r-none-eabi
111114
ENV TARGETS=$TARGETS,armv7r-none-eabihf
112115
ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
113116
ENV TARGETS=$TARGETS,armv7a-none-eabi
117+
ENV TARGETS=$TARGETS,aarch64-pc-windows-gnullvm
118+
ENV TARGETS=$TARGETS,i686-pc-windows-gnullvm
119+
ENV TARGETS=$TARGETS,x86_64-pc-windows-gnullvm
114120

115121
ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \
116122
CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \
@@ -142,7 +148,10 @@ ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft
142148
CC_riscv64imac_unknown_none_elf=riscv64-unknown-elf-gcc \
143149
CFLAGS_riscv64imac_unknown_none_elf=-march=rv64imac -mabi=lp64 \
144150
CC_riscv64gc_unknown_none_elf=riscv64-unknown-elf-gcc \
145-
CFLAGS_riscv64gc_unknown_none_elf=-march=rv64gc -mabi=lp64
151+
CFLAGS_riscv64gc_unknown_none_elf=-march=rv64gc -mabi=lp64 \
152+
CC_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang \
153+
CC_i686_pc_windows_gnullvm=i686-w64-mingw32-clang \
154+
CC_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang
146155

147156
ENV RUST_CONFIGURE_ARGS \
148157
--musl-root-armv5te=/musl-armv5te \

‎src/ci/docker/host-x86_64/dist-various-1/install-llvm-mingw.sh

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
release_date=20240404
6+
archive=llvm-mingw-${release_date}-ucrt-ubuntu-20.04-x86_64.tar.xz
7+
curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}/${archive} | \
8+
tar --extract --lzma --strip 1 --directory /usr/local

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ target | std | notes
138138
`aarch64-fuchsia` | ✓ | Alias for `aarch64-unknown-fuchsia`
139139
[`aarch64-unknown-fuchsia`](platform-support/fuchsia.md) | ✓ | ARM64 Fuchsia
140140
[`aarch64-linux-android`](platform-support/android.md) | ✓ | ARM64 Android
141+
[`aarch64-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | ARM64 MinGW (Windows 10+), LLVM ABI
141142
[`aarch64-unknown-linux-ohos`](platform-support/openharmony.md) | ✓ | ARM64 OpenHarmony
142143
`aarch64-unknown-none-softfloat` | * | Bare ARM64, softfloat
143144
`aarch64-unknown-none` | * | Bare ARM64, hardfloat
@@ -161,6 +162,7 @@ target | std | notes
161162
`i586-unknown-linux-gnu` | ✓ | 32-bit Linux w/o SSE (kernel 3.2, glibc 2.17) [^x86_32-floats-x87]
162163
`i586-unknown-linux-musl` | ✓ | 32-bit Linux w/o SSE, musl 1.2.3 [^x86_32-floats-x87]
163164
[`i686-linux-android`](platform-support/android.md) | ✓ | 32-bit x86 Android [^x86_32-floats-return-ABI]
165+
[`i686-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | 32-bit x86 MinGW (Windows 10+), LLVM ABI [^x86_32-floats-return-ABI]
164166
`i686-unknown-freebsd` | ✓ | 32-bit FreeBSD [^x86_32-floats-return-ABI]
165167
`i686-unknown-linux-musl` | ✓ | 32-bit Linux with musl 1.2.3 [^x86_32-floats-return-ABI]
166168
[`i686-unknown-uefi`](platform-support/unknown-uefi.md) | ? | 32-bit UEFI
@@ -196,6 +198,7 @@ target | std | notes
196198
[`x86_64-unknown-fuchsia`](platform-support/fuchsia.md) | ✓ | 64-bit x86 Fuchsia
197199
[`x86_64-linux-android`](platform-support/android.md) | ✓ | 64-bit x86 Android
198200
`x86_64-pc-solaris` | ✓ | 64-bit Solaris 11, illumos
201+
[`x86_64-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | 64-bit x86 MinGW (Windows 10+), LLVM ABI
199202
`x86_64-unknown-linux-gnux32` | ✓ | 64-bit Linux (x32 ABI) (kernel 4.15, glibc 2.27)
200203
[`x86_64-unknown-linux-ohos`](platform-support/openharmony.md) | ✓ | x86_64 OpenHarmony
201204
[`x86_64-unknown-none`](platform-support/x86_64-unknown-none.md) | * | Freestanding/bare-metal x86_64, softfloat
@@ -247,7 +250,6 @@ target | std | host | notes
247250
[`aarch64-apple-visionos-sim`](platform-support/apple-visionos.md) | ✓ | | ARM64 Apple visionOS Simulator
248251
[`aarch64-kmc-solid_asp3`](platform-support/kmc-solid.md) | ✓ | | ARM64 SOLID with TOPPERS/ASP3
249252
[`aarch64-nintendo-switch-freestanding`](platform-support/aarch64-nintendo-switch-freestanding.md) | * | | ARM64 Nintendo Switch, Horizon
250-
[`aarch64-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | ✓ |
251253
[`aarch64-unknown-teeos`](platform-support/aarch64-unknown-teeos.md) | ? | | ARM64 TEEOS |
252254
[`aarch64-unknown-nto-qnx710`](platform-support/nto-qnx.md) | ✓ | | ARM64 QNX Neutrino 7.1 RTOS |
253255
`aarch64-unknown-freebsd` | ✓ | ✓ | ARM64 FreeBSD
@@ -294,7 +296,6 @@ target | std | host | notes
294296
[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS [^x86_32-floats-return-ABI]
295297
[`i586-unknown-netbsd`](platform-support/netbsd.md) | ✓ | | 32-bit x86, restricted to Pentium
296298
`i686-apple-darwin` | ✓ | ✓ | 32-bit macOS (10.12+, Sierra+) [^x86_32-floats-return-ABI]
297-
[`i686-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | ✓ | [^x86_32-floats-return-ABI]
298299
`i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku [^x86_32-floats-return-ABI]
299300
[`i686-unknown-hurd-gnu`](platform-support/hurd.md) | ✓ | ✓ | 32-bit GNU/Hurd [^x86_32-floats-return-ABI]
300301
[`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 with SSE2 [^x86_32-floats-return-ABI]
@@ -370,7 +371,6 @@ target | std | host | notes
370371
[`x86_64-apple-tvos`](platform-support/apple-tvos.md) | ? | | x86 64-bit tvOS
371372
[`x86_64-apple-watchos-sim`](platform-support/apple-watchos.md) | ✓ | | x86 64-bit Apple WatchOS simulator
372373
[`x86_64-pc-nto-qnx710`](platform-support/nto-qnx.md) | ✓ | | x86 64-bit QNX Neutrino 7.1 RTOS |
373-
[`x86_64-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | ✓ |
374374
[`x86_64-unikraft-linux-musl`](platform-support/unikraft-linux-musl.md) | ✓ | | 64-bit Unikraft with musl 1.2.3
375375
`x86_64-unknown-dragonfly` | ✓ | ✓ | 64-bit DragonFlyBSD
376376
`x86_64-unknown-haiku` | ✓ | ✓ | 64-bit Haiku

‎src/doc/rustc/src/platform-support/pc-windows-gnullvm.md

+25-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# \*-pc-windows-gnullvm
22

3-
**Tier: 3**
3+
**Tier: 2 (without host tools)**
44

55
Windows targets similar to `*-pc-windows-gnu` but using UCRT as the runtime and various LLVM tools/libraries instead of GCC/Binutils.
66

@@ -12,38 +12,52 @@ Target triples available so far:
1212
## Target maintainers
1313

1414
- [@mati865](https://github.com/mati865)
15+
- [@thomcc](https://github.com/thomcc)
1516

1617
## Requirements
1718

18-
The easiest way to obtain these targets is cross-compilation but native build from `x86_64-pc-windows-gnu` is possible with few hacks which I don't recommend.
19+
The easiest way to obtain these targets is cross-compilation, but native build from `x86_64-pc-windows-gnu` is possible with few hacks which I don't recommend.
1920
Std support is expected to be on pair with `*-pc-windows-gnu`.
2021

2122
Binaries for this target should be at least on pair with `*-pc-windows-gnu` in terms of requirements and functionality.
2223

2324
Those targets follow Windows calling convention for `extern "C"`.
2425

25-
Like with any other Windows target created binaries are in PE format.
26+
Like with any other Windows target, created binaries are in PE format.
2627

2728
## Building the target
2829

29-
For cross-compilation I recommend using [llvm-mingw](https://github.com/mstorsjo/llvm-mingw) toolchain, one change that seems necessary beside configuring cross compilers is disabling experimental `m86k` target. Otherwise LLVM build fails with `multiple definition ...` errors.
30-
Native bootstrapping builds require rather fragile hacks until host artifacts are available so I won't describe them here.
30+
These targets can be easily cross-compiled
31+
using [llvm-mingw](https://github.com/mstorsjo/llvm-mingw) toolchain or [MSYS2 CLANG*](https://www.msys2.org/docs/environments/) environments.
32+
Just fill `[target.*]` sections for both build and resulting compiler and set installation prefix in `config.toml`.
33+
Then run `./x.py install`.
34+
In my case I had ran `./x.py install --host x86_64-pc-windows-gnullvm --target x86_64-pc-windows-gnullvm` inside MSYS2 MINGW64 shell
35+
so `x86_64-pc-windows-gnu` was my build toolchain.
36+
37+
Native bootstrapping is doable in two ways:
38+
- cross-compile gnullvm host toolchain and use it as build toolchain for the next build,
39+
- copy libunwind libraries and rename them to mimic libgcc like here: https://github.com/msys2/MINGW-packages/blob/68e640756df2df6df6afa60f025e3f936e7b977c/mingw-w64-rust/PKGBUILD#L108-L109, stage0 compiler will be mostly broken but good enough to build the next stage.
40+
41+
The second option might stop working anytime, so it's not recommended.
3142

3243
## Building Rust programs
3344

34-
Rust does not yet ship pre-compiled artifacts for this target. To compile for
35-
this target, you will either need to build Rust with the target enabled (see
36-
"Building the target" above), or build your own copy of `core` by using
37-
`build-std` or similar.
45+
Rust does ship a pre-compiled std library for those targets.
46+
That means one can easily cross-compile for those targets from other hosts if C proper toolchain is installed.
47+
48+
Alternatively full toolchain can be built as described in the previous section.
3849

3950
## Testing
4051

4152
Created binaries work fine on Windows or Wine using native hardware. Testing AArch64 on x86_64 is problematic though and requires spending some time with QEMU.
42-
Once these targets bootstrap themselves on native hardware they should pass Rust testsuite.
53+
Most of x86_64 testsuite does pass when cross-compiling,
54+
with exception for `rustdoc` and `ui-fulldeps` that fail with and error regarding a missing library,
55+
they do pass in native builds though.
56+
The only failing test is std's `process::tests::test_proc_thread_attributes` for unknown reason.
4357

4458
## Cross-compilation toolchains and C code
4559

46-
Compatible C code can be built with Clang's `aarch64-pc-windows-gnu`, `i686-pc-windows-gnullvm` and `x86_64-pc-windows-gnu` targets as long as LLVM based C toolchains are used.
60+
Compatible C code can be built with Clang's `aarch64-pc-windows-gnu`, `i686-pc-windows-gnullvm` and `x86_64-pc-windows-gnu` targets as long as LLVM-based C toolchains are used.
4761
Those include:
4862
- [llvm-mingw](https://github.com/mstorsjo/llvm-mingw)
4963
- [MSYS2 with CLANG* environment](https://www.msys2.org/docs/environments)

0 commit comments

Comments
 (0)