From d62f9ec0cce26a275ec68f4564814041a33395b1 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 25 Sep 2018 16:50:30 +0000 Subject: Complete sys/procfs.h unification. This patch completes the process of unifying sys/procfs.h headers for architectures using the Linux kernel by making alpha use the generic version. That was previously deferred because alpha has different definitions of prgregset_t and prfpregset_t from other architectures, so changing to the common definitions would change C++ name mangling. To avoid such a change, a header bits/procfs-prregset.h is added, and alpha gets its own version of that header. Tested for x86_64 and x86, and with build-many-glibcs.py. * sysdeps/unix/sysv/linux/sys/procfs.h: Include . (prgregset_t): Define using __prgregset_t. (prfpregset_t): Define using __prfpregset_t. * sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc] (sysdep_headers): Add bits/procfs-prregset.h. * sysdeps/unix/sysv/linux/bits/procfs-prregset.h: New file. * sysdeps/unix/sysv/linux/alpha/bits/procfs-prregset.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sys/procfs.h: Remove file. --- .../unix/sysv/linux/alpha/bits/procfs-prregset.h | 25 ++++++++++++++ sysdeps/unix/sysv/linux/alpha/bits/procfs.h | 38 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/alpha/bits/procfs-prregset.h create mode 100644 sysdeps/unix/sysv/linux/alpha/bits/procfs.h (limited to 'sysdeps/unix/sysv/linux/alpha/bits') diff --git a/sysdeps/unix/sysv/linux/alpha/bits/procfs-prregset.h b/sysdeps/unix/sysv/linux/alpha/bits/procfs-prregset.h new file mode 100644 index 0000000000..2f17e62a3f --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/bits/procfs-prregset.h @@ -0,0 +1,25 @@ +/* Types of prgregset_t and prfpregset_t. Alpha 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 + . */ + +#ifndef _SYS_PROCFS_H +# error "Never include directly; use instead." +#endif + +typedef gregset_t __prgregset_t; +typedef fpregset_t __prfpregset_t; diff --git a/sysdeps/unix/sysv/linux/alpha/bits/procfs.h b/sysdeps/unix/sysv/linux/alpha/bits/procfs.h new file mode 100644 index 0000000000..4e7790b2ed --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/bits/procfs.h @@ -0,0 +1,38 @@ +/* Types for registers for sys/procfs.h. Alpha 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 + . */ + +#ifndef _SYS_PROCFS_H +# error "Never include directly; use instead." +#endif + +#include +#include + +/* + * The OSF/1 version of 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]; -- cgit 1.4.1