Fix source binds for wasm32-linux-musl

rust-lang · Jul 25, 2024 · 996e362 · 996e362
1 parent 7e10829
commit 996e362
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs
@@ -232,7 +232,7 @@ cfg_if! {
                         target_arch = "aarch64",
                         target_arch = "s390x",
                         target_arch = "loongarch64",
-                        all(target_arch = "wasm32", target_vendor = "wali64")))] {
+                        target_arch = "wasm32"))] {
         pub const FS_IOC_GETFLAGS: ::Ioctl = 0x80086601;
         pub const FS_IOC_SETFLAGS: ::Ioctl = 0x40086602;
         pub const FS_IOC_GETVERSION: ::Ioctl = 0x80087601;

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -5624,15 +5624,15 @@ extern "C" {
 
 
 // Syscall libc stub for non Wasm32-WALI targets
-// In Wasm32-WALI, all syscalls are name-bound and typed.
+// In wasm32-linux, all syscalls are name-bound and typed.
 // The 'syscall' implementation from C library is avoided since 
 // higher level libraries do not explicitly typecast arguments to
 // 64-bit register sizes, which is expected of C variadic arguments.
-// To overcome this, a wrapper 'syscall' method is implemented in the
-// WALI specific module, which binds the syscall types statically 
-// at compile time and binds their numbers at runtime
+// To overcome this, a wrapper 'syscall' method is implemented,
+// which binds the syscall types statically at compile time
+// and binds their numbers at runtime
 cfg_if!(
-    if #[cfg(not(all(target_arch = "wasm32", target_vendor = "wali64")))] {
+    if #[cfg(not(target_arch = "wasm32"))] {
         extern "C" {
             pub fn syscall(num: ::c_long, ...) -> ::c_long;
         }

diff --git a/src/unix/linux_like/linux/musl/b64/mod.rs b/src/unix/linux_like/linux/musl/b64/mod.rs
@@ -160,7 +160,7 @@ cfg_if! {
     } else if #[cfg(any(target_arch = "loongarch64"))] {
         mod loongarch64;
         pub use self::loongarch64::*;
-    } else if #[cfg(all(target_arch = "wasm32", target_vendor = "wali64"))] {
+    } else if #[cfg(any(target_arch = "wasm32"))] {
         mod wasm32;
         pub use self::wasm32::*;
     } else {

diff --git a/src/unix/linux_like/linux/musl/b64/wasm32/mod.rs b/src/unix/linux_like/linux/musl/b64/wasm32/mod.rs
@@ -912,13 +912,9 @@ pub const TOSTOP: ::tcflag_t = 0x00000100;
 pub const FLUSHO: ::tcflag_t = 0x00001000;
 
 
-cfg_if! {
-    if #[cfg(target_vendor = "wali64")] {
-        /* Aliases to syscall constants */
-        pub const SYS_fadvise: ::c_long = SYS_fadvise64;
-
-        mod syscalls_wali;
-        pub use self::syscalls_wali::*;
-    }
-}
+/* Aliases to syscall constants */
+pub const SYS_fadvise: ::c_long = SYS_fadvise64;
 
+/* WebAssembly Linux Interface (WALI) syscall specification */
+mod syscalls_wali;
+pub use self::syscalls_wali::*;
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
@@ -919,7 +919,8 @@ cfg_if! {
                  target_arch = "s390x",
                  target_arch = "riscv64",
                  target_arch = "loongarch64",
-                 all(target_arch = "wasm32", target_vendor = "wali64")))] {
+                 // wasm32-linux uses the WALI specification with 64-bit struct layout
+                 target_arch = "wasm32"))] {
         mod b64;
         pub use self::b64::*;
     } else if #[cfg(any(target_arch = "x86",