mirror of
https://sourceware.org/git/glibc.git
synced 2025-05-07 07:21:47 +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.
131 lines
4.1 KiB
C
131 lines
4.1 KiB
C
/* Copyright (C) 1999-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_PROCFS_H
|
|
#define _SYS_PROCFS_H 1
|
|
|
|
/* This is somehow modelled after the file of the same name on SysVr4
|
|
systems. It provides a definition of the core file format for ELF
|
|
used on Linux. */
|
|
|
|
#include <features.h>
|
|
#include <signal.h>
|
|
#include <sys/time.h>
|
|
#include <sys/types.h>
|
|
#include <sys/ucontext.h>
|
|
#include <bits/sigcontext.h>
|
|
#include <sys/user.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
struct elf_siginfo
|
|
{
|
|
int si_signo; /* Signal number. */
|
|
int si_code; /* Extra code. */
|
|
int si_errno; /* Errno. */
|
|
};
|
|
|
|
/* We really need just 72 but let's leave some headroom... */
|
|
#define ELF_NGREG 128
|
|
/* f0 and f1 could be omitted, but so what... */
|
|
#define ELF_NFPREG 128
|
|
|
|
typedef unsigned long elf_greg_t;
|
|
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
|
|
|
|
typedef struct __ia64_fpreg elf_fpreg_t;
|
|
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
|
|
|
|
typedef elf_greg_t greg_t;
|
|
typedef elf_gregset_t gregset_t;
|
|
typedef elf_fpregset_t fpregset_t;
|
|
#define NGREG ELF_NGREG
|
|
|
|
/* Definitions to generate Intel SVR4-like core files. These mostly
|
|
have the same names as the SVR4 types with "elf_" tacked on the
|
|
front to prevent clashes with linux definitions, and the typedef
|
|
forms have been avoided. This is mostly like the SVR4 structure,
|
|
but more Linuxy, with things that Linux does not support and which
|
|
gdb doesn't really use excluded. Fields present but not used are
|
|
marked with "XXX". */
|
|
struct elf_prstatus
|
|
{
|
|
#if 0
|
|
long int pr_flags; /* XXX Process flags. */
|
|
short int pr_why; /* XXX Reason for process halt. */
|
|
short int pr_what; /* XXX More detailed reason. */
|
|
#endif
|
|
struct elf_siginfo pr_info; /* Info associated with signal. */
|
|
short int pr_cursig; /* Current signal. */
|
|
unsigned long int pr_sigpend; /* Set of pending signals. */
|
|
unsigned long int pr_sighold; /* Set of held signals. */
|
|
#if 0
|
|
stack_t pr_altstack; /* Alternate stack info. */
|
|
struct sigaction pr_action; /* Signal action for current sig. */
|
|
#endif
|
|
__pid_t pr_pid;
|
|
__pid_t pr_ppid;
|
|
__pid_t pr_pgrp;
|
|
__pid_t pr_sid;
|
|
struct timeval pr_utime; /* User time. */
|
|
struct timeval pr_stime; /* System time. */
|
|
struct timeval pr_cutime; /* Cumulative user time. */
|
|
struct timeval pr_cstime; /* Cumulative system time. */
|
|
#if 0
|
|
long int pr_instr; /* Current instruction. */
|
|
#endif
|
|
elf_gregset_t pr_reg; /* GP registers. */
|
|
int pr_fpvalid; /* True if math copro being used. */
|
|
};
|
|
|
|
|
|
#define ELF_PRARGSZ (80) /* Number of chars for args */
|
|
|
|
struct elf_prpsinfo
|
|
{
|
|
char pr_state; /* Numeric process state. */
|
|
char pr_sname; /* Char for pr_state. */
|
|
char pr_zomb; /* Zombie. */
|
|
char pr_nice; /* Nice val. */
|
|
unsigned long int pr_flag; /* Flags. */
|
|
unsigned int pr_uid;
|
|
unsigned int pr_gid;
|
|
int pr_pid, pr_ppid, pr_pgrp, pr_sid;
|
|
/* Lots missing */
|
|
char pr_fname[16]; /* Filename of executable. */
|
|
char pr_psargs[ELF_PRARGSZ]; /* Initial part of arg list. */
|
|
};
|
|
|
|
/* Addresses. */
|
|
typedef void *psaddr_t;
|
|
|
|
/* Register sets. Linux has different names. */
|
|
typedef gregset_t prgregset_t;
|
|
typedef fpregset_t prfpregset_t;
|
|
|
|
/* We don't have any differences between processes and threads,
|
|
therefore habe only ine PID type. */
|
|
typedef __pid_t lwpid_t;
|
|
|
|
|
|
typedef struct elf_prstatus prstatus_t;
|
|
typedef struct elf_prpsinfo prpsinfo_t;
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/procfs.h */
|