From c124baaf29a948fd8b93e7f1fefc20b659271026 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Thu, 12 Jul 2012 19:06:15 +0200 Subject: libc: Provide ucontext_t/mcontext_t/ This patch updates the C library headers to provide ucontext_t definitions for three architectures. + Fix to always define 'struct sigcontext'. The new declarations are announced with new macros defined in in order to make it easier to adapt client code that already defines its own, incompatible, versions of the structures seen here. http://code.google.com/p/android/issues/detail?id=34784 Change-Id: Ie78c48690a4ce61c50593f6c39639be7fead3596 --- libc/arch-x86/include/machine/signal.h | 67 ++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 libc/arch-x86/include/machine/signal.h (limited to 'libc/arch-x86/include/machine/signal.h') diff --git a/libc/arch-x86/include/machine/signal.h b/libc/arch-x86/include/machine/signal.h new file mode 100644 index 0000000..ba3fe37 --- /dev/null +++ b/libc/arch-x86/include/machine/signal.h @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#ifndef _ARCH_X86_MACHINE_SIGNAL_H_ +#define _ARCH_X86_MACHINE_SIGNAL_H_ + +#include +#include +#include + +__BEGIN_DECLS + +#include +#include + +#ifdef _ASM_GENERIC_SIGINFO_H +#error "You cannot include before !" +#endif +#define __ARCH_SI_UID_T __kernel_uid32_t +#include +#undef __ARCH_SI_UID_T + +#include + +/* See comment in arch-arm/include/machine/signal.h. + * The x86 kernel also uses 64-bit signal masks while defining sigset-t + * as a 32-bit type. + */ +typedef unsigned long __kernel_sigset_t[2]; + +/* _NSIG is used by the SIGRTMAX definition under , however + * its definition is part of a #if __KERNEL__ .. #endif block in the original + * kernel headers and is thus not part of our cleaned-up versions. + * + * Looking at the current kernel sources, it is defined as 64 for x86. + */ +#ifndef _NSIG +# define _NSIG 64 +#endif + +__END_DECLS + +#endif /* _ARCH_X86_MACHINE_SIGNAL_H_ */ -- cgit v1.1