summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/ia64
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-09-25 16:48:15 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-09-25 16:48:15 +0000
commit8ea4d2b7d1d358e4e43d09fdc235a75b3a02a5bb (patch)
tree0d8513cffef1e80aab652a0304fa475156c67d6f /sysdeps/unix/sysv/linux/ia64
parentc70271662aa53aee0c4794d480dca6d9ba3ccc3d (diff)
downloadglibc-8ea4d2b7d1d358e4e43d09fdc235a75b3a02a5bb.tar.gz
Unify some sys/procfs.h headers.
As per recent discussions, this patch unifies some of the sys/procfs.h headers for architectures using the Linux kernel, producing a generic version that can hopefully be used by all new architectures as well. The new generic version is based on the AArch64 one. The register definitions, the only part that generally needs to vary by architecture, go in a new bits/procfs.h header (which each architecture using the generic version needs to provide); that header also has any #includes that were in the architecture-specific sys/procfs.h, where those includes went beyond the generic set. The generic version is used for eight architectures where the generic definitions were the same as the architecture-specific ones. (Some of those architectures had #if 0 fields, now removed; some defined types or fields using different type names which were typedefs for the same underlying types.) Six of the remaining architectures with their own sys/procfs.h use unsigned short for pr_uid / pr_gid in some cases; moving those to the generic header will require a bits/ header to define a typedef for the type of those fields. In the case of alpha, the generic sys/procfs.h uses elf_gregset_t (= unsigned long int[33]) to define prgregset_t and elf_fpregset_t (= double[32]) to define prfpregset_t, but the alpha version uses gregset_t (= long int[33]) and fpregset_t (= long int[32]), so avoiding unnecessarily changing the underlying types (and thus C++ name mangling) again means a bits/ header will need to be able to define a different choice for those typedefs. bits/procfs.h is included outside the __BEGIN_DECLS / __END_DECLS pair (whereas the definitions it contains were previously inside that pair in various sys/procfs.h headers), because it sometimes includes other headers and putting those other #includes inside that pair seems risky. Because none of the declarations in bits/procfs.h are of functions or variables or involve function types, I don't think it makes any difference whether they are inside or outside an extern "C" context. Tested with build-many-glibcs.py (again, that does not provide much validation for the correctness of this patch). * sysdeps/unix/sysv/linux/sys/procfs.h: Replace with file based on AArch64 version. Include <bits/procfs.h>. * sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc] (sysdep_headers): Add bits/procfs.h. * sysdeps/unix/sysv/linux/bits/procfs.h: New file. * sysdeps/unix/sysv/linux/aarch64/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/microblaze/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/nios2/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/riscv/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/sys/procfs.h: Remove file. * sysdeps/unix/sysv/linux/hppa/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/ia64/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/microblaze/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/nios2/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/riscv/sys/procfs.h: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/ia64')
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/procfs.h41
-rw-r--r--sysdeps/unix/sysv/linux/ia64/sys/procfs.h130
2 files changed, 41 insertions, 130 deletions
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/procfs.h b/sysdeps/unix/sysv/linux/ia64/bits/procfs.h
new file mode 100644
index 0000000000..48ef48dc58
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ia64/bits/procfs.h
@@ -0,0 +1,41 @@
+/* Types for registers for sys/procfs.h. IA64 version.
+ Copyright (C) 1999-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/sigcontext.h>
+
+/* 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
diff --git a/sysdeps/unix/sysv/linux/ia64/sys/procfs.h b/sysdeps/unix/sysv/linux/ia64/sys/procfs.h
deleted file mode 100644
index c9c30b9270..0000000000
--- a/sysdeps/unix/sysv/linux/ia64/sys/procfs.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright (C) 1999-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 <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 */