Revert #143031 and #140772 due to #144533

Revert <https://github.com/rust-lang/rust/pull/143031> and
<https://github.com/rust-lang/rust/pull/140772> due to the issue with host
tools reported in <https://github.com/rust-lang/rust/issue/144533>.

This reverts commits 508021aa4320f1feb4c7a783ee16c2feebc9249a and
d577b39c5a39796e911f885c9a354074b52c25ab.

The decision was made in
<https://github.com/rust-lang/rust/pull/144659#issuecomment-3182163412>.
Tracking issue: <https://github.com/rust-lang/rust/issue/145435>

6 files changed, 18 insertions, 118 deletions

diff --git a/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile b/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile
deleted file mode 100644
index cdbc1cda025..00000000000
--- a/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM ubuntu:24.04
-
-WORKDIR /build
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    curl \
-    g++ \
-    git \
-    make \
-    ninja-build \
-    python3 \
-    xz-utils
-
-ENV ARCH=aarch64
-COPY host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh /build
-RUN ./install-llvm-mingw.sh
-
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
-
-ENV CC_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang \
-    CXX_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang++
-
-ENV HOST=aarch64-pc-windows-gnullvm
-
-# We are bootstrapping this target and cannot use previously built artifacts.
-# Without this option Clang is given `"-I/checkout/obj/build/aarch64-pc-windows-gnullvm/ci-llvm/include"`
-# despite no such directory existing:
-# $ ls obj/dist-windows-gnullvm/build/aarch64-pc-windows-gnullvm/ -1
-# llvm
-# stage2
-ENV NO_DOWNLOAD_CI_LLVM 1
-
-ENV RUST_CONFIGURE_ARGS \
-    --enable-extended \
-    --enable-profiler \
-    --enable-sanitizers \
-    --disable-docs \
-    --set llvm.download-ci-llvm=false \
-    --set rust.llvm-tools=false
-# LLVM cross tools are not installed into expected location so copying fails.
-# Probably will solve itself once this target can host itself on Windows.
-# --enable-full-tools \
-
-ENV SCRIPT python3 ../x.py dist --host $HOST --target $HOST
diff --git a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
index 5c459e5cd18..00552db4b01 100644
--- a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
@@ -55,6 +55,9 @@ RUN ./install-riscv64-none-elf.sh
 COPY host-x86_64/dist-various-1/install-riscv32-none-elf.sh /build
 RUN ./install-riscv32-none-elf.sh
 
+COPY host-x86_64/dist-various-1/install-llvm-mingw.sh /build
+RUN ./install-llvm-mingw.sh
+
 # Suppress some warnings in the openwrt toolchains we downloaded
 ENV STAGING_DIR=/tmp
 
@@ -111,6 +114,9 @@ ENV TARGETS=$TARGETS,armv7r-none-eabi
 ENV TARGETS=$TARGETS,armv7r-none-eabihf
 ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
 ENV TARGETS=$TARGETS,armv7a-none-eabi
+ENV TARGETS=$TARGETS,aarch64-pc-windows-gnullvm
+ENV TARGETS=$TARGETS,i686-pc-windows-gnullvm
+ENV TARGETS=$TARGETS,x86_64-pc-windows-gnullvm
 
 ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \
     CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \
@@ -142,7 +148,10 @@ ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft
     CC_riscv64imac_unknown_none_elf=riscv64-unknown-elf-gcc \
     CFLAGS_riscv64imac_unknown_none_elf=-march=rv64imac -mabi=lp64 \
     CC_riscv64gc_unknown_none_elf=riscv64-unknown-elf-gcc \
-    CFLAGS_riscv64gc_unknown_none_elf=-march=rv64gc -mabi=lp64
+    CFLAGS_riscv64gc_unknown_none_elf=-march=rv64gc -mabi=lp64 \
+    CC_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang \
+    CC_i686_pc_windows_gnullvm=i686-w64-mingw32-clang \
+    CC_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang
 
 ENV RUST_CONFIGURE_ARGS \
       --musl-root-armv5te=/musl-armv5te \
diff --git a/src/ci/docker/host-x86_64/dist-various-1/install-llvm-mingw.sh b/src/ci/docker/host-x86_64/dist-various-1/install-llvm-mingw.sh
new file mode 100755
index 00000000000..95471895fe7
--- /dev/null
+++ b/src/ci/docker/host-x86_64/dist-various-1/install-llvm-mingw.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -ex
+
+release_date=20240404
+archive=llvm-mingw-${release_date}-ucrt-ubuntu-20.04-x86_64.tar.xz
+curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}/${archive} | \
+tar --extract --lzma --strip 1 --directory /usr/local
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile
deleted file mode 100644
index 1ee3951beb5..00000000000
--- a/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM ubuntu:24.04
-
-WORKDIR /build
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    curl \
-    g++ \
-    git \
-    make \
-    ninja-build \
-    python3 \
-    xz-utils
-
-ENV ARCH='i686 x86_64'
-COPY host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh /build
-RUN ./install-llvm-mingw.sh
-
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
-
-ENV CC_i686_pc_windows_gnullvm=i686-w64-mingw32-clang \
-    CC_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang \
-    CXX_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang++
-
-ENV HOST=x86_64-pc-windows-gnullvm
-ENV TARGETS=i686-pc-windows-gnullvm,x86_64-pc-windows-gnullvm
-
-# We are bootstrapping this target and cannot use previously built artifacts.
-# Without this option Clang is given `"-I/checkout/obj/build/aarch64-pc-windows-gnullvm/ci-llvm/include"`
-# despite no such directory existing:
-# $ ls obj/dist-windows-gnullvm/build/aarch64-pc-windows-gnullvm/ -1
-# llvm
-# stage2
-ENV NO_DOWNLOAD_CI_LLVM 1
-
-ENV RUST_CONFIGURE_ARGS \
-    --enable-extended \
-    --enable-profiler \
-    --enable-sanitizers \
-    --disable-docs \
-    --set llvm.download-ci-llvm=false \
-    --set rust.llvm-tools=false
-# LLVM cross tools are not installed into expected location so copying fails.
-# Probably will solve itself once these targets can host themselves on Windows.
-# --enable-full-tools \
-
-ENV SCRIPT python3 ../x.py dist --host $HOST --target $TARGETS
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh b/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh
deleted file mode 100755
index 0ea5dae3ffb..00000000000
--- a/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-release_date=20250613
-archive=llvm-mingw-${release_date}-ucrt-ubuntu-22.04-x86_64.tar.xz
-curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}/${archive} | \
-tar --extract --xz --strip 1 --directory /usr/local
-
-# https://github.com/mstorsjo/llvm-mingw/issues/493
-for arch in $ARCH; do
-    ln -s $arch-w64-windows-gnu.cfg /usr/local/bin/$arch-pc-windows-gnu.cfg
-done
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 48c570bfa11..8dbc89999ce 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -260,12 +260,6 @@ auto:
   - name: dist-s390x-linux
     <<: *job-linux-4c
 
-  - name: dist-aarch64-windows-gnullvm
-    <<: *job-linux-4c
-
-  - name: dist-x86_64-windows-gnullvm
-    <<: *job-linux-4c
-
   - name: dist-various-1
     <<: *job-linux-4c