Skip to content

feat: add back support for GNU Windows x86 in CI #5050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnTitor merged 1 commit into from
Apr 10, 2026
+9 −21
Merged

feat: add back support for GNU Windows x86 in CI #5050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,13 @@ jobs:
os: windows-11-arm
- target: aarch64-unknown-linux-gnu
os: ubuntu-24.04-arm
# FIXME: It currently causes segfaults.
#- target: i686-pc-windows-gnu
# env: { ARCH_BITS: 32, ARCH: i686 }
- target: i686-pc-windows-gnu
os: windows-2025
- target: i686-pc-windows-msvc
os: windows-2025
- target: i686-unknown-linux-gnu
- target: x86_64-pc-windows-gnu
os: windows-2025
env: { ARCH_BITS: 64, ARCH: x86_64 }
- target: x86_64-pc-windows-msvc
os: windows-2025
- target: x86_64-unknown-linux-gnu
Expand Down
18 changes: 3 additions & 15 deletions ci/install-rust.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,11 @@ if [ -n "${INSTALL_RUST_SRC:-}" ]; then
fi

if [ "$os" = "windows" ]; then
if [ "${ARCH_BITS:-}" = "i686" ]; then
echo "Install MinGW32"
choco install mingw --x86 --force
fi

echo "Find GCC libraries"
gcc -print-search-dirs
/usr/bin/find "C:\ProgramData\Chocolatey" -name "crt2*"
/usr/bin/find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
/usr/bin/find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"

if [ -n "${ARCH_BITS:-}" ]; then
echo "Fix MinGW"
for i in crt2.o dllcrt2.o libmingwex.a libmsvcrt.a; do
cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw$ARCH_BITS/$ARCH-w64-mingw32/lib/$i" "$(rustc --print sysroot)/lib/rustlib/$TARGET/lib"
done
fi
/usr/bin/find "C:\ProgramData\chocolatey" -name "crt2*"
/usr/bin/find "C:\ProgramData\chocolatey" -name "dllcrt2*"
/usr/bin/find "C:\ProgramData\chocolatey" -name "libmsvcrt*"
fi

echo "Query rust and cargo versions"
Expand Down
6 changes: 4 additions & 2 deletions src/windows/gnu/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use crate::prelude::*;

// The below configuration for machines with 32-bit word size aligns with the
// declaration in the `mingw-w64` headers.
cfg_if! {
if #[cfg(target_pointer_width = "64")] {
s_no_extra_traits! {
Expand All @@ -10,9 +12,9 @@ cfg_if! {
}
} else if #[cfg(target_pointer_width = "32")] {
s_no_extra_traits! {
#[repr(align(16))]
#[repr(align(8))]
pub struct max_align_t {
priv_: [i64; 6],
priv_: [i64; 3],
}
}
}
Expand Down