From feb1eaca34087b6e15069bbdb4a7166e0354350b Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Fri, 24 Jan 2025 21:27:17 -0800
Subject: [PATCH] Re-enable cross-check tests for espidf, via, aix, and haiku.

---
 .github/workflows/main.yml   | 12 ++++--------
 src/backend/libc/fs/types.rs |  2 ++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5e3df1b5d..92f6f48d2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -213,19 +213,15 @@ jobs:
     - run: cargo check -Z build-std --target sparc-unknown-linux-gnu --all-targets --features=all-apis
     - run: cargo check -Z build-std --target armv7-unknown-freebsd --all-targets --features=all-apis
     - run: cargo check -Z build-std --target aarch64-unknown-linux-gnu_ilp32 --all-targets --features=all-apis
-    # Omit --all-targets on haiku because not all the tests build yet.
-    - run: cargo check -Z build-std --target x86_64-unknown-haiku --features=all-apis
+    - run: cargo check -Z build-std --target x86_64-unknown-haiku --all-targets --features=all-apis
     - run: cargo check -Z build-std --target x86_64-uwp-windows-msvc --all-targets --features=all-apis
-    # Temporarily disable riscv32imc-esp-espidf due to std using SOMAXCONN.
-    #- run: cargo check -Z build-std --target=riscv32imc-esp-espidf --features=all-apis
+    - run: cargo check -Z build-std --target=riscv32imc-esp-espidf --features=all-apis
     - run: cargo check -Z build-std --target=aarch64-unknown-nto-qnx710 --features=all-apis
     - run: cargo check -Z build-std --target=x86_64-pc-nto-qnx710 --features=all-apis
     # Temporarily disable --features=all-apis, which doesn't build yet.
     - run: cargo check -Z build-std --target=armv6k-nintendo-3ds
-    # Temporarily disable armv7-sony-vita-newlibeabihf due to std using SOMAXCONN.
-    #- run: cargo check -Z build-std --target=armv7-sony-vita-newlibeabihf --features=all-apis
-    # `std` doesn't appear to build on AIX yet, so test in `no_std` mode.
-    - run: cargo check -Zbuild-std=core,alloc --target=powerpc64-ibm-aix --features=all-apis --no-default-features
+    - run: cargo check -Z build-std --target=armv7-sony-vita-newlibeabihf --features=all-apis
+    - run: cargo check -Z build-std --target=powerpc64-ibm-aix --features=all-apis
     - run: cargo check -Z build-std --target=mipsel-unknown-linux-gnu --features=all-apis
     - run: cargo check -Z build-std --target=mips64el-unknown-linux-gnuabi64 --features=all-apis
     - run: cargo check -Z build-std --target=powerpc64le-unknown-linux-musl --features=all-apis
diff --git a/src/backend/libc/fs/types.rs b/src/backend/libc/fs/types.rs
index 833928b33..0da1717b3 100644
--- a/src/backend/libc/fs/types.rs
+++ b/src/backend/libc/fs/types.rs
@@ -949,9 +949,11 @@ pub type StatFs = c::statfs64;
 /// `fsid_t` for use with `StatFs`.
 #[cfg(not(any(
     solarish,
+    target_os = "espidf",
     target_os = "haiku",
     target_os = "nto",
     target_os = "redox",
+    target_os = "vita",
     target_os = "wasi"
 )))]
 pub type Fsid = c::fsid_t;