mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-14 07:10:05 +00:00
4fa9b3bfe6
This patch completes the ucontext.h namespace fixes by fixing issues related to the use of struct sigcontext as mcontext_t, and inclusion of <bits/sigcontext.h> even when struct sigcontext is not so used. Inclusion of <bits/sigcontext.h> by <sys/ucontext.h> is removed; the way to get the sigcontext structure is by including <signal.h> (in a context where __USE_MISC is defined); the sysdeps/generic version of sys/ucontext.h keeps the inclusion by necessity, with a comment about how this is not namespace-clean, but the only configuration that used it, MicroBlaze, gets its own version of the header in this patch. Where mcontext_t was typedefed to struct sigcontext, the contents of struct sigcontext are inserted (with appropriate namespace handling to prefix fields with __ when __USE_MISC is not defined); review should check that this has been done correctly in each case, whether the definition of struct sigcontext comes from glibc headers or from the Linux kernel. This changes C++ name mangling on affected architectures (which do not include x86_64/x86). Tested for x86_64, and with build-many-glibcs.py. 2017-08-14 Joseph Myers <joseph@codesourcery.com> [BZ #21457] * sysdeps/arm/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/generic/sys/ucontext.h: Add comment about use of struct sigcontext and namespace requirements. * sysdeps/i386/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/m68k/sys/ucontext.h: Likewise. * sysdeps/mips/sys/ucontext.h: Likewise. Include <bits/types.h>. * sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/aarch64/ucontext_i.sym (oEXTENSION): Use __glibc_reserved1 instead of __reserved. * sysdeps/unix/sysv/linux/alpha/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/alpha/ucontext-offsets.sym: Use mcontext_t instead of struct sigcontext. * sysdeps/unix/sysv/linux/arm/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/hppa/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/ia64/makecontext.c (__makecontext): Use mcontext_t instead of struct sigcontext. * sysdeps/unix/sysv/linux/ia64/sigcontext-offsets.sym: Use mcontext_t instead of struct sigcontext. * sysdeps/unix/sysv/linux/ia64/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): New macro. (struct __ia64_fpreg_mcontext): New type. (mcontext_t): Define structure contents rather than using struct sigcontext. (_SC_GR0_OFFSET): Use mcontext_t instead of struct sigcontext. (uc_sigmask): Define using __ctx. (uc_stack): Likewise. * sysdeps/unix/sysv/linux/ia64/sys/procfs.h: Include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Likewise. * sysdeps/unix/sysv/linux/m68k/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/microblaze/sys/ucontext.h: New file. * sysdeps/unix/sysv/linux/mips/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/nios2/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/s390/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/sh/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/sparc/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/tile/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/x86/sys/ucontext.h: Do not include <bits/sigcontext.h>. Include <bits/types.h>. * conform/Makefile (test-xfail-XPG42/signal.h/conform): Remove. (test-xfail-XPG42/sys/wait.h/conform): Likewise. (test-xfail-XPG42/ucontext.h/conform): Likewise. (test-xfail-UNIX98/signal.h/conform): Likewise. (test-xfail-UNIX98/sys/wait.h/conform): Likewise. (test-xfail-UNIX98/ucontext.h/conform): Likewise. (test-xfail-XOPEN2K/signal.h/conform): Likewise. (test-xfail-XOPEN2K/sys/wait.h/conform): Likewise. (test-xfail-XOPEN2K/ucontext.h/conform): Likewise. (test-xfail-POSIX2008/signal.h/conform): Likewise. (test-xfail-POSIX2008/sys/wait.h/conform): Likewise. (test-xfail-XOPEN2K8/signal.h/conform): Likewise. (test-xfail-XOPEN2K8/sys/wait.h/conform): Likewise.
107 lines
3.0 KiB
C
107 lines
3.0 KiB
C
/* Copyright (C) 1998-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _SYS_UCONTEXT_H
|
|
#define _SYS_UCONTEXT_H 1
|
|
|
|
#include <features.h>
|
|
|
|
#include <bits/types/sigset_t.h>
|
|
#include <bits/types/stack_t.h>
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
# define __ctx(fld) fld
|
|
#else
|
|
# define __ctx(fld) __ ## fld
|
|
#endif
|
|
|
|
/*
|
|
* These are here mostly for backwards compatibility with older Unices.
|
|
* IA-64 Linux does not distinguish between "mcontext_t" and
|
|
* "ucontext_t" as all the necessary info is inside the former.
|
|
*/
|
|
|
|
struct __ia64_fpreg_mcontext
|
|
{
|
|
union
|
|
{
|
|
unsigned long __ctx(bits)[2];
|
|
} __ctx(u);
|
|
} __attribute__ ((__aligned__ (16)));
|
|
|
|
typedef struct
|
|
{
|
|
unsigned long int __ctx(sc_flags);
|
|
unsigned long int __ctx(sc_nat);
|
|
stack_t __ctx(sc_stack);
|
|
unsigned long int __ctx(sc_ip);
|
|
unsigned long int __ctx(sc_cfm);
|
|
unsigned long int __ctx(sc_um);
|
|
unsigned long int __ctx(sc_ar_rsc);
|
|
unsigned long int __ctx(sc_ar_bsp);
|
|
unsigned long int __ctx(sc_ar_rnat);
|
|
unsigned long int __ctx(sc_ar_ccv);
|
|
unsigned long int __ctx(sc_ar_unat);
|
|
unsigned long int __ctx(sc_ar_fpsr);
|
|
unsigned long int __ctx(sc_ar_pfs);
|
|
unsigned long int __ctx(sc_ar_lc);
|
|
unsigned long int __ctx(sc_pr);
|
|
unsigned long int __ctx(sc_br)[8];
|
|
unsigned long int __ctx(sc_gr)[32];
|
|
struct __ia64_fpreg_mcontext __ctx(sc_fr)[128];
|
|
unsigned long int __ctx(sc_rbs_base);
|
|
unsigned long int __ctx(sc_loadrs);
|
|
unsigned long int __ctx(sc_ar25);
|
|
unsigned long int __ctx(sc_ar26);
|
|
unsigned long int __ctx(sc_rsvd)[12];
|
|
unsigned long int __ctx(sc_mask);
|
|
} mcontext_t;
|
|
|
|
#if __GNUC_PREREQ (3, 5)
|
|
# define _SC_GR0_OFFSET \
|
|
__builtin_offsetof (mcontext_t, __ctx(sc_gr)[0])
|
|
#elif defined __GNUC__
|
|
# define _SC_GR0_OFFSET \
|
|
(((char *) &((mcontext_t *) 0)->__ctx(sc_gr)[0]) - (char *) 0)
|
|
#else
|
|
# define _SC_GR0_OFFSET 0xc8 /* pray that this is correct... */
|
|
#endif
|
|
|
|
typedef struct ucontext_t
|
|
{
|
|
union
|
|
{
|
|
mcontext_t _mc;
|
|
struct
|
|
{
|
|
unsigned long _pad[_SC_GR0_OFFSET/8];
|
|
struct ucontext_t *_link; /* this should overlay sc_gr[0] */
|
|
}
|
|
_uc;
|
|
}
|
|
_u;
|
|
}
|
|
ucontext_t;
|
|
|
|
#define uc_mcontext _u._mc
|
|
#define uc_sigmask _u._mc.__ctx(sc_mask)
|
|
#define uc_stack _u._mc.__ctx(sc_stack)
|
|
#define uc_link _u._uc._link
|
|
|
|
#endif /* sys/ucontext.h */
|