Support windows-gnullvm

Author: taiki-e

.github/.cspell/organization-dictionary.txt

@@ -24,7 +24,6 @@ rustsec
 rustup
 valgrind
 xcompile
-Zdoctest
 Zmiri
 
 // Rust target triple
@@ -152,12 +151,14 @@ endianness
 esac
 euxo
 gsub
+libc
 moreutils
 msys
 noninteractive
 noprofile
 norc
 nproc
+objcopy
 objdump
 pipefail
 powerset

.github/.cspell/project-dictionary.txt

@@ -17,7 +17,6 @@ crtn
 CURDIR
 CXXSTDLIB
 debuginfo
-devel
 dilos
 distro
 earmv
@@ -45,7 +44,6 @@ ldso
 lgcc
 libada
 libbacktrace
-libc
 libcilkrts
 libexec
 libgcc
@@ -70,6 +68,7 @@ libstdc
 libunwind
 libvtv
 libx
+linaro
 lintian
 Loongson
 lstdc
@@ -106,7 +105,6 @@ nofp
 nosimd
 nostartfiles
 nostdinc
-objcopy
 octeon
 opensbi
 PCREL
@@ -139,8 +137,8 @@ virt
 wasmtime
 wchar
 WINEBOOT
-winehq
 WINEPATH
 WINEPREFIX
+wineserver
 Znwm
 zynq

.github/workflows/base.yml

@@ -69,7 +69,7 @@ jobs:
           # illumos
           - target: x86_64-unknown-illumos
 
-          # Windows (GNU)
+          # Windows (MinGW)
           # - target: i686-pc-windows-gnu # TODO
           - target: x86_64-pc-windows-gnu
           - target: x86_64-pc-windows-gnu

README.md

@@ -18,7 +18,8 @@ See also [setup-cross-toolchain-action](https://github.com/taiki-e/setup-cross-t
   - [Redox](#redox)
   - [WASI](#wasi)
   - [Emscripten](#emscripten)
-  - [Windows (GNU)](#windows-gnu)
+  - [Windows (MinGW)](#windows-mingw)
+  - [Windows (LLVM MinGW)](#windows-llvm-mingw)
   - [No-std](#no-std)
 
 ## Platform Support
@@ -300,7 +301,7 @@ clang version and wasi-libc hash can be found here: https://github.com/WebAssemb
 - `asmjs-unknown-emscripten`
 - `wasm32-unknown-emscripten`
 
-### Windows (GNU)
+### Windows (MinGW)
 
 | libc | GCC | clang | C++ | test | host |
 | ---- | --- | ----- | --- | ---- | ---- |
@@ -322,6 +323,24 @@ GCC version: https://packages.ubuntu.com/en/focal/gcc-mingw-w64-base
 | `x86_64-pc-windows-gnu` | x86_64/aarch64 linux (glibc 2.31+) |
 | `i686-pc-windows-gnu` | x86_64 linux (glibc 2.31+) |
 
+### Windows (LLVM MinGW)
+
+| libc | GCC | clang | C++ | test | host |
+| ---- | --- | ----- | --- | ---- | ---- |
+| Mingw-w64 b190082 | N/A | 16.0.6 | ✓ (libc++) | ✓ (wine) | x86_64/aarch64 linux (glibc 2.31+) |
+
+<!--
+Mingw-w64 version: https://github.com/mstorsjo/llvm-mingw/blob/20230614/build-mingw-w64.sh#L21
+Clang version: https://github.com/mstorsjo/llvm-mingw/releases/tag/20230614
+-->
+
+([Dockerfile](docker/windows-gnu.Dockerfile))
+
+**Supported targets**:
+
+- `aarch64-pc-windows-gnullvm`
+- `x86_64-pc-windows-gnullvm`
+
 ### No-std
 
 | libc | GCC | clang | C++ | run | host |

docker/android.Dockerfile

@@ -110,7 +110,7 @@ rm -rf "${arch}"
 EOF
 ENV ANDROID_DNS_MODE=local
 ENV ANDROID_ROOT=/system
-ENV TMPDIR=/tmp/
+ENV TMPDIR=/tmp
 COPY /test-base /test-base
 RUN /test-base/target.sh
 COPY /test /test

docker/test/entrypoint.sh

@@ -582,13 +582,36 @@ EOF
         ;;
     *-windows-gnu*)
         runner="${RUST_TARGET}-runner"
-        gcc_lib="$(basename "$(ls -d "${toolchain_dir}/lib/gcc/${RUST_TARGET}"/*posix)")"
+        case "${RUST_TARGET}" in
+            *-gnullvm*) winepath="\${toolchain_dir}/${RUST_TARGET}/bin" ;;
+            *)
+                gcc_lib="$(basename "$(ls -d "${toolchain_dir}/lib/gcc/${RUST_TARGET}"/*posix)")"
+                winepath="\${toolchain_dir}/lib/gcc/${RUST_TARGET}/${gcc_lib};\${toolchain_dir}/${RUST_TARGET}/lib"
+                ;;
+        esac
+        case "${RUST_TARGET}" in
+            aarch64*)
+                # Refs: https://gitlab.com/Linaro/windowsonarm/woa-linux/-/blob/master/containers/unified.Dockerfile
+                wine_root=/opt/wine-arm64
+                wine_exe="${wine_root}"/bin/wine
+                qemu_arch=aarch64
+                for bin in wine wineserver wine-preloader; do
+                    sed -i "s/qemu-${qemu_arch}-static/qemu-${qemu_arch}/g" "${wine_root}/bin/${bin}"
+                done
+                cp "${wine_root}"/lib/ld-linux-aarch64.so.1 /lib/
+                wineprefix="export WINEPREFIX=\${WINEPREFIX:-${wine_root}/wine-prefix}"
+                [[ -f "${toolchain_dir}/bin/qemu-${qemu_arch}" ]] || cp "$(type -P "qemu-${qemu_arch}")" "${toolchain_dir}/bin"
+                "qemu-${qemu_arch}" --version
+                ;;
+            *) wine_exe=wine ;;
+        esac
         cat >"${toolchain_dir}/bin/${runner}" <<EOF
 #!/bin/sh
 set -eu
 toolchain_dir="\$(cd "\$(dirname "\$0")"/.. && pwd)"
-export WINEPATH="\${toolchain_dir}/lib/gcc/${RUST_TARGET}/${gcc_lib};\${toolchain_dir}/${RUST_TARGET}/lib;\${WINEPATH:-}"
-exec wine "\$@"
+export WINEPATH="${winepath};\${WINEPATH:-}"
+${wineprefix:-}
+exec ${wine_exe} "\$@"
 EOF
         chmod +x "${toolchain_dir}/bin/${runner}"
         cat "${toolchain_dir}/bin/${runner}"

docker/test/test.sh

@@ -307,16 +307,29 @@ if [[ -z "${no_std}" ]]; then
             amd64)
                 case "${RUST_TARGET}" in
                     *-windows-gnu*)
-                        # Adapted from https://github.com/cross-rs/cross/blob/16a64e7028d90a3fdf285cfd642cdde9443c0645/docker/windows-entry.sh
-                        export HOME=/tmp/home
-                        mkdir -p "${HOME}"
-                        # Initialize the wine prefix (virtual windows installation)
-                        export WINEPREFIX=/tmp/wine
-                        mkdir -p "${WINEPREFIX}"
-                        if [[ ! -e /WINEBOOT ]]; then
-                            x wineboot &>/dev/null
-                            touch /WINEBOOT
-                        fi
+                        case "${RUST_TARGET}" in
+                            aarch64*)
+                                wine_root=/opt/wine-arm64
+                                export HOME=/tmp/home
+                                mkdir -p "${HOME}/.wine"
+                                if [[ ! -e /WINEBOOT ]]; then
+                                    x "${wine_root}/bin/wineserver" &>/dev/null
+                                    touch /WINEBOOT
+                                fi
+                                ;;
+                            *)
+                                # Adapted from https://github.com/cross-rs/cross/blob/16a64e7028d90a3fdf285cfd642cdde9443c0645/docker/windows-entry.sh
+                                export HOME=/tmp/home
+                                mkdir -p "${HOME}"
+                                # Initialize the wine prefix (virtual windows installation)
+                                export WINEPREFIX=/tmp/wine
+                                mkdir -p "${WINEPREFIX}"
+                                if [[ ! -e /WINEBOOT ]]; then
+                                    x wineboot &>/dev/null
+                                    touch /WINEBOOT
+                                fi
+                                ;;
+                        esac
                         ;;
                 esac
                 ;;
@@ -1081,13 +1094,15 @@ case "${RUST_TARGET}" in
         for bin in "${out_dir}"/*; do
             if [[ -x "${bin}" ]]; then
                 case "${RUST_TARGET}" in
+                    aarch64-*) assert_file_info 'PE32\+ executable \(console\) Aarch64, for MS Windows' "${bin}" ;;
                     i686-*) assert_file_info 'PE32 executable \(console\) Intel 80386' "${bin}" ;;
                     x86_64*) assert_file_info 'PE32\+ executable \(console\) x86-64' "${bin}" ;;
                     *) bail "unrecognized target '${RUST_TARGET}'" ;;
                 esac
                 assert_file_info 'for MS Windows' "${bin}"
             else
                 case "${RUST_TARGET}" in
+                    aarch64-*) assert_file_info 'data' "${bin}" ;; # TODO: ?
                     i686-*) assert_file_info 'Intel 80386 COFF object file' "${bin}" ;;
                     x86_64*) assert_file_info 'Intel amd64 COFF object file' "${bin}" ;;
                     *) bail "unrecognized target '${RUST_TARGET}'" ;;

docker/windows-gnu.Dockerfile

@@ -10,7 +10,6 @@ FROM ghcr.io/taiki-e/rust-cross-toolchain:"${RUST_TARGET}-base${TOOLCHAIN_TAG:+"
 FROM ghcr.io/taiki-e/build-base:ubuntu-"${UBUNTU_VERSION}" as builder
 SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
 ARG DEBIAN_FRONTEND=noninteractive
-ARG UBUNTU_VERSION
 ARG RUST_TARGET
 ARG TOOLCHAIN_DIR="/${RUST_TARGET}"
 ARG SYSROOT_DIR="${TOOLCHAIN_DIR}/${RUST_TARGET}"
@@ -48,27 +47,20 @@ RUN <<EOF
 dpkg_arch="$(dpkg --print-architecture)"
 case "${dpkg_arch##*-}" in
     amd64) dpkg --add-architecture i386 ;;
-    arm64) dpkg --add-architecture armhf ;;
+    arm64)
+        dpkg --add-architecture armhf
+        # TODO: do not skip if actual host is arm64
+        exit 0
+        ;;
     *) echo >&2 "unsupported architecture '${dpkg_arch}'" && exit 1 ;;
 esac
-EOF
-RUN apt-get -o Acquire::Retries=10 update -qq && apt-get -o Acquire::Retries=10 -o Dpkg::Use-Pty=0 install -y --no-install-recommends \
+# See https://wiki.winehq.org/Ubuntu when install the latest wine.
+apt-get -o Acquire::Retries=10 update -qq && apt-get -o Acquire::Retries=10 -o Dpkg::Use-Pty=0 install -y --no-install-recommends \
     wine-stable \
     wine32 \
     wine64
-# To install the latest wine: https://wiki.winehq.org/Ubuntu
-# RUN <<EOF
-# curl --proto '=https' --tlsv1.2 -fsSL --retry 10 --retry-connrefused https://dl.winehq.org/wine-builds/winehq.key | apt-key add -
-# codename="$(grep '^VERSION_CODENAME=' /etc/os-release | sed 's/^VERSION_CODENAME=//')"
-# echo "deb https://dl.winehq.org/wine-builds/ubuntu/ ${codename} main" >/etc/apt/sources.list.d/winehq.list
-# EOF
-# # Use winehq-devel instead of winehq-stable (6.0.2), because mio needs wine 6.11+.
-# # https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-amd64
-# # https://wiki.winehq.org/Wine_User%27s_Guide#Wine_from_WineHQ
-# # https://github.com/tokio-rs/mio/issues/1444
-# RUN apt-get -o Acquire::Retries=10 update -qq && apt-get -o Acquire::Retries=10 -o Dpkg::Use-Pty=0 install -y --no-install-recommends \
-#     winehq-devel
-RUN wine --version
+wine --version
+EOF
 ARG RUST_TARGET
 COPY /test-base /test-base
 RUN /test-base/target.sh

docker/windows-gnullvm.Dockerfile

@@ -0,0 +1,118 @@
+# syntax=docker/dockerfile:1
+
+# Refs:
+# - https://github.com/mstorsjo/llvm-mingw
+# - https://github.com/rust-lang/rust/blob/1.70.0/src/doc/rustc/src/platform-support/pc-windows-gnullvm.md
+
+ARG RUST_TARGET
+ARG UBUNTU_VERSION=20.04
+ARG TOOLCHAIN_TAG=dev
+
+ARG TOOLCHAIN_VERSION=20230614
+
+FROM ghcr.io/taiki-e/downloader as toolchain
+SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
+RUN mkdir -p /toolchain
+ARG TOOLCHAIN_VERSION
+# https://github.com/mstorsjo/llvm-mingw/releases
+RUN <<EOF
+dpkg_arch="$(dpkg --print-architecture)"
+case "${dpkg_arch##*-}" in
+    amd64) arch=x86_64 ;;
+    arm64) arch=aarch64 ;;
+    *) echo >&2 "unsupported architecture '${dpkg_arch}'" && exit 1 ;;
+esac
+curl --proto '=https' --tlsv1.2 -fsSL --retry 10 --retry-connrefused "https://github.com/mstorsjo/llvm-mingw/releases/download/${TOOLCHAIN_VERSION}/llvm-mingw-${TOOLCHAIN_VERSION}-ucrt-ubuntu-20.04-${arch}.tar.xz" \
+    | tar xJf - --strip-components 1 -C /toolchain
+EOF
+
+FROM ghcr.io/taiki-e/build-base:ubuntu-"${UBUNTU_VERSION}" as builder
+SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
+ARG DEBIAN_FRONTEND=noninteractive
+ARG RUST_TARGET
+ARG TOOLCHAIN_DIR="/${RUST_TARGET}"
+ARG SYSROOT_DIR="${TOOLCHAIN_DIR}/${RUST_TARGET}"
+COPY --from=toolchain /toolchain "${TOOLCHAIN_DIR}"
+
+RUN <<EOF
+cc_target="${RUST_TARGET%%-*}-w64-mingw32"
+echo "${cc_target}" >/CC_TARGET
+[[ "${RUST_TARGET}" == "aarch64"* ]] || rm -rf "${TOOLCHAIN_DIR}"/aarch64-w64-mingw32
+[[ "${RUST_TARGET}" == "x86_64"* ]] || rm -rf "${TOOLCHAIN_DIR}"/x86_64-w64-mingw32
+[[ "${RUST_TARGET}" == "i686"* ]] || rm -rf "${TOOLCHAIN_DIR}"/i686-w64-mingw32
+{ [[ "${RUST_TARGET}" == "thumb"* ]] || [[ "${RUST_TARGET}" == "arm"* ]]; } || rm -rf "${TOOLCHAIN_DIR}"/armv7-w64-mingw32
+EOF
+
+RUN --mount=type=bind,target=/docker \
+    /docker/base/common.sh
+
+FROM ghcr.io/taiki-e/build-base:ubuntu-"${UBUNTU_VERSION}" as test-base
+SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
+ARG DEBIAN_FRONTEND=noninteractive
+ENV HOME=/tmp/home
+COPY /test-base.sh /
+RUN /test-base.sh
+ARG RUST_TARGET
+RUN <<EOF
+dpkg_arch="$(dpkg --print-architecture)"
+case "${dpkg_arch##*-}" in
+    amd64) dpkg --add-architecture i386 ;;
+    arm64)
+        dpkg --add-architecture armhf
+        # TODO: do not skip if actual host is arm64
+        exit 0
+        ;;
+    *) echo >&2 "unsupported architecture '${dpkg_arch}'" && exit 1 ;;
+esac
+case "${RUST_TARGET}" in
+    aarch64*) ;;
+    *)
+        # See https://wiki.winehq.org/Ubuntu when install the latest wine.
+        apt-get -o Acquire::Retries=10 update -qq && apt-get -o Acquire::Retries=10 -o Dpkg::Use-Pty=0 install -y --no-install-recommends \
+            wine-stable \
+            wine32 \
+            wine64
+        wine --version
+        ;;
+esac
+EOF
+COPY --from=ghcr.io/taiki-e/qemu-user /usr/bin/qemu-aarch64 /usr/bin/
+COPY --from=linaro/wine-arm64 /opt/wine-arm64 /opt/wine-arm64
+RUN <<EOF
+case "${RUST_TARGET}" in
+    aarch64*) ;;
+    *)
+        rm -rf /opt/wine-arm64
+        mkdir -p /opt/wine-arm64
+        ;;
+esac
+EOF
+COPY /test-base /test-base
+RUN /test-base/target.sh
+COPY /test /test
+
+FROM test-base as test-relocated
+SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
+ARG DEBIAN_FRONTEND=noninteractive
+ARG RUST_TARGET
+COPY --from=builder /"${RUST_TARGET}"/. /usr/local/
+RUN /test/test.sh clang
+RUN touch /DONE
+
+FROM test-base as test
+SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
+ARG DEBIAN_FRONTEND=noninteractive
+ARG RUST_TARGET
+COPY --from=builder /"${RUST_TARGET}" /"${RUST_TARGET}"
+ENV PATH="/${RUST_TARGET}/bin:$PATH"
+RUN /test/check.sh
+RUN /test/test.sh clang
+# COPY --from=test-relocated /DONE /
+
+FROM ubuntu:"${UBUNTU_VERSION}" as final
+SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
+ARG DEBIAN_FRONTEND=noninteractive
+ARG RUST_TARGET
+COPY --from=test /"${RUST_TARGET}" /"${RUST_TARGET}"
+COPY --from=test /opt/wine-arm64 /opt/wine-arm64
+ENV PATH="/${RUST_TARGET}/bin:$PATH"