diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-23 23:07:36 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-23 23:07:36 +0800 |
| commit | 126601dd3f5303b50033dcb88945d928aa764aa4 (patch) | |
| tree | 36f80c2aaa18e794fc65cd4a756a28146bd50b5e /libc/kernel/arch-x86/asm/signal.h | |
| parent | eaae81082cb76efa43a2c3fb57997b28ca270634 (diff) | |
| download | android_bionic-126601dd3f5303b50033dcb88945d928aa764aa4.tar.gz android_bionic-126601dd3f5303b50033dcb88945d928aa764aa4.tar.bz2 android_bionic-126601dd3f5303b50033dcb88945d928aa764aa4.zip | |
Fixed to #include correct 32-bit headers; Refreshed libc/kernel headers
This patch fixes an issue where 64-bit hreaders are incorrectly included
in kernel headers. For example, file "libc/kernel/arch-x86/asm/io.h"
incorreclty includes "io_64.h" (missing, BTW) instead of "io_32.h".
The reason is because CONFIG_X86_32 isn't considered pre-defined in
"kernel_default_arch_macros" for x86, and clean_header.py doesn't
look at it at all anyway (ie. __i386__ is also ignored, but it's
okay since x86 cross compiler defines it back)
Fixed 2 tools/*py, README.TXT, and refreshed libc/kernel headers
Change-Id: Iac834cc8b3548f055d3f2a214af36072dd679fe8
Diffstat (limited to 'libc/kernel/arch-x86/asm/signal.h')
| -rw-r--r-- | libc/kernel/arch-x86/asm/signal.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/libc/kernel/arch-x86/asm/signal.h b/libc/kernel/arch-x86/asm/signal.h index a15028c57..1c8f2f640 100644 --- a/libc/kernel/arch-x86/asm/signal.h +++ b/libc/kernel/arch-x86/asm/signal.h @@ -93,35 +93,20 @@ typedef unsigned long sigset_t; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #include <asm-generic/signal.h> #ifndef __ASSEMBLY__ -#ifdef __i386__ struct sigaction { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ union { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __sighandler_t _sa_handler; void (*_sa_sigaction)(int, struct siginfo *, void *); } _u; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ sigset_t sa_mask; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned long sa_flags; void (*sa_restorer)(void); }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define sa_handler _u._sa_handler -#define sa_sigaction _u._sa_sigaction -#else -struct sigaction { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - __sighandler_t sa_handler; - unsigned long sa_flags; - __sigrestore_t sa_restorer; - sigset_t sa_mask; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -}; -struct k_sigaction { - struct sigaction sa; -}; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#endif +#define sa_sigaction _u._sa_sigaction typedef struct sigaltstack { void __user *ss_sp; int ss_flags; |