fuchsia: fix record definitions

Remove uses of 32-bit target conditional compilation. Fuchsia does not
support 32-bit targets [1]. This is unnecessary.

Fix missing fields in records. No particular header file is targetted.
All wrong records have been fixed. c.f. all headers under
`sysroot/include` in the SDK.

Fix `cpu_set_t` macros [2]. They were wrongly defined. They neither
returned the right values.

[1]: https://fuchsia.dev/fuchsia-src/contribute/governance/rfcs/0111_fuchsia_hardware_specifications#required_64-bit_cpu_and_platform
[2]: https://cs.opensource.google/fuchsia/fuchsia/+/main:zircon/third_party/ulib/musl/include/sched.h

Author: dybucc

src/fuchsia/aarch64.rs

@@ -16,10 +16,10 @@ s! {
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
-        __pad0: Padding<c_ulong>,
+        __pad: Padding<c_ulong>,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,
-        __pad1: Padding<c_int>,
+        __pad2: Padding<c_int>,
         pub st_blocks: crate::blkcnt_t,
         pub st_atime: crate::time_t,
         pub st_atime_nsec: c_long,

src/fuchsia/mod.rs

@@ -476,16 +476,11 @@ s! {
     }
 
     pub struct glob_t {
-        pub gl_pathc: size_t,
+        pub gl_pathc: crate::size_t,
         pub gl_pathv: *mut *mut c_char,
-        pub gl_offs: size_t,
-        pub gl_flags: c_int,
-
-        __unused1: Padding<*mut c_void>,
-        __unused2: Padding<*mut c_void>,
-        __unused3: Padding<*mut c_void>,
-        __unused4: Padding<*mut c_void>,
-        __unused5: Padding<*mut c_void>,
+        pub gl_offs: crate::size_t,
+        __dummy1: Padding<c_int>,
+        __dummy2: Padding<[*mut c_void; 5]>,
     }
 
     pub struct ifaddrs {
@@ -529,15 +524,10 @@ s! {
         pub f_files: crate::fsfilcnt_t,
         pub f_ffree: crate::fsfilcnt_t,
         pub f_favail: crate::fsfilcnt_t,
-        #[cfg(target_endian = "little")]
-        pub f_fsid: c_ulong,
-        #[cfg(all(target_pointer_width = "32", not(target_arch = "x86_64")))]
-        __f_unused: Padding<c_int>,
-        #[cfg(target_endian = "big")]
         pub f_fsid: c_ulong,
         pub f_flag: c_ulong,
         pub f_namemax: c_ulong,
-        __f_spare: [c_int; 6],
+        __f_spare: Padding<[c_int; 6]>,
     }
 
     pub struct dqblk {
@@ -583,14 +573,11 @@ s! {
     }
 
     pub struct fsid_t {
-        __val: [c_int; 2],
+        pub __val: [c_int; 2],
     }
 
     pub struct cpu_set_t {
-        #[cfg(all(target_pointer_width = "32", not(target_arch = "x86_64")))]
-        bits: [u32; 32],
-        #[cfg(not(all(target_pointer_width = "32", not(target_arch = "x86_64"))))]
-        bits: [u64; 16],
+        pub __bits: [c_ulonglong; 128 / size_of::<c_long>()],
     }
 
     pub struct if_nameindex {
@@ -733,26 +720,13 @@ s! {
     }
 
     pub struct dl_phdr_info {
-        #[cfg(target_pointer_width = "64")]
         pub dlpi_addr: Elf64_Addr,
-        #[cfg(target_pointer_width = "32")]
-        pub dlpi_addr: Elf32_Addr,
-
         pub dlpi_name: *const c_char,
-
-        #[cfg(target_pointer_width = "64")]
         pub dlpi_phdr: *const Elf64_Phdr,
-        #[cfg(target_pointer_width = "32")]
-        pub dlpi_phdr: *const Elf32_Phdr,
-
-        #[cfg(target_pointer_width = "64")]
         pub dlpi_phnum: Elf64_Half,
-        #[cfg(target_pointer_width = "32")]
-        pub dlpi_phnum: Elf32_Half,
-
         pub dlpi_adds: c_ulonglong,
         pub dlpi_subs: c_ulonglong,
-        pub dlpi_tls_modid: size_t,
+        pub dlpi_tls_modid: crate::size_t,
         pub dlpi_tls_data: *mut c_void,
     }
 
@@ -808,7 +782,7 @@ s! {
     }
 
     pub struct sigset_t {
-        __val: [c_ulong; 16],
+        pub __bits: [c_ulong; 128 / size_of::<c_long>()],
     }
 
     pub struct shmid_ds {
@@ -873,15 +847,16 @@ s! {
     }
 
     pub struct sem_t {
-        __val: [c_int; 8],
+        pub _s_value: c_int,
+        pub _s_waiters: c_int,
     }
 
+    #[repr(align(8))]
     pub struct siginfo_t {
         pub si_signo: c_int,
         pub si_errno: c_int,
         pub si_code: c_int,
-        pub _pad: [c_int; 29],
-        _align: [usize; 0],
+        pub __si_fields: [c_int; 28],
     }
 
     #[deprecated(
@@ -952,13 +927,14 @@ s! {
 
     pub struct sockaddr_storage {
         pub ss_family: sa_family_t,
-        __ss_pad2: Padding<[u8; 128 - 2 - 8]>,
-        __ss_align: size_t,
+        __ss_padding:
+            Padding<[c_char; 128 - size_of::<c_long>() - size_of::<crate::sa_family_t>()]>,
+        __ss_align: c_ulong,
     }
 
     pub struct utsname {
         pub sysname: [c_char; 65],
-        pub nodename: [c_char; 65],
+        pub nodename: [c_char; crate::HOST_NAME_MAX.cast_unsigned() as usize + 1],
         pub release: [c_char; 65],
         pub version: [c_char; 65],
         pub machine: [c_char; 65],
@@ -967,7 +943,7 @@ s! {
 
     pub struct dirent {
         pub d_ino: crate::ino_t,
-        pub d_off: off_t,
+        pub d_off: crate::off_t,
         pub d_reclen: c_ushort,
         pub d_type: c_uchar,
         pub d_name: [c_char; 256],
@@ -1160,8 +1136,10 @@ cfg_if! {
 
 // PUB_CONST
 
-pub const INT_MIN: c_int = -2147483648;
-pub const INT_MAX: c_int = 2147483647;
+pub const HOST_NAME_MAX: c_int = 255;
+
+pub const INT_MIN: c_int = -1 - 0x7fffffff;
+pub const INT_MAX: c_int = 0x7fffffff;
 
 pub const SIG_DFL: sighandler_t = 0 as sighandler_t;
 pub const SIG_IGN: sighandler_t = 1 as sighandler_t;
@@ -3140,31 +3118,43 @@ f! {
     }
 
     pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
-        cpuset.bits.fill(0);
+        cpuset.__bits.fill(0);
     }
 
-    pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) -> () {
-        let size_in_bits = 8 * size_of_val(&cpuset.bits[0]); // 32, 64 etc
-        let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
-        cpuset.bits[idx] |= 1 << offset;
-        ()
+    pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) -> c_ulonglong {
+        (cpu / 8 >= size_of::<crate::cpu_set_t>())
+            .then_some(0)
+            .unwrap_or_else(|| {
+                let c = &mut cpuset.__bits[cpu / 8 / size_of::<c_long>()];
+                *c |= 1 << (cpu % (8 * size_of::<c_long>()));
+
+                *c
+            })
     }
 
-    pub fn CPU_CLR(cpu: usize, cpuset: &mut cpu_set_t) -> () {
-        let size_in_bits = 8 * size_of_val(&cpuset.bits[0]); // 32, 64 etc
-        let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
-        cpuset.bits[idx] &= !(1 << offset);
-        ()
+    pub fn CPU_CLR(cpu: usize, cpuset: &mut cpu_set_t) -> c_ulonglong {
+        (cpu / 8 >= size_of::<crate::cpu_set_t>())
+            .then_some(0)
+            .unwrap_or_else(|| {
+                let c = &mut cpuset.__bits[cpu / 8 / size_of::<c_long>()];
+                *c &= !(1 << (cpu % (8 * size_of::<c_long>())));
+
+                *c
+            })
     }
 
     pub fn CPU_ISSET(cpu: usize, cpuset: &cpu_set_t) -> bool {
-        let size_in_bits = 8 * size_of_val(&cpuset.bits[0]);
-        let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
-        0 != (cpuset.bits[idx] & (1 << offset))
+        (cpu / 8 >= size_of::<crate::cpu_set_t>())
+            .then_some(false)
+            .unwrap_or_else(|| {
+                (cpuset.__bits[cpu / 8 / size_of::<c_long>()]
+                    & (1 << (cpu % (8 * size_of::<c_long>()))))
+                    != 0
+            })
     }
 
     pub fn CPU_EQUAL(set1: &cpu_set_t, set2: &cpu_set_t) -> bool {
-        set1.bits == set2.bits
+        set1.__bits == set2.__bits
     }
 
     pub fn CMSG_DATA(cmsg: *const cmsghdr) -> *mut c_uchar {

src/fuchsia/riscv64.rs

@@ -1,4 +1,3 @@
-use crate::off_t;
 use crate::prelude::*;
 
 // From psABI Calling Convention for RV64
@@ -22,9 +21,9 @@ s! {
         pub st_mode: crate::mode_t,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
-        __pad0: Padding<c_int>,
+        __pad0: Padding<c_uint>,
         pub st_rdev: crate::dev_t,
-        pub st_size: off_t,
+        pub st_size: crate::off_t,
         pub st_blksize: crate::blksize_t,
         pub st_blocks: crate::blkcnt_t,
         pub st_atime: crate::time_t,

src/fuchsia/x86_64.rs

@@ -15,7 +15,7 @@ s! {
         pub st_mode: crate::mode_t,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
-        __pad0: Padding<c_int>,
+        __pad0: Padding<c_uint>,
         pub st_rdev: crate::dev_t,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,