From 7f120386154d594f76994aa6336741c78e90194e Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 30 Aug 2026 16:39:01 +0900 Subject: [PATCH 1/3] fix: move `i686-pc-windows-gnu` to without host tools target --- .github/workflows/ci.yaml | 2 -- Cargo.toml | 2 +- ci/verify-build.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 36e73ef90bb9..dccee36eb58e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,8 +138,6 @@ jobs: os: windows-11-arm - target: aarch64-unknown-linux-gnu os: ubuntu-26.04-arm - - target: i686-pc-windows-gnu - os: windows-2025 - target: i686-pc-windows-msvc os: windows-2025 - target: i686-unknown-linux-gnu diff --git a/Cargo.toml b/Cargo.toml index 114685542809..d99c58496776 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,6 @@ targets = [ "arm-unknown-linux-gnueabihf", "armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-ohos", - "i686-pc-windows-gnu", "loongarch64-unknown-linux-gnu", "loongarch64-unknown-linux-musl", "powerpc-unknown-linux-gnu", @@ -80,6 +79,7 @@ targets = [ "i586-unknown-linux-gnu", "i586-unknown-linux-musl", "i686-linux-android", + "i686-pc-windows-gnu", "i686-unknown-freebsd", "i686-unknown-linux-musl", "nvptx64-nvidia-cuda", diff --git a/ci/verify-build.py b/ci/verify-build.py index 9c79e31279ce..c7f12fd77591 100755 --- a/ci/verify-build.py +++ b/ci/verify-build.py @@ -98,7 +98,6 @@ class TargetResult: Target("arm-unknown-linux-gnueabihf"), Target("armv7-unknown-linux-gnueabihf"), Target("armv7-unknown-linux-ohos", min_toolchain=Toolchain.STABLE), - Target("i686-pc-windows-gnu"), Target("loongarch64-unknown-linux-gnu", min_toolchain=Toolchain.STABLE), Target("loongarch64-unknown-linux-musl", min_toolchain=Toolchain.STABLE), Target("powerpc-unknown-linux-gnu"), @@ -136,6 +135,7 @@ class TargetResult: Target("i586-unknown-linux-gnu"), Target("i586-unknown-linux-musl"), Target("i686-linux-android"), + Target("i686-pc-windows-gnu"), Target("i686-unknown-freebsd"), Target("i686-unknown-linux-musl"), Target("nvptx64-nvidia-cuda", min_toolchain=Toolchain.STABLE), From 5bed2272c712c5351c0360a3a6e4ef3de5cb2420 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 30 Aug 2026 17:06:58 +0900 Subject: [PATCH 2/3] fix: remove repeated reprs --- src/new/netbsd/net/if_.rs | 2 +- src/unix/linux_like/android/mod.rs | 2 +- src/unix/linux_like/linux/gnu/mod.rs | 2 +- src/unix/redox/mod.rs | 15 ++------------- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/new/netbsd/net/if_.rs b/src/new/netbsd/net/if_.rs index 68f2d9162690..3a47f0319219 100644 --- a/src/new/netbsd/net/if_.rs +++ b/src/new/netbsd/net/if_.rs @@ -50,7 +50,7 @@ pub const IFF_LINK2: c_int = 0x4000; // per link layer defined bit pub const IFF_MULTICAST: c_int = 0x8000; // supports multicast s! { - #[repr(C, align(8))] + #[repr(align(8))] pub struct if_msghdr { pub ifm_msglen: c_ushort, pub ifm_version: c_uchar, diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index a73fb71a32a7..3173c04a1343 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -652,7 +652,7 @@ s_no_extra_traits! { // linux/if_ether.h - #[repr(C, packed)] + #[repr(packed)] pub struct ethhdr { pub h_dest: [c_uchar; crate::ETH_ALEN as usize], pub h_source: [c_uchar; crate::ETH_ALEN as usize], diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs index a5af6aceaf65..5202303d196c 100644 --- a/src/unix/linux_like/linux/gnu/mod.rs +++ b/src/unix/linux_like/linux/gnu/mod.rs @@ -460,7 +460,7 @@ s_no_extra_traits! { // linux/if_ether.h - #[repr(C, packed)] + #[repr(packed)] pub struct ethhdr { pub h_dest: [c_uchar; crate::ETH_ALEN as usize], pub h_source: [c_uchar; crate::ETH_ALEN as usize], diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs index e5001f9c7e40..d092f0eee904 100644 --- a/src/unix/redox/mod.rs +++ b/src/unix/redox/mod.rs @@ -36,7 +36,6 @@ extern_ty! { } s! { - #[repr(C)] pub struct utsname { pub sysname: [c_char; UTSLENGTH], pub nodename: [c_char; UTSLENGTH], @@ -251,57 +250,47 @@ s! { pub gid: gid_t, } - #[cfg_attr(target_pointer_width = "32", repr(C, align(4)))] - #[cfg_attr(target_pointer_width = "64", repr(C, align(8)))] + #[cfg_attr(target_pointer_width = "32", repr(align(4)))] + #[cfg_attr(target_pointer_width = "64", repr(align(8)))] pub struct pthread_attr_t { bytes: [u8; _PTHREAD_ATTR_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_barrier_t { bytes: [u8; _PTHREAD_BARRIER_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_barrierattr_t { bytes: [u8; _PTHREAD_BARRIERATTR_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_mutex_t { bytes: [u8; _PTHREAD_MUTEX_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_rwlock_t { bytes: [u8; _PTHREAD_RWLOCK_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_mutexattr_t { bytes: [u8; _PTHREAD_MUTEXATTR_SIZE], } - #[repr(C)] #[repr(align(1))] pub struct pthread_rwlockattr_t { bytes: [u8; _PTHREAD_RWLOCKATTR_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_cond_t { bytes: [u8; _PTHREAD_COND_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_condattr_t { bytes: [u8; _PTHREAD_CONDATTR_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_once_t { bytes: [u8; _PTHREAD_ONCE_SIZE], } - #[repr(C)] #[repr(align(4))] pub struct pthread_spinlock_t { bytes: [u8; _PTHREAD_SPINLOCK_SIZE], From f266c778339a4c709300f2db8876e73794c137f8 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 30 Aug 2026 19:47:06 +0900 Subject: [PATCH 3/3] fix: use Debian to sync with Cuttlefish --- ci/docker/x86_64-linux-android/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/x86_64-linux-android/Dockerfile b/ci/docker/x86_64-linux-android/Dockerfile index 4b72b8c382fe..6b0e08d2cfcf 100644 --- a/ci/docker/x86_64-linux-android/Dockerfile +++ b/ci/docker/x86_64-linux-android/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:26.04 +FROM debian:13 RUN apt-get update && apt-get install -y --no-install-recommends \ adb \