Fix pthread related definitions for emscripten

Author: malbarbo

src/unix/notbsd/linux/mod.rs

@@ -68,20 +68,20 @@ s! {
 
     pub struct pthread_mutex_t {
         #[cfg(any(target_arch = "mips", target_arch = "arm",
-                  target_arch = "powerpc"))]
+                  target_arch = "powerpc", target_os = "emscripten"))]
         __align: [::c_long; 0],
         #[cfg(not(any(target_arch = "mips", target_arch = "arm",
-                      target_arch = "powerpc")))]
+                      target_arch = "powerpc", target_os = "emscripten")))]
         __align: [::c_longlong; 0],
         size: [u8; __SIZEOF_PTHREAD_MUTEX_T],
     }
 
     pub struct pthread_rwlock_t {
         #[cfg(any(target_arch = "mips", target_arch = "arm",
-                  target_arch = "powerpc"))]
+                  target_arch = "powerpc", target_os = "emscripten"))]
         __align: [::c_long; 0],
         #[cfg(not(any(target_arch = "mips", target_arch = "arm",
-                      target_arch = "powerpc")))]
+                      target_arch = "powerpc", target_os = "emscripten")))]
         __align: [::c_longlong; 0],
         size: [u8; __SIZEOF_PTHREAD_RWLOCK_T],
     }
@@ -99,9 +99,9 @@ s! {
     }
 
     pub struct pthread_cond_t {
-        #[cfg(any(target_env = "musl"))]
+        #[cfg(any(target_env = "musl", target_os = "emscripten"))]
         __align: [*const ::c_void; 0],
-        #[cfg(not(any(target_env = "musl")))]
+        #[cfg(not(any(target_env = "musl", target_os = "emscripten")))]
         __align: [::c_longlong; 0],
         size: [u8; __SIZEOF_PTHREAD_COND_T],
     }

src/unix/notbsd/linux/musl/b32/arm.rs

@@ -109,6 +109,8 @@ s! {
     }
 }
 
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
+
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
 pub const O_NOFOLLOW: ::c_int = 0x20000;

src/unix/notbsd/linux/musl/b32/asmjs.rs

@@ -109,6 +109,8 @@ s! {
     }
 }
 
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 28;
+
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
 pub const O_NOFOLLOW: ::c_int = 0x20000;

src/unix/notbsd/linux/musl/b32/mips.rs

@@ -117,6 +117,8 @@ s! {
     }
 }
 
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 28;
+
 pub const O_DIRECT: ::c_int = 0o100000;
 pub const O_DIRECTORY: ::c_int = 0o200000;
 pub const O_NOFOLLOW: ::c_int = 0o400000;

src/unix/notbsd/linux/musl/b32/mod.rs

@@ -4,7 +4,10 @@ pub type nlink_t = u32;
 
 s! {
     pub struct pthread_attr_t {
-        __size: [u32; 9]
+        #[cfg(target_os = "emscripten")]
+        __size: [u32; 11],
+        #[cfg(not(target_os = "emscripten"))]
+        __size: [u32; 9],
     }
 
     pub struct sigset_t {
@@ -33,7 +36,6 @@ s! {
 }
 
 pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32;
-pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
 
 cfg_if! {
     if #[cfg(any(target_arch = "x86"))] {

src/unix/notbsd/linux/musl/b32/x86.rs

@@ -122,6 +122,8 @@ s! {
     }
 }
 
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
+
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
 pub const O_NOFOLLOW: ::c_int = 0x20000;