mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-13 06:40:09 +00:00
7553131847
glibc defines the stack_t type with the tag struct sigaltstack. This is not permitted by POSIX; sigaltstack is only reserved with file scope in the namespace of ordinary identifiers, not the tag namespace, and in the case where stack_t is obtained from ucontext.h rather than signal.h, it's not reserved with file scope at all. This patch removes the tag accordingly and updates uses in glibc of struct sigaltstack. This is similar to the removal of the "struct siginfo" tag a few years ago: C++ name mangling changes are an unavoidable consequence. A NEWS item is added to note the changed mangling. There is inevitably some risk of breaking builds of anything that relies on the struct sigaltstack name (though the first few hits I looked at from codesearch.debian.net generally seemed to involve code that could use the stack_t name conditionally, so depending on how they determine the conditionals they may work with glibc not defining the struct tag anyway). Tested for x86_64 and x86, and with build-many-glibcs.py. [BZ #21517] * bits/types/stack_t.h (stack_t): Remove struct tag. * sysdeps/unix/sysv/linux/bits/types/stack_t.h (stack_t): Likewise. * sysdeps/unix/sysv/linux/mips/bits/types/stack_t.h (stack_t): Likewise. * debug/segfault.c (install_handler): Use stack_t instead of struct sigaltstack. * hurd/hurd/signal.h (struct hurd_sigstate): Likewise. * hurd/trampoline.c (_hurd_setup_sighandler): Likewise. * include/signal.h (__sigaltstack): Likwise. * signal/sigaltstack.c (__sigaltstack): Likewise. * signal/signal.h (sigaltstack): Likewise. * sysdeps/mach/hurd/i386/signal-defines.sym (SIGALTSTACK__SS_SP__OFFSET): Likewise. (SIGALTSTACK__SS_SIZE__OFFSET): Likewise. (SIGALTSTACK__SS_FLAGS__OFFSET): Likewise. * sysdeps/mach/hurd/sigaltstack.c (__sigaltstack): Likewise. * sysdeps/mach/hurd/sigstack.c (sigstack): Likewise. * sysdeps/unix/sysv/linux/alpha/sys/procfs.h (struct elf_prstatus): Likewise. * sysdeps/unix/sysv/linux/hppa/____longjmp_chk.c (CHECK_SP): Likewise. * sysdeps/unix/sysv/linux/ia64/sys/procfs.h (struct elf_prstatus): Likewise. * sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c (CHECK_SP): Likewise. * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h (struct elf_prstatus): Likewise. * sysdeps/unix/sysv/linux/sh/sys/procfs.h (struct elf_prstatus): Likewise. * sysdeps/unix/sysv/linux/sys/procfs.h (struct elf_prstatus): Likewise.
128 lines
4.1 KiB
C
128 lines
4.1 KiB
C
/* Copyright (C) 1996-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 <sys/user.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/*
|
|
* The OSF/1 version of <sys/procfs.h> makes gregset_t 46 entries long.
|
|
* I have no idea why that is so. For now, we just leave it at 33
|
|
* (32 general regs + processor status word).
|
|
*/
|
|
#define ELF_NGREG 33
|
|
#define ELF_NFPREG 32
|
|
|
|
typedef unsigned long elf_greg_t;
|
|
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
|
|
|
|
typedef double elf_fpreg_t;
|
|
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
|
|
|
|
struct elf_siginfo
|
|
{
|
|
int si_signo; /* Signal number. */
|
|
int si_code; /* Extra code. */
|
|
int si_errno; /* Errno. */
|
|
};
|
|
|
|
/* 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 */
|