From 28e49138d0abc65dd9278856604ce4c94bb52fd6 Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Tue, 29 Aug 2023 15:19:06 +0200 Subject: [PATCH] sparc: Alias stat*64 --- src/unix/linux_like/linux/gnu/b32/mod.rs | 4 +- .../linux_like/linux/gnu/b32/sparc/mod.rs | 51 ------------------- 2 files changed, 2 insertions(+), 53 deletions(-) diff --git a/src/unix/linux_like/linux/gnu/b32/mod.rs b/src/unix/linux_like/linux/gnu/b32/mod.rs index 52a0feac0a361..21be0de3bb753 100644 --- a/src/unix/linux_like/linux/gnu/b32/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/mod.rs @@ -41,12 +41,12 @@ cfg_if! { } } cfg_if! { - if #[cfg(any(target_arch = "arm", target_arch="riscv32"))] { + if #[cfg(any(target_arch = "arm", target_arch="riscv32", target_arch="sparc"))] { pub type stat64 = stat; } } cfg_if! { - if #[cfg(target_arch = "riscv32")] { + if #[cfg(any(target_arch = "riscv32", target_arch="sparc"))] { pub type statvfs64 = statvfs; pub type statfs64 = statfs; } diff --git a/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs b/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs index 57ad9fe8ee21b..dec1a8dc033cf 100644 --- a/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs @@ -79,42 +79,6 @@ s! { __unused: [::c_long; 2], } - pub struct stat64 { - pub st_dev: ::dev_t, - pub st_ino: ::ino64_t, - pub st_mode: ::mode_t, - pub st_nlink: ::nlink_t, - pub st_uid: ::uid_t, - pub st_gid: ::gid_t, - pub st_rdev: ::dev_t, - __pad2: ::c_ushort, - pub st_size: ::off64_t, - pub st_blksize: ::blksize_t, - pub st_blocks: ::blkcnt64_t, - pub st_atime: ::time_t, - pub st_atime_nsec: ::c_long, - pub st_mtime: ::time_t, - pub st_mtime_nsec: ::c_long, - pub st_ctime: ::time_t, - pub st_ctime_nsec: ::c_long, - __reserved: [::c_long; 2], - } - - pub struct statfs64 { - pub f_type: ::__fsword_t, - pub f_bsize: ::__fsword_t, - pub f_blocks: u64, - pub f_bfree: u64, - pub f_bavail: u64, - pub f_files: u64, - pub f_ffree: u64, - pub f_fsid: ::fsid_t, - pub f_namelen: ::__fsword_t, - pub f_frsize: ::__fsword_t, - pub f_flags: ::__fsword_t, - pub f_spare: [::__fsword_t; 4], - } - pub struct statvfs { pub f_bsize: ::c_ulong, pub f_frsize: ::c_ulong, @@ -130,21 +94,6 @@ s! { __f_spare: [::c_int; 6], } - pub struct statvfs64 { - pub f_bsize: ::c_ulong, - pub f_frsize: ::c_ulong, - pub f_blocks: u64, - pub f_bfree: u64, - pub f_bavail: u64, - pub f_files: u64, - pub f_ffree: u64, - pub f_favail: u64, - pub f_fsid: ::c_ulong, - pub f_flag: ::c_ulong, - pub f_namemax: ::c_ulong, - __f_spare: [::c_int; 6], - } - pub struct ipc_perm { pub __key: ::key_t, pub uid: ::uid_t,