NetBSD: rework recent pthread type corrections to avoid cfg_if!

Author: jakllsch

src/unix/bsd/netbsdlike/netbsd/aarch64.rs

@@ -3,6 +3,7 @@ use PT_FIRSTMACH;
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type c_char = u8;
+pub type __cpu_simple_lock_nv_t = ::c_uchar;
 
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
 pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;

src/unix/bsd/netbsdlike/netbsd/arm.rs

@@ -3,6 +3,7 @@ use PT_FIRSTMACH;
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type c_char = u8;
+type __cpu_simple_lock_nv_t = ::c_int;
 
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
 pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;

src/unix/bsd/netbsdlike/netbsd/mod.rs

@@ -8,21 +8,7 @@ pub type fsblkcnt_t = ::uint64_t;
 pub type fsfilcnt_t = ::uint64_t;
 pub type idtype_t = ::c_int;
 pub type mqd_t = ::c_int;
-
-cfg_if! {
-    if #[cfg(any(target_arch = "aarch64",
-                 target_arch = "sparc", target_arch = "sparc64",
-                 target_arch = "x86", target_arch = "x86_64"))] {
-        type __cpu_simple_lock_t = ::c_uchar;
-    } else if #[cfg(any(target_arch = "arm", target_arch = "powerpc",
-                        target_arch = "powerpc64"))] {
-        type __cpu_simple_lock_t = ::c_int;
-    } else if #[cfg(any(target_arch = "mips", target_arch = "mips64"))] {
-        type __cpu_simple_lock_t = ::c_uint;
-    } else {
-        // Unknown target_arch
-    }
-}
+type __pthread_spin_t = __cpu_simple_lock_nv_t;
 
 s! {
     pub struct aiocb {
@@ -175,11 +161,11 @@ s! {
 
     pub struct pthread_mutex_t {
         ptm_magic: ::c_uint,
-        ptm_errorcheck: __cpu_simple_lock_t,
+        ptm_errorcheck: __pthread_spin_t,
         #[cfg(any(target_arch = "sparc", target_arch = "sparc64",
                   target_arch = "x86", target_arch = "x86_64"))]
         ptm_pad1: [u8; 3],
-        ptm_interlock: __cpu_simple_lock_t,
+        ptm_unused: __pthread_spin_t, // actually a union with a non-unused, 0-initialized field
         #[cfg(any(target_arch = "sparc", target_arch = "sparc64",
                   target_arch = "x86", target_arch = "x86_64"))]
         ptm_pad2: [u8; 3],
@@ -201,7 +187,7 @@ s! {
 
     pub struct pthread_cond_t {
         ptc_magic: ::c_uint,
-        ptc_lock: __cpu_simple_lock_t,
+        ptc_lock: __pthread_spin_t,
         ptc_waiters_first: *mut u8,
         ptc_waiters_last: *mut u8,
         ptc_mutex: *mut ::pthread_mutex_t,
@@ -215,7 +201,7 @@ s! {
 
     pub struct pthread_rwlock_t {
         ptr_magic: ::c_uint,
-        ptr_interlock: __cpu_simple_lock_t,
+        ptr_interlock: __pthread_spin_t,
         ptr_rblocked_first: *mut u8,
         ptr_rblocked_last: *mut u8,
         ptr_wblocked_first: *mut u8,
@@ -711,32 +697,21 @@ pub const FD_SETSIZE: usize = 0x100;
 
 pub const ST_NOSUID: ::c_ulong = 8;
 
-cfg_if! {
-    if #[cfg(any(target_arch = "sparc", target_arch = "sparc64",
-                 target_arch = "x86", target_arch = "x86_64"))] {
-        pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
-            ptm_magic: 0x33330003,
-            ptm_errorcheck: 0,
-            ptm_interlock: 0,
-            ptm_waiters: 0 as *mut _,
-            ptm_owner: 0,
-            ptm_pad1: [0; 3],
-            ptm_pad2: [0; 3],
-            ptm_recursed: 0,
-            ptm_spare2: 0 as *mut _,
-        };
-    } else {
-        pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
-            ptm_magic: 0x33330003,
-            ptm_errorcheck: 0,
-            ptm_interlock: 0,
-            ptm_waiters: 0 as *mut _,
-            ptm_owner: 0,
-            ptm_recursed: 0,
-            ptm_spare2: 0 as *mut _,
-        };
-    }
-}
+pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
+    ptm_magic: 0x33330003,
+    ptm_errorcheck: 0,
+    #[cfg(any(target_arch = "sparc", target_arch = "sparc64",
+              target_arch = "x86", target_arch = "x86_64"))]
+    ptm_pad1: [0; 3],
+    ptm_unused: 0,
+    #[cfg(any(target_arch = "sparc", target_arch = "sparc64",
+              target_arch = "x86", target_arch = "x86_64"))]
+    ptm_pad2: [0; 3],
+    ptm_waiters: 0 as *mut _,
+    ptm_owner: 0,
+    ptm_recursed: 0,
+    ptm_spare2: 0 as *mut _,
+};
 
 pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t {
     ptc_magic: 0x55550005,

src/unix/bsd/netbsdlike/netbsd/powerpc.rs

@@ -3,6 +3,7 @@ use PT_FIRSTMACH;
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type c_char = u8;
+type __cpu_simple_lock_nv_t = ::c_int;
 
 pub const PT_STEP: ::c_int = PT_FIRSTMACH + 0;
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;

src/unix/bsd/netbsdlike/netbsd/sparc64.rs

@@ -1,3 +1,4 @@
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type c_char = i8;
+type __cpu_simple_lock_t = ::c_uchar;

src/unix/bsd/netbsdlike/netbsd/x86.rs

@@ -1,3 +1,4 @@
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type c_char = i8;
+type __cpu_simple_lock_nv_t = ::c_uchar;

src/unix/bsd/netbsdlike/netbsd/x86_64.rs

@@ -3,6 +3,7 @@ use PT_FIRSTMACH;
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type c_char = i8;
+type __cpu_simple_lock_nv_t = ::c_uchar;
 
 pub const PT_STEP: ::c_int = PT_FIRSTMACH + 0;
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;