diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e84160cb802e..ea442085fbe9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -238,8 +238,7 @@ jobs: - target: x86_64-linux-android # Keep in sync with the Android build pinned in ci/cuttlefish-setup.sh artifact-tag: android17 - # FIXME: Exec format error (os error 8) - # - target: x86_64-unknown-linux-gnux32 + - target: x86_64-unknown-linux-gnux32 - target: x86_64-unknown-linux-musl - target: x86_64-unknown-linux-musl env: { TEST_MUSL_V1_2_3: 1 } diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index 678c816ab924..73957c856e73 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -99,9 +99,18 @@ s! { // On all variants _except_ 32-bit long and 64-bit time_t they actually // refer to members of input_event.time, a timeval struct. // The timeval struct has two members of type time_t and suseconds_t. - #[cfg(any(target_pointer_width = "64", not(linux_time_bits64)))] + #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] + pub input_event_sec: c_long, + #[cfg(all( + not(all(target_arch = "x86_64", target_pointer_width = "32")), + any(target_pointer_width = "64", not(linux_time_bits64)), + ))] pub input_event_sec: crate::time_t, - #[cfg(all(target_pointer_width = "32", linux_time_bits64))] + #[cfg(all( + not(all(target_arch = "x86_64", target_pointer_width = "32")), + target_pointer_width = "32", + linux_time_bits64, + ))] pub input_event_sec: c_ulong, #[cfg(any(target_pointer_width = "64", not(linux_time_bits64)))]