mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Unify more sys/procfs.h headers.
This patch continues the process of unifying sys/procfs.h headers for architectures using the Linux kernel. A bits/procfs-id.h header is added to define __pr_uid_t and __pr_gid_t for the types of pr_uid and pr_gid; the default version of this header uses unsigned int. On some architectures, sys/procfs.h has copies of 32-bit structures for 64-bit builds; those move into a bits/procfs-extra.h header (they can't go in bits/procfs.h because they have to come *after* other declarations from sys/procfs.h). Given appropriate versions of these headers, six more architectures can then move to providing only bits/procfs*.h without duplicating the rest of the contents of sys/procfs.h. Only alpha needs a further bits/ header to be added before it can stop having its own sys/procfs.h. Tested for x86_64 and x86, and with build-many-glibcs.py. * sysdeps/unix/sysv/linux/sys/procfs.h: Include <bits/procfs-id.h> and <bits/procfs-extra.h>. (struct elf_prpsinfo): Use __pr_uid_t and __pr_gid_t as types of pr_uid and pr_gid. * sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc] (sysdep_headers): Add bits/procfs-id.h and bits/procfs-extra.h. * sysdeps/unix/sysv/linux/bits/procfs-extra.h: New file. * sysdeps/unix/sysv/linux/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs-extra.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs-extra.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/arm/sys/procfs.h: Remove file. * sysdeps/unix/sysv/linux/m68k/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/s390/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sh/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/x86/sys/procfs.h: Likewise.
This commit is contained in:
Joseph Myers
88
sysdeps/unix/sysv/linux/sparc/bits/procfs-extra.h
Normal file
88
sysdeps/unix/sysv/linux/sparc/bits/procfs-extra.h
Normal file
@ -0,0 +1,88 @@
|
||||
/* Extra sys/procfs.h definitions. SPARC version.
|
||||
Copyright (C) 1996-2018 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
|
||||
# error "Never include <bits/procfs-extra.h> directly; use <sys/procfs.h> instead."
|
||||
#endif
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
|
||||
/* Provide 32-bit variants so that BFD can read 32-bit
|
||||
core files. */
|
||||
#define ELF_NGREG32 38
|
||||
typedef struct
|
||||
{
|
||||
union
|
||||
{
|
||||
unsigned int pr_regs[32];
|
||||
double pr_dregs[16];
|
||||
} pr_fr;
|
||||
unsigned int __glibc_reserved;
|
||||
unsigned int pr_fsr;
|
||||
unsigned char pr_qcnt;
|
||||
unsigned char pr_q_entrysize;
|
||||
unsigned char pr_en;
|
||||
unsigned int pr_q[64];
|
||||
} elf_fpregset_t32;
|
||||
|
||||
typedef unsigned int elf_greg_t32;
|
||||
typedef elf_greg_t32 elf_gregset_t32[ELF_NGREG32];
|
||||
|
||||
struct elf_prstatus32
|
||||
{
|
||||
struct elf_siginfo pr_info; /* Info associated with signal. */
|
||||
short int pr_cursig; /* Current signal. */
|
||||
unsigned int pr_sigpend; /* Set of pending signals. */
|
||||
unsigned int pr_sighold; /* Set of held signals. */
|
||||
__pid_t pr_pid;
|
||||
__pid_t pr_ppid;
|
||||
__pid_t pr_pgrp;
|
||||
__pid_t pr_sid;
|
||||
struct
|
||||
{
|
||||
int tv_sec, tv_usec;
|
||||
} pr_utime, /* User time. */
|
||||
pr_stime, /* System time. */
|
||||
pr_cutime, /* Cumulative user time. */
|
||||
pr_cstime; /* Cumulative system time. */
|
||||
elf_gregset_t32 pr_reg; /* GP registers. */
|
||||
int pr_fpvalid; /* True if math copro being used. */
|
||||
};
|
||||
|
||||
struct elf_prpsinfo32
|
||||
{
|
||||
char pr_state; /* Numeric process state. */
|
||||
char pr_sname; /* Char for pr_state. */
|
||||
char pr_zomb; /* Zombie. */
|
||||
char pr_nice; /* Nice val. */
|
||||
unsigned int pr_flag; /* Flags. */
|
||||
unsigned short int pr_uid;
|
||||
unsigned short 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. */
|
||||
};
|
||||
|
||||
typedef elf_gregset_t32 prgregset32_t;
|
||||
typedef elf_fpregset_t32 prfpregset32_t;
|
||||
|
||||
typedef struct elf_prstatus32 prstatus32_t;
|
||||
typedef struct elf_prpsinfo32 prpsinfo32_t;
|
||||
|
||||
#endif /* sparc64 */
|
||||
30
sysdeps/unix/sysv/linux/sparc/bits/procfs-id.h
Normal file
30
sysdeps/unix/sysv/linux/sparc/bits/procfs-id.h
Normal file
@ -0,0 +1,30 @@
|
||||
/* Types of pr_uid and pr_gid in struct elf_prpsinfo. SPARC version.
|
||||
Copyright (C) 2018 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
|
||||
# error "Never include <bits/procfs-id.h> directly; use <sys/procfs.h> instead."
|
||||
#endif
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
typedef unsigned int __pr_uid_t;
|
||||
typedef unsigned int __pr_gid_t;
|
||||
#else
|
||||
typedef unsigned short int __pr_uid_t;
|
||||
typedef unsigned short int __pr_gid_t;
|
||||
#endif
|
||||
61
sysdeps/unix/sysv/linux/sparc/bits/procfs.h
Normal file
61
sysdeps/unix/sysv/linux/sparc/bits/procfs.h
Normal file
@ -0,0 +1,61 @@
|
||||
/* Types for registers for sys/procfs.h. SPARC version.
|
||||
Copyright (C) 1996-2018 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
|
||||
# error "Never include <bits/procfs.h> directly; use <sys/procfs.h> instead."
|
||||
#endif
|
||||
|
||||
#include <signal.h>
|
||||
#include <sys/ucontext.h>
|
||||
#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
|
||||
#define ELF_NGREG 36
|
||||
|
||||
typedef struct
|
||||
{
|
||||
unsigned long pr_regs[32];
|
||||
unsigned long pr_fsr;
|
||||
unsigned long pr_gsr;
|
||||
unsigned long pr_fprs;
|
||||
} elf_fpregset_t;
|
||||
|
||||
#else /* sparc32 */
|
||||
|
||||
#define ELF_NGREG 38
|
||||
|
||||
typedef struct
|
||||
{
|
||||
union
|
||||
{
|
||||
unsigned long pr_regs[32];
|
||||
double pr_dregs[16];
|
||||
} pr_fr;
|
||||
unsigned long __glibc_reserved;
|
||||
unsigned long pr_fsr;
|
||||
unsigned char pr_qcnt;
|
||||
unsigned char pr_q_entrysize;
|
||||
unsigned char pr_en;
|
||||
unsigned int pr_q[64];
|
||||
} elf_fpregset_t;
|
||||
|
||||
#endif /* sparc32 */
|
||||
|
||||
typedef unsigned long elf_greg_t;
|
||||
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
|
||||
@ -1,210 +0,0 @@
|
||||
/* Copyright (C) 1996-2018 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>
|
||||
#include <bits/wordsize.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
|
||||
#define ELF_NGREG 36
|
||||
|
||||
typedef struct
|
||||
{
|
||||
unsigned long pr_regs[32];
|
||||
unsigned long pr_fsr;
|
||||
unsigned long pr_gsr;
|
||||
unsigned long pr_fprs;
|
||||
} elf_fpregset_t;
|
||||
|
||||
#else /* sparc32 */
|
||||
|
||||
#define ELF_NGREG 38
|
||||
|
||||
typedef struct
|
||||
{
|
||||
union
|
||||
{
|
||||
unsigned long pr_regs[32];
|
||||
double pr_dregs[16];
|
||||
} pr_fr;
|
||||
unsigned long __glibc_reserved;
|
||||
unsigned long pr_fsr;
|
||||
unsigned char pr_qcnt;
|
||||
unsigned char pr_q_entrysize;
|
||||
unsigned char pr_en;
|
||||
unsigned int pr_q[64];
|
||||
} elf_fpregset_t;
|
||||
|
||||
#endif /* sparc32 */
|
||||
|
||||
typedef unsigned long elf_greg_t;
|
||||
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
|
||||
|
||||
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
|
||||
{
|
||||
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. */
|
||||
__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. */
|
||||
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. */
|
||||
#if __WORDSIZE == 64
|
||||
unsigned int pr_uid;
|
||||
unsigned int pr_gid;
|
||||
#else
|
||||
unsigned short int pr_uid;
|
||||
unsigned short int pr_gid;
|
||||
#endif
|
||||
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 elf_gregset_t prgregset_t;
|
||||
typedef elf_fpregset_t prfpregset_t;
|
||||
|
||||
/* We don't have any differences between processes and threads,
|
||||
therefore have only one PID type. */
|
||||
typedef __pid_t lwpid_t;
|
||||
|
||||
|
||||
typedef struct elf_prstatus prstatus_t;
|
||||
typedef struct elf_prpsinfo prpsinfo_t;
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
|
||||
/* Provide 32-bit variants so that BFD can read 32-bit
|
||||
core files. */
|
||||
#define ELF_NGREG32 38
|
||||
typedef struct
|
||||
{
|
||||
union
|
||||
{
|
||||
unsigned int pr_regs[32];
|
||||
double pr_dregs[16];
|
||||
} pr_fr;
|
||||
unsigned int __glibc_reserved;
|
||||
unsigned int pr_fsr;
|
||||
unsigned char pr_qcnt;
|
||||
unsigned char pr_q_entrysize;
|
||||
unsigned char pr_en;
|
||||
unsigned int pr_q[64];
|
||||
} elf_fpregset_t32;
|
||||
|
||||
typedef unsigned int elf_greg_t32;
|
||||
typedef elf_greg_t32 elf_gregset_t32[ELF_NGREG32];
|
||||
|
||||
struct elf_prstatus32
|
||||
{
|
||||
struct elf_siginfo pr_info; /* Info associated with signal. */
|
||||
short int pr_cursig; /* Current signal. */
|
||||
unsigned int pr_sigpend; /* Set of pending signals. */
|
||||
unsigned int pr_sighold; /* Set of held signals. */
|
||||
__pid_t pr_pid;
|
||||
__pid_t pr_ppid;
|
||||
__pid_t pr_pgrp;
|
||||
__pid_t pr_sid;
|
||||
struct
|
||||
{
|
||||
int tv_sec, tv_usec;
|
||||
} pr_utime, /* User time. */
|
||||
pr_stime, /* System time. */
|
||||
pr_cutime, /* Cumulative user time. */
|
||||
pr_cstime; /* Cumulative system time. */
|
||||
elf_gregset_t32 pr_reg; /* GP registers. */
|
||||
int pr_fpvalid; /* True if math copro being used. */
|
||||
};
|
||||
|
||||
struct elf_prpsinfo32
|
||||
{
|
||||
char pr_state; /* Numeric process state. */
|
||||
char pr_sname; /* Char for pr_state. */
|
||||
char pr_zomb; /* Zombie. */
|
||||
char pr_nice; /* Nice val. */
|
||||
unsigned int pr_flag; /* Flags. */
|
||||
unsigned short int pr_uid;
|
||||
unsigned short 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. */
|
||||
};
|
||||
|
||||
typedef elf_gregset_t32 prgregset32_t;
|
||||
typedef elf_fpregset_t32 prfpregset32_t;
|
||||
|
||||
typedef struct elf_prstatus32 prstatus32_t;
|
||||
typedef struct elf_prpsinfo32 prpsinfo32_t;
|
||||
|
||||
#endif /* sparc64 */
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* sys/procfs.h */
|
||||
Reference in New Issue
Block a user