Skip to content

Commit 3042032

Browse files
mati865mati865
committed
Revert #143031 and #140772 due to #144533
Revert <#143031> and <#140772> due to the issue with host tools reported in <https://github.com/rust-lang/rust/issue/144533>. This reverts commits 508021a and d577b39. The decision was made in <#144659 (comment)>. Tracking issue: <https://github.com/rust-lang/rust/issue/145435>
1 parent 96ecc90 commit 3042032

File tree

9 files changed

+22
-124
lines changed

9 files changed

+22
-124
lines changed

‎src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile

Lines changed: 0 additions & 48 deletions
This file was deleted.

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

Lines changed: 10 additions & 1 deletion
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

Lines changed: 8 additions & 0 deletions
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/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,6 @@ auto:
260260
- name: dist-s390x-linux
261261
<<: *job-linux-4c
262262

263-
- name: dist-aarch64-windows-gnullvm
264-
<<: *job-linux-4c
265-
266-
- name: dist-x86_64-windows-gnullvm
267-
<<: *job-linux-4c
268-
269263
- name: dist-various-1
270264
<<: *job-linux-4c
271265

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ so Rustup may install the documentation for a similar tier 1 target instead.
8888

8989
target | notes
9090
-------|-------
91-
[`aarch64-pc-windows-gnullvm`](platform-support/windows-gnullvm.md) | ARM64 MinGW (Windows 10+), LLVM ABI
9291
[`aarch64-pc-windows-msvc`](platform-support/windows-msvc.md) | ARM64 Windows MSVC
9392
[`aarch64-unknown-linux-musl`](platform-support/aarch64-unknown-linux-musl.md) | ARM64 Linux with musl 1.2.3
9493
[`aarch64-unknown-linux-ohos`](platform-support/openharmony.md) | ARM64 OpenHarmony
@@ -106,7 +105,6 @@ target | notes
106105
[`riscv64gc-unknown-linux-gnu`](platform-support/riscv64gc-unknown-linux-gnu.md) | RISC-V Linux (kernel 4.20+, glibc 2.29)
107106
[`riscv64gc-unknown-linux-musl`](platform-support/riscv64gc-unknown-linux-musl.md) | RISC-V Linux (kernel 4.20+, musl 1.2.3)
108107
[`s390x-unknown-linux-gnu`](platform-support/s390x-unknown-linux-gnu.md) | S390x Linux (kernel 3.2+, glibc 2.17)
109-
[`x86_64-pc-windows-gnullvm`](platform-support/windows-gnullvm.md) | 64-bit x86 MinGW (Windows 10+), LLVM ABI
110108
[`x86_64-unknown-freebsd`](platform-support/freebsd.md) | 64-bit x86 FreeBSD
111109
[`x86_64-unknown-illumos`](platform-support/illumos.md) | illumos
112110
`x86_64-unknown-linux-musl` | 64-bit Linux with musl 1.2.3
@@ -149,6 +147,7 @@ target | std | notes
149147
[`aarch64-apple-ios-macabi`](platform-support/apple-ios-macabi.md) | ✓ | Mac Catalyst on ARM64
150148
[`aarch64-apple-ios-sim`](platform-support/apple-ios.md) | ✓ | Apple iOS Simulator on ARM64
151149
[`aarch64-linux-android`](platform-support/android.md) | ✓ | ARM64 Android
150+
[`aarch64-pc-windows-gnullvm`](platform-support/windows-gnullvm.md) | ✓ | ARM64 MinGW (Windows 10+), LLVM ABI
152151
[`aarch64-unknown-fuchsia`](platform-support/fuchsia.md) | ✓ | ARM64 Fuchsia
153152
`aarch64-unknown-none` | * | Bare ARM64, hardfloat
154153
`aarch64-unknown-none-softfloat` | * | Bare ARM64, softfloat
@@ -205,6 +204,7 @@ target | std | notes
205204
[`x86_64-apple-ios-macabi`](platform-support/apple-ios-macabi.md) | ✓ | Mac Catalyst on x86_64
206205
[`x86_64-fortanix-unknown-sgx`](platform-support/x86_64-fortanix-unknown-sgx.md) | ✓ | [Fortanix ABI] for 64-bit Intel SGX
207206
[`x86_64-linux-android`](platform-support/android.md) | ✓ | 64-bit x86 Android
207+
[`x86_64-pc-windows-gnullvm`](platform-support/windows-gnullvm.md) | ✓ | 64-bit x86 MinGW (Windows 10+), LLVM ABI
208208
[`x86_64-unknown-fuchsia`](platform-support/fuchsia.md) | ✓ | 64-bit x86 Fuchsia
209209
`x86_64-unknown-linux-gnux32` | ✓ | 64-bit Linux (x32 ABI) (kernel 4.15+, glibc 2.27)
210210
[`x86_64-unknown-none`](platform-support/x86_64-unknown-none.md) | * | Freestanding/bare-metal x86_64, softfloat

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# \*-windows-gnullvm
22

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

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

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ use crate::versions::{PkgType, Versions};
1414

1515
static HOSTS: &[&str] = &[
1616
"aarch64-apple-darwin",
17-
"aarch64-pc-windows-gnullvm",
1817
"aarch64-pc-windows-msvc",
1918
"aarch64-unknown-linux-gnu",
2019
"aarch64-unknown-linux-musl",
@@ -45,7 +44,6 @@ static HOSTS: &[&str] = &[
4544
"x86_64-apple-darwin",
4645
"x86_64-pc-solaris",
4746
"x86_64-pc-windows-gnu",
48-
"x86_64-pc-windows-gnullvm",
4947
"x86_64-pc-windows-msvc",
5048
"x86_64-unknown-freebsd",
5149
"x86_64-unknown-illumos",
@@ -472,7 +470,7 @@ impl Builder {
472470
}
473471
// so is rust-mingw if it's available for the target
474472
PkgType::RustMingw => {
475-
if host.ends_with("pc-windows-gnu") {
473+
if host.contains("pc-windows-gnu") {
476474
components.push(host_component(pkg));
477475
}
478476
}

0 commit comments

Comments
 (0)