mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	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.
		
			
				
	
	
		
			145 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			145 lines
		
	
	
		
			3.7 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/>.  */
 | 
						|
 | 
						|
/* System V/ARM ABI compliant context switching support.  */
 | 
						|
 | 
						|
#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
 | 
						|
 | 
						|
#ifdef __USE_MISC
 | 
						|
typedef int greg_t;
 | 
						|
 | 
						|
/* Number of general registers.  */
 | 
						|
# define NGREG	18
 | 
						|
 | 
						|
/* Container for all general registers.  */
 | 
						|
typedef greg_t gregset_t[NGREG];
 | 
						|
 | 
						|
/* Number of each register is the `gregset_t' array.  */
 | 
						|
enum
 | 
						|
{
 | 
						|
  REG_R0 = 0,
 | 
						|
# define REG_R0	REG_R0
 | 
						|
  REG_R1 = 1,
 | 
						|
# define REG_R1	REG_R1
 | 
						|
  REG_R2 = 2,
 | 
						|
# define REG_R2	REG_R2
 | 
						|
  REG_R3 = 3,
 | 
						|
# define REG_R3	REG_R3
 | 
						|
  REG_R4 = 4,
 | 
						|
# define REG_R4	REG_R4
 | 
						|
  REG_R5 = 5,
 | 
						|
# define REG_R5	REG_R5
 | 
						|
  REG_R6 = 6,
 | 
						|
# define REG_R6	REG_R6
 | 
						|
  REG_R7 = 7,
 | 
						|
# define REG_R7	REG_R7
 | 
						|
  REG_R8 = 8,
 | 
						|
# define REG_R8	REG_R8
 | 
						|
  REG_R9 = 9,
 | 
						|
# define REG_R9	REG_R9
 | 
						|
  REG_R10 = 10,
 | 
						|
# define REG_R10	REG_R10
 | 
						|
  REG_R11 = 11,
 | 
						|
# define REG_R11	REG_R11
 | 
						|
  REG_R12 = 12,
 | 
						|
# define REG_R12	REG_R12
 | 
						|
  REG_R13 = 13,
 | 
						|
# define REG_R13	REG_R13
 | 
						|
  REG_R14 = 14,
 | 
						|
# define REG_R14	REG_R14
 | 
						|
  REG_R15 = 15
 | 
						|
# define REG_R15	REG_R15
 | 
						|
};
 | 
						|
 | 
						|
struct _libc_fpstate
 | 
						|
{
 | 
						|
  struct
 | 
						|
  {
 | 
						|
    unsigned int sign1:1;
 | 
						|
    unsigned int unused:15;
 | 
						|
    unsigned int sign2:1;
 | 
						|
    unsigned int exponent:14;
 | 
						|
    unsigned int j:1;
 | 
						|
    unsigned int mantissa1:31;
 | 
						|
    unsigned int mantissa0:32;
 | 
						|
  } fpregs[8];
 | 
						|
  unsigned int fpsr:32;
 | 
						|
  unsigned int fpcr:32;
 | 
						|
  unsigned char ftype[8];
 | 
						|
  unsigned int init_flag;
 | 
						|
};
 | 
						|
/* Structure to describe FPU registers.  */
 | 
						|
typedef struct _libc_fpstate fpregset_t;
 | 
						|
#endif
 | 
						|
 | 
						|
/* Context to describe whole processor state.  This only describes
 | 
						|
   the core registers; coprocessor registers get saved elsewhere
 | 
						|
   (e.g. in uc_regspace, or somewhere unspecified on the stack
 | 
						|
   during non-RT signal handlers).  */
 | 
						|
typedef struct
 | 
						|
  {
 | 
						|
    unsigned long int __ctx(trap_no);
 | 
						|
    unsigned long int __ctx(error_code);
 | 
						|
    unsigned long int __ctx(oldmask);
 | 
						|
    unsigned long int __ctx(arm_r0);
 | 
						|
    unsigned long int __ctx(arm_r1);
 | 
						|
    unsigned long int __ctx(arm_r2);
 | 
						|
    unsigned long int __ctx(arm_r3);
 | 
						|
    unsigned long int __ctx(arm_r4);
 | 
						|
    unsigned long int __ctx(arm_r5);
 | 
						|
    unsigned long int __ctx(arm_r6);
 | 
						|
    unsigned long int __ctx(arm_r7);
 | 
						|
    unsigned long int __ctx(arm_r8);
 | 
						|
    unsigned long int __ctx(arm_r9);
 | 
						|
    unsigned long int __ctx(arm_r10);
 | 
						|
    unsigned long int __ctx(arm_fp);
 | 
						|
    unsigned long int __ctx(arm_ip);
 | 
						|
    unsigned long int __ctx(arm_sp);
 | 
						|
    unsigned long int __ctx(arm_lr);
 | 
						|
    unsigned long int __ctx(arm_pc);
 | 
						|
    unsigned long int __ctx(arm_cpsr);
 | 
						|
    unsigned long int __ctx(fault_address);
 | 
						|
  } mcontext_t;
 | 
						|
 | 
						|
/* Userlevel context.  */
 | 
						|
typedef struct ucontext_t
 | 
						|
  {
 | 
						|
    unsigned long __ctx(uc_flags);
 | 
						|
    struct ucontext_t *uc_link;
 | 
						|
    stack_t uc_stack;
 | 
						|
    mcontext_t uc_mcontext;
 | 
						|
    sigset_t uc_sigmask;
 | 
						|
    unsigned long __ctx(uc_regspace)[128] __attribute__((__aligned__(8)));
 | 
						|
  } ucontext_t;
 | 
						|
 | 
						|
#undef __ctx
 | 
						|
 | 
						|
#endif /* sys/ucontext.h */
 |