mirror of https://gitee.com/Nocallback/glibc.git
Browse Source
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.hjl/pr22053/master
Joseph Myers
9 years ago
29 changed files with 369 additions and 96 deletions
@ -0,0 +1,92 @@ |
|||
/* Data structures for user-level context switching. MicroBlaze version.
|
|||
Copyright (C) 1997-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 |
|||
|
|||
typedef struct |
|||
{ |
|||
struct |
|||
{ |
|||
unsigned long int __ctx(r0); |
|||
unsigned long int __ctx(r1); |
|||
unsigned long int __ctx(r2); |
|||
unsigned long int __ctx(r3); |
|||
unsigned long int __ctx(r4); |
|||
unsigned long int __ctx(r5); |
|||
unsigned long int __ctx(r6); |
|||
unsigned long int __ctx(r7); |
|||
unsigned long int __ctx(r8); |
|||
unsigned long int __ctx(r9); |
|||
unsigned long int __ctx(r10); |
|||
unsigned long int __ctx(r11); |
|||
unsigned long int __ctx(r12); |
|||
unsigned long int __ctx(r13); |
|||
unsigned long int __ctx(r14); |
|||
unsigned long int __ctx(r15); |
|||
unsigned long int __ctx(r16); |
|||
unsigned long int __ctx(r17); |
|||
unsigned long int __ctx(r18); |
|||
unsigned long int __ctx(r19); |
|||
unsigned long int __ctx(r20); |
|||
unsigned long int __ctx(r21); |
|||
unsigned long int __ctx(r22); |
|||
unsigned long int __ctx(r23); |
|||
unsigned long int __ctx(r24); |
|||
unsigned long int __ctx(r25); |
|||
unsigned long int __ctx(r26); |
|||
unsigned long int __ctx(r27); |
|||
unsigned long int __ctx(r28); |
|||
unsigned long int __ctx(r29); |
|||
unsigned long int __ctx(r30); |
|||
unsigned long int __ctx(r31); |
|||
unsigned long int __ctx(pc); |
|||
unsigned long int __ctx(msr); |
|||
unsigned long int __ctx(ear); |
|||
unsigned long int __ctx(esr); |
|||
unsigned long int __ctx(fsr); |
|||
int __ctx(pt_mode); |
|||
} __ctx(regs); |
|||
unsigned long int __ctx(oldmask); |
|||
} mcontext_t; |
|||
|
|||
/* Userlevel context. */ |
|||
typedef struct ucontext_t |
|||
{ |
|||
unsigned long int __ctx(uc_flags); |
|||
struct ucontext_t *uc_link; |
|||
stack_t uc_stack; |
|||
mcontext_t uc_mcontext; |
|||
sigset_t uc_sigmask; |
|||
} ucontext_t; |
|||
|
|||
#undef __ctx |
|||
|
|||
#endif /* sys/ucontext.h */ |
|||
Loading…
Reference in new issue