commit 95b0c6a9407d7a4084d956e273ad1697550452d3
author Elliott Hughes <enh@google.com> Mon Sep 15 17:17:37 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 15 17:17:37 2014 +0000
tree 5e5d5223d3b1918a569cdcf4f54bb0af3826bd43
parent 2c58104718187ae99ea381a19ce8395b5349fded
parent 26a8eb50a84e131d34d10d5d167d67e9995399bd

Merge "POSIX says <signal.h> gets you ucontext_t."

libc/include/signal.h

diff --git a/libc/include/signal.h b/libc/include/signal.h
index f1849c5..e23e65b 100644
--- a/libc/include/signal.h
+++ b/libc/include/signal.h
@@ -48,6 +48,9 @@
 #  include <linux/signal.h>
 #endif
 
+#include <sys/ucontext.h>
+#define __BIONIC_HAVE_UCONTEXT_T
+
 __BEGIN_DECLS
 
 typedef int sig_atomic_t;

libc/include/sys/ucontext.h

diff --git a/libc/include/sys/ucontext.h b/libc/include/sys/ucontext.h
index f62380d..b8d4d58 100644
--- a/libc/include/sys/ucontext.h
+++ b/libc/include/sys/ucontext.h
@@ -68,11 +68,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on ARM.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
   char __padding[120];
   unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
@@ -152,11 +150,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on x86.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;