File tree Expand file tree Collapse file tree 5 files changed +14
-17
lines changed
src/unix/linux_like/linux Expand file tree Collapse file tree 5 files changed +14
-17
lines changed Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ cfg_if! {
232
232
target_arch = "aarch64" ,
233
233
target_arch = "s390x" ,
234
234
target_arch = "loongarch64" ,
235
- all ( target_arch = "wasm32" , target_vendor = "wali64" ) ) ) ] {
235
+ target_arch = "wasm32" ) ) ] {
236
236
pub const FS_IOC_GETFLAGS : :: Ioctl = 0x80086601 ;
237
237
pub const FS_IOC_SETFLAGS : :: Ioctl = 0x40086602 ;
238
238
pub const FS_IOC_GETVERSION : :: Ioctl = 0x80087601 ;
Original file line number Diff line number Diff line change @@ -5624,15 +5624,15 @@ extern "C" {
5624
5624
5625
5625
5626
5626
// Syscall libc stub for non Wasm32-WALI targets
5627
- // In Wasm32-WALI , all syscalls are name-bound and typed.
5627
+ // In wasm32-linux , all syscalls are name-bound and typed.
5628
5628
// The 'syscall' implementation from C library is avoided since
5629
5629
// higher level libraries do not explicitly typecast arguments to
5630
5630
// 64-bit register sizes, which is expected of C variadic arguments.
5631
- // To overcome this, a wrapper 'syscall' method is implemented in the
5632
- // WALI specific module, which binds the syscall types statically
5633
- // at compile time and binds their numbers at runtime
5631
+ // To overcome this, a wrapper 'syscall' method is implemented,
5632
+ // which binds the syscall types statically at compile time
5633
+ // and binds their numbers at runtime
5634
5634
cfg_if ! (
5635
- if #[ cfg( not( all ( target_arch = "wasm32" , target_vendor = "wali64" ) ) ) ] {
5635
+ if #[ cfg( not( target_arch = "wasm32" ) ) ] {
5636
5636
extern "C" {
5637
5637
pub fn syscall( num: :: c_long, ...) -> :: c_long;
5638
5638
}
Original file line number Diff line number Diff line change @@ -160,7 +160,7 @@ cfg_if! {
160
160
} else if #[ cfg( any( target_arch = "loongarch64" ) ) ] {
161
161
mod loongarch64;
162
162
pub use self :: loongarch64:: * ;
163
- } else if #[ cfg( all ( target_arch = "wasm32" , target_vendor = "wali64 ") ) ] {
163
+ } else if #[ cfg( any ( target_arch = "wasm32" ) ) ] {
164
164
mod wasm32;
165
165
pub use self :: wasm32:: * ;
166
166
} else {
Original file line number Diff line number Diff line change @@ -912,13 +912,9 @@ pub const TOSTOP: ::tcflag_t = 0x00000100;
912
912
pub const FLUSHO : :: tcflag_t = 0x00001000 ;
913
913
914
914
915
- cfg_if ! {
916
- if #[ cfg( target_vendor = "wali64" ) ] {
917
- /* Aliases to syscall constants */
918
- pub const SYS_fadvise : :: c_long = SYS_fadvise64 ;
919
-
920
- mod syscalls_wali;
921
- pub use self :: syscalls_wali:: * ;
922
- }
923
- }
915
+ /* Aliases to syscall constants */
916
+ pub const SYS_fadvise : :: c_long = SYS_fadvise64 ;
924
917
918
+ /* WebAssembly Linux Interface (WALI) syscall specification */
919
+ mod syscalls_wali;
920
+ pub use self :: syscalls_wali:: * ;
Original file line number Diff line number Diff line change @@ -919,7 +919,8 @@ cfg_if! {
919
919
target_arch = "s390x" ,
920
920
target_arch = "riscv64" ,
921
921
target_arch = "loongarch64" ,
922
- all( target_arch = "wasm32" , target_vendor = "wali64" ) ) ) ] {
922
+ // wasm32-linux uses the WALI specification with 64-bit struct layout
923
+ target_arch = "wasm32" ) ) ] {
923
924
mod b64;
924
925
pub use self :: b64:: * ;
925
926
} else if #[ cfg( any( target_arch = "x86" ,
You can’t perform that action at this time.
0 commit comments