2 files changed, 56 insertions, 17 deletions

diff --git a/libc/src/unix/notbsd/linux/musl/b32/mips.rs b/libc/src/unix/notbsd/linux/musl/b32/mips.rs
index b0694d1..37430af 100644
--- a/libc/src/unix/notbsd/linux/musl/b32/mips.rs
+++ b/libc/src/unix/notbsd/linux/musl/b32/mips.rs
@@ -514,7 +514,6 @@ pub const SYS_mknod: ::c_long = 4000 +  14;
 pub const SYS_chmod: ::c_long = 4000 +  15;
 pub const SYS_lchown: ::c_long = 4000 +  16;
 pub const SYS_break: ::c_long = 4000 +  17;
-pub const SYS_unused18: ::c_long = 4000 +  18;
 pub const SYS_lseek: ::c_long = 4000 +  19;
 pub const SYS_getpid: ::c_long = 4000 +  20;
 pub const SYS_mount: ::c_long = 4000 +  21;
@@ -524,7 +523,6 @@ pub const SYS_getuid: ::c_long = 4000 +  24;
 pub const SYS_stime: ::c_long = 4000 +  25;
 pub const SYS_ptrace: ::c_long = 4000 +  26;
 pub const SYS_alarm: ::c_long = 4000 +  27;
-pub const SYS_unused28: ::c_long = 4000 +  28;
 pub const SYS_pause: ::c_long = 4000 +  29;
 pub const SYS_utime: ::c_long = 4000 +  30;
 pub const SYS_stty: ::c_long = 4000 +  31;
@@ -555,7 +553,6 @@ pub const SYS_fcntl: ::c_long = 4000 +  55;
 pub const SYS_mpx: ::c_long = 4000 +  56;
 pub const SYS_setpgid: ::c_long = 4000 +  57;
 pub const SYS_ulimit: ::c_long = 4000 +  58;
-pub const SYS_unused59: ::c_long = 4000 +  59;
 pub const SYS_umask: ::c_long = 4000 +  60;
 pub const SYS_chroot: ::c_long = 4000 +  61;
 pub const SYS_ustat: ::c_long = 4000 +  62;
@@ -578,9 +575,7 @@ pub const SYS_gettimeofday: ::c_long = 4000 +  78;
 pub const SYS_settimeofday: ::c_long = 4000 +  79;
 pub const SYS_getgroups: ::c_long = 4000 +  80;
 pub const SYS_setgroups: ::c_long = 4000 +  81;
-pub const SYS_reserved82: ::c_long = 4000 +  82;
 pub const SYS_symlink: ::c_long = 4000 +  83;
-pub const SYS_unused84: ::c_long = 4000 +  84;
 pub const SYS_readlink: ::c_long = 4000 +  85;
 pub const SYS_uselib: ::c_long = 4000 +  86;
 pub const SYS_swapon: ::c_long = 4000 +  87;
@@ -605,7 +600,6 @@ pub const SYS_getitimer: ::c_long = 4000 + 105;
 pub const SYS_stat: ::c_long = 4000 + 106;
 pub const SYS_lstat: ::c_long = 4000 + 107;
 pub const SYS_fstat: ::c_long = 4000 + 108;
-pub const SYS_unused109: ::c_long = 4000 + 109;
 pub const SYS_iopl: ::c_long = 4000 + 110;
 pub const SYS_vhangup: ::c_long = 4000 + 111;
 pub const SYS_idle: ::c_long = 4000 + 112;
@@ -645,7 +639,6 @@ pub const SYS_writev: ::c_long = 4000 + 146;
 pub const SYS_cacheflush: ::c_long = 4000 + 147;
 pub const SYS_cachectl: ::c_long = 4000 + 148;
 pub const SYS_sysmips: ::c_long = 4000 + 149;
-pub const SYS_unused150: ::c_long = 4000 + 150;
 pub const SYS_getsid: ::c_long = 4000 + 151;
 pub const SYS_fdatasync: ::c_long = 4000 + 152;
 pub const SYS__sysctl: ::c_long = 4000 + 153;
@@ -714,7 +707,6 @@ pub const SYS_mincore: ::c_long = 4000 + 217;
 pub const SYS_madvise: ::c_long = 4000 + 218;
 pub const SYS_getdents64: ::c_long = 4000 + 219;
 pub const SYS_fcntl64: ::c_long = 4000 + 220;
-pub const SYS_reserved221: ::c_long = 4000 + 221;
 pub const SYS_gettid: ::c_long = 4000 + 222;
 pub const SYS_readahead: ::c_long = 4000 + 223;
 pub const SYS_setxattr: ::c_long = 4000 + 224;
diff --git a/libc/src/unix/notbsd/linux/musl/b32/x86.rs b/libc/src/unix/notbsd/linux/musl/b32/x86.rs
index b6ea8c1..8bfb60b 100644
--- a/libc/src/unix/notbsd/linux/musl/b32/x86.rs
+++ b/libc/src/unix/notbsd/linux/musl/b32/x86.rs
@@ -116,15 +116,6 @@ s! {
         __private: [u32; 22]
     }
 
-    pub struct ucontext_t {
-        pub uc_flags: ::c_ulong,
-        pub uc_link: *mut ucontext_t,
-        pub uc_stack: ::stack_t,
-        pub uc_mcontext: mcontext_t,
-        pub uc_sigmask: ::sigset_t,
-        __private: [u8; 112],
-    }
-
     pub struct siginfo_t {
         pub si_signo: ::c_int,
         pub si_errno: ::c_int,
@@ -176,6 +167,62 @@ s! {
     }
 }
 
+s_no_extra_traits!{
+    pub struct ucontext_t {
+        pub uc_flags: ::c_ulong,
+        pub uc_link: *mut ucontext_t,
+        pub uc_stack: ::stack_t,
+        pub uc_mcontext: mcontext_t,
+        pub uc_sigmask: ::sigset_t,
+        __private: [u8; 112],
+    }
+}
+
+cfg_if! {
+    if #[cfg(feature = "extra_traits")] {
+        impl PartialEq for ucontext_t {
+            fn eq(&self, other: &ucontext_t) -> bool {
+                self.uc_flags == other.uc_flags
+                    && self.uc_link == other.uc_link
+                    && self.uc_stack == other.uc_stack
+                    && self.uc_mcontext == other.uc_mcontext
+                    && self.uc_sigmask == other.uc_sigmask
+                    && self
+                    .__private
+                    .iter()
+                    .zip(other.__private.iter())
+                    .all(|(a,b)| a == b)
+            }
+        }
+
+        impl Eq for ucontext_t {}
+
+        impl ::fmt::Debug for ucontext_t {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("ucontext_t")
+                    .field("uc_flags", &self.uc_flags)
+                    .field("uc_link", &self.uc_link)
+                    .field("uc_stack", &self.uc_stack)
+                    .field("uc_mcontext", &self.uc_mcontext)
+                    .field("uc_sigmask", &self.uc_sigmask)
+                // Ignore __private field
+                    .finish()
+            }
+        }
+
+        impl ::hash::Hash for ucontext_t {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.uc_flags.hash(state);
+                self.uc_link.hash(state);
+                self.uc_stack.hash(state);
+                self.uc_mcontext.hash(state);
+                self.uc_sigmask.hash(state);
+                self.__private.hash(state);
+            }
+        }
+    }
+}
+
 pub const SIGSTKSZ: ::size_t = 8192;
 pub const MINSIGSTKSZ: ::size_t = 2048;