generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 7ca4d736: am 53e70fe3: Merge "Remove unnecessary padding in ucontext_t"

Browse Source 
* commit '7ca4d73644284a7ffce83ba62923e46c0a29ab64':
  Remove unnecessary padding in ucontext_t
This commit is contained in:
Calin Juravle 2014-05-28 17:54:08 +00:00 committed by Android Git Automerger
commit c3f228103f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libc/include/sys/ucontext.h
View File

@ -68,8 +68,13 @@ typedef struct ucontext {
struct ucontext* uc_link; struct ucontext* uc_link;
stack_t uc_stack; stack_t uc_stack;
mcontext_t uc_mcontext; mcontext_t uc_mcontext;
sigset_t uc_sigmask; // Android has a wrong (smaller) sigset_t on ARM.
char __padding[128 - sizeof(sigset_t)]; union {
sigset_t bionic;
uint32_t kernel[2];
} uc_sigmask;
// 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))); unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
} ucontext_t; } ucontext_t;
@ -83,6 +88,7 @@ typedef struct ucontext {
struct ucontext *uc_link; struct ucontext *uc_link;
stack_t uc_stack; stack_t uc_stack;
sigset_t uc_sigmask; sigset_t uc_sigmask;
// The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM64.
char __padding[128 - sizeof(sigset_t)]; char __padding[128 - sizeof(sigset_t)];
mcontext_t uc_mcontext; mcontext_t uc_mcontext;
} ucontext_t; } ucontext_t;
@ -146,8 +152,11 @@ typedef struct ucontext {
struct ucontext* uc_link; struct ucontext* uc_link;
stack_t uc_stack; stack_t uc_stack;
mcontext_t uc_mcontext; mcontext_t uc_mcontext;
sigset_t uc_sigmask; // Android has a wrong (smaller) sigset_t on x86.
char __padding[128 - sizeof(sigset_t)]; union {
sigset_t bionic;
uint32_t kernel[2];
} uc_sigmask;
struct _libc_fpstate __fpregs_mem; struct _libc_fpstate __fpregs_mem;
} ucontext_t; } ucontext_t;
@ -198,7 +207,6 @@ typedef struct ucontext {
stack_t uc_stack; stack_t uc_stack;
mcontext_t uc_mcontext; mcontext_t uc_mcontext;
sigset_t uc_sigmask; sigset_t uc_sigmask;
char __padding[128 - sizeof(sigset_t)];
} ucontext_t; } ucontext_t;
#elif defined(__mips64__) #elif defined(__mips64__)
@ -275,7 +283,6 @@ typedef struct ucontext {
stack_t uc_stack; stack_t uc_stack;
mcontext_t uc_mcontext; mcontext_t uc_mcontext;
sigset_t uc_sigmask; sigset_t uc_sigmask;
char __padding[128 - sizeof(sigset_t)];
struct _libc_fpstate __fpregs_mem; struct _libc_fpstate __fpregs_mem;
} ucontext_t; } ucontext_t;