[6/7] sysvipc: Remove the linux shm-pad.h file
Commit Message
Each architecture overrides the struct msqid_ds which its required
kernel ABI one.
Checked on x86_64-linux-gnu and some bases sysvipc tests on hppa,
mips, mipsle, mips64, mips64le, sparc64, sparcv9, powerpc64le,
powerpc64, and powerpc.
---
sysdeps/unix/sysv/linux/Makefile | 2 +-
sysdeps/unix/sysv/linux/bits/shm-pad.h | 37 --------------
sysdeps/unix/sysv/linux/bits/shm.h | 1 -
.../sysv/linux/bits/types/struct_shmid_ds.h | 34 +++++--------
sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h | 28 -----------
.../linux/hppa/bits/types/struct_shmid_ds.h | 46 +++++++++++++++++
sysdeps/unix/sysv/linux/mips/bits/shm-pad.h | 26 ----------
.../linux/mips/bits/types/struct_shmid_ds.h | 49 +++++++++++++++++++
.../unix/sysv/linux/powerpc/bits/shm-pad.h | 28 -----------
.../powerpc/bits/types/struct_shmid_ds.h | 46 +++++++++++++++++
sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h | 28 -----------
.../linux/sparc/bits/types/struct_shmid_ds.h | 45 +++++++++++++++++
12 files changed, 198 insertions(+), 172 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/bits/shm-pad.h
delete mode 100644 sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/types/struct_shmid_ds.h
delete mode 100644 sysdeps/unix/sysv/linux/mips/bits/shm-pad.h
create mode 100644 sysdeps/unix/sysv/linux/mips/bits/types/struct_shmid_ds.h
delete mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
create mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h
delete mode 100644 sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/types/struct_shmid_ds.h
Comments
On 6/30/20 3:24 PM, Adhemerval Zanella via Libc-alpha wrote:
> Each architecture overrides the struct msqid_ds which its required
> kernel ABI one.
OK for master.
No regressions on x86_64 and i686.
Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> Checked on x86_64-linux-gnu and some bases sysvipc tests on hppa,
> mips, mipsle, mips64, mips64le, sparc64, sparcv9, powerpc64le,
> powerpc64, and powerpc.
> ---
> sysdeps/unix/sysv/linux/Makefile | 2 +-
> sysdeps/unix/sysv/linux/bits/shm-pad.h | 37 --------------
> sysdeps/unix/sysv/linux/bits/shm.h | 1 -
> .../sysv/linux/bits/types/struct_shmid_ds.h | 34 +++++--------
> sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h | 28 -----------
> .../linux/hppa/bits/types/struct_shmid_ds.h | 46 +++++++++++++++++
> sysdeps/unix/sysv/linux/mips/bits/shm-pad.h | 26 ----------
> .../linux/mips/bits/types/struct_shmid_ds.h | 49 +++++++++++++++++++
> .../unix/sysv/linux/powerpc/bits/shm-pad.h | 28 -----------
> .../powerpc/bits/types/struct_shmid_ds.h | 46 +++++++++++++++++
> sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h | 28 -----------
> .../linux/sparc/bits/types/struct_shmid_ds.h | 45 +++++++++++++++++
> 12 files changed, 198 insertions(+), 172 deletions(-)
> delete mode 100644 sysdeps/unix/sysv/linux/bits/shm-pad.h
> delete mode 100644 sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
> create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/types/struct_shmid_ds.h
> delete mode 100644 sysdeps/unix/sysv/linux/mips/bits/shm-pad.h
> create mode 100644 sysdeps/unix/sysv/linux/mips/bits/types/struct_shmid_ds.h
> delete mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
> create mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h
> delete mode 100644 sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
> create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/types/struct_shmid_ds.h
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index bdd187af73..fd0c313041 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -85,7 +85,7 @@ sysdep_headers += sys/mount.h sys/acct.h \
> bits/siginfo-arch.h bits/siginfo-consts-arch.h \
> bits/procfs.h bits/procfs-id.h bits/procfs-extra.h \
> bits/procfs-prregset.h bits/mman-map-flags-generic.h \
> - bits/shmlba.h bits/shm-pad.h \
> + bits/shmlba.h \
OK. Remove shm-pad.h.
> bits/termios-struct.h bits/termios-c_cc.h \
> bits/termios-c_iflag.h bits/termios-c_oflag.h \
> bits/termios-baud.h bits/termios-c_cflag.h \
> diff --git a/sysdeps/unix/sysv/linux/bits/shm-pad.h b/sysdeps/unix/sysv/linux/bits/shm-pad.h
> deleted file mode 100644
> index 565e0e344b..0000000000
> --- a/sysdeps/unix/sysv/linux/bits/shm-pad.h
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -/* Define where padding goes in struct shmid_ds. Generic version.
> - Copyright (C) 2018-2020 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
> - <https://www.gnu.org/licenses/>. */
> -
> -#ifndef _SYS_SHM_H
> -# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -/* On most architectures, padding goes after time fields for 32-bit
> - systems and is omitted for 64-bit systems. Some architectures pad
> - before time fields instead, or omit padding despite being 32-bit,
> - or include it despite being 64-bit. Furthermore, some
> - architectures place shm_segsz after the time fields rather than
> - before them, with or without padding there. This must match the
> - layout used for struct shmid64_ds in <asm/shmbuf.h>, as glibc does
> - not do layout conversions for this structure. */
> -
> -#define __SHM_PAD_AFTER_TIME (__TIMESIZE == 32)
> -#define __SHM_PAD_BEFORE_TIME 0
> -#define __SHM_SEGSZ_AFTER_TIME 0
> -#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0
OK. Remove this padding, but now we'll have to define it explicilty for each arch
which in many ways is cleaner.
> diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h
> index 9ef6aeaf92..f6aefa17f2 100644
> --- a/sysdeps/unix/sysv/linux/bits/shm.h
> +++ b/sysdeps/unix/sysv/linux/bits/shm.h
> @@ -22,7 +22,6 @@
> #include <bits/types.h>
> #include <bits/wordsize.h>
> #include <bits/shmlba.h>
> -#include <bits/shm-pad.h>
>
> /* Permission flag for shmget. */
> #define SHM_R 0400 /* or S_IRUGO from <linux/stat.h> */
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
> index 938bbedfcd..61ed4a08c3 100644
> --- a/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_shmid_ds.h
> @@ -20,34 +20,22 @@
> # error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
> #endif
>
> -#include <bits/shm-pad.h>
> -
> -#if __SHM_PAD_BEFORE_TIME
> -# define __SHM_PAD_TIME(NAME, RES) \
> - unsigned long int __glibc_reserved ## RES; __time_t NAME
> -#elif __SHM_PAD_AFTER_TIME
> -# define __SHM_PAD_TIME(NAME, RES) \
> - __time_t NAME; unsigned long int __glibc_reserved ## RES
> -#else
> -# define __SHM_PAD_TIME(NAME, RES) \
> - __time_t NAME
> -#endif
> -
> /* Data structure describing a shared memory segment. */
> struct shmid_ds
> {
> struct ipc_perm shm_perm; /* operation permission struct */
> -#if !__SHM_SEGSZ_AFTER_TIME
> - size_t shm_segsz; /* size of segment in bytes */
> -#endif
> - __SHM_PAD_TIME (shm_atime, 1); /* time of last shmat() */
> - __SHM_PAD_TIME (shm_dtime, 2); /* time of last shmdt() */
> - __SHM_PAD_TIME (shm_ctime, 3); /* time of last change by shmctl() */
> -#if __SHM_PAD_BETWEEN_TIME_AND_SEGSZ
> - unsigned long int __glibc_reserved4;
> -#endif
> -#if __SHM_SEGSZ_AFTER_TIME
> size_t shm_segsz; /* size of segment in bytes */
> +#if __TIMESIZE == 32
> + __time_t shm_atime; /* time of last shmat() */
> + unsigned long int __glibc_reserved1;
> + __time_t shm_dtime; /* time of last shmdt() */
> + unsigned long int __glibc_reserved2;
> + __time_t shm_ctime; /* time of last change by shmctl() */
> + unsigned long int __glibc_reserved3;
> +#else
> + __time_t shm_atime; /* time of last shmat() */
> + __time_t shm_dtime; /* time of last shmdt() */
> + __time_t shm_ctime; /* time of last change by shmctl() */
OK.
> #endif
> __pid_t shm_cpid; /* pid of creator */
> __pid_t shm_lpid; /* pid of last shmop */
> diff --git a/sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h b/sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
> deleted file mode 100644
> index d0811fe543..0000000000
> --- a/sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -/* Define where padding goes in struct shmid_ds. HPPA version.
> - Copyright (C) 2018-2020 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
> - <https://www.gnu.org/licenses/>. */
> -
> -#ifndef _SYS_SHM_H
> -# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -#define __SHM_PAD_AFTER_TIME 0
> -#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
> -#define __SHM_SEGSZ_AFTER_TIME 1
> -#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__TIMESIZE == 32)
OK.
> diff --git a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_shmid_ds.h b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_shmid_ds.h
> new file mode 100644
> index 0000000000..1ebf222eac
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_shmid_ds.h
> @@ -0,0 +1,46 @@
> +/* Linux/HPPA implementation of the shared memory struct shmid_ds.
> + Copyright (C) 2020 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
> + <https://www.gnu.org/licenses/>. */
> +
> +#ifndef _SYS_SHM_H
> +# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
> +#endif
> +
> +/* Data structure describing a shared memory segment. */
> +struct shmid_ds
> + {
> + struct ipc_perm shm_perm; /* operation permission struct */
> +#if __TIMESIZE == 32
> + unsigned long int __glibc_reserved1;
> + __time_t shm_atime; /* time of last shmat() */
> + unsigned long int __glibc_reserved2;
> + __time_t shm_dtime; /* time of last shmdt() */
> + unsigned long int __glibc_reserved3;
> + __time_t shm_ctime; /* time of last change by shmctl() */
> + unsigned long int __glibc_reserved4;
OK.
> +#else
> + __time_t shm_atime; /* time of last shmat() */
> + __time_t shm_dtime; /* time of last shmdt() */
> + __time_t shm_ctime; /* time of last change by shmctl() */
> +#endif
> + size_t shm_segsz; /* size of segment in bytes */
> + __pid_t shm_cpid; /* pid of creator */
> + __pid_t shm_lpid; /* pid of last shmop */
> + shmatt_t shm_nattch; /* number of current attaches */
> + __syscall_ulong_t __glibc_reserved5;
> + __syscall_ulong_t __glibc_reserved6;
> + };
> diff --git a/sysdeps/unix/sysv/linux/mips/bits/shm-pad.h b/sysdeps/unix/sysv/linux/mips/bits/shm-pad.h
> deleted file mode 100644
> index 5a475a64f9..0000000000
> --- a/sysdeps/unix/sysv/linux/mips/bits/shm-pad.h
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -/* Define where padding goes in struct shmid_ds. MIPS version.
> - Copyright (C) 2018-2020 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
> - <https://www.gnu.org/licenses/>. */
> -
> -#ifndef _SYS_SHM_H
> -# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
> -#endif
> -
> -#define __SHM_PAD_AFTER_TIME 0
> -#define __SHM_PAD_BEFORE_TIME 0
> -#define __SHM_SEGSZ_AFTER_TIME 0
> -#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0
OK.
> diff --git a/sysdeps/unix/sysv/linux/mips/bits/types/struct_shmid_ds.h b/sysdeps/unix/sysv/linux/mips/bits/types/struct_shmid_ds.h
> new file mode 100644
> index 0000000000..8e13928980
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/mips/bits/types/struct_shmid_ds.h
> @@ -0,0 +1,49 @@
> +/* Linux/MIPS implementation of the shared memory struct shmid_ds.
> + Copyright (C) 2020 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
> + <https://www.gnu.org/licenses/>. */
> +
> +#ifndef _SYS_SHM_H
> +# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
> +#endif
> +
> +/* Data structure describing a shared memory segment. */
> +struct shmid_ds
> + {
> + struct ipc_perm shm_perm; /* operation permission struct */
> + size_t shm_segsz; /* size of segment in bytes */
> +#if __TIMESIZE == 32
> + __time_t shm_atime; /* time of last shmat() */
> + __time_t shm_dtime; /* time of last shmdt() */
> + __time_t shm_ctime; /* time of last change by shmctl() */
> +#else
> + __time_t shm_atime; /* time of last shmat() */
> + __time_t shm_dtime; /* time of last shmdt() */
> + __time_t shm_ctime; /* time of last change by shmctl() */
> +#endif
> + __pid_t shm_cpid; /* pid of creator */
> + __pid_t shm_lpid; /* pid of last shmop */
> + shmatt_t shm_nattch; /* number of current attaches */
> +#if __TIMESIZE == 32
> + unsigned short int __glibc_reserved1;
> + unsigned short int __glibc_reserved2;
> + unsigned short int __glibc_reserved3;
> + unsigned short int __glibc_reserved4;
> +#else
> + __syscall_ulong_t __glibc_reserved5;
> + __syscall_ulong_t __glibc_reserved6;
OK.
> +#endif
> + };
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
> deleted file mode 100644
> index 34cbdb2a0d..0000000000
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -/* Define where padding goes in struct shmid_ds. PowerPC version.
> - Copyright (C) 2018-2020 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
> - <https://www.gnu.org/licenses/>. */
> -
> -#ifndef _SYS_SHM_H
> -# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -#define __SHM_PAD_AFTER_TIME 0
> -#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
> -#define __SHM_SEGSZ_AFTER_TIME 1
> -#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__TIMESIZE == 32)
OK.
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h
> new file mode 100644
> index 0000000000..b0816fb16a
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h
> @@ -0,0 +1,46 @@
> +/* Linux/PowerPC implementation of the shared memory struct shmid_ds.
> + Copyright (C) 2020 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
> + <https://www.gnu.org/licenses/>. */
> +
> +#ifndef _SYS_SHM_H
> +# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
> +#endif
> +
> +/* Data structure describing a shared memory segment. */
> +struct shmid_ds
> + {
> + struct ipc_perm shm_perm; /* operation permission struct */
> +#if __TIMESIZE == 32
> + unsigned long int __glibc_reserved1;
> + __time_t shm_atime; /* time of last shmat() */
> + unsigned long int __glibc_reserved2;
> + __time_t shm_dtime; /* time of last shmdt() */
> + unsigned long int __glibc_reserved3;
> + __time_t shm_ctime; /* time of last change by shmctl() */
> + unsigned long int __glibc_reserved4;
> +#else
> + __time_t shm_atime; /* time of last shmat() */
> + __time_t shm_dtime; /* time of last shmdt() */
> + __time_t shm_ctime; /* time of last change by shmctl() */
> +#endif
OK.
> + size_t shm_segsz; /* size of segment in bytes */
> + __pid_t shm_cpid; /* pid of creator */
> + __pid_t shm_lpid; /* pid of last shmop */
> + shmatt_t shm_nattch; /* number of current attaches */
> + __syscall_ulong_t __glibc_reserved5;
> + __syscall_ulong_t __glibc_reserved6;
> + };
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h b/sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
> deleted file mode 100644
> index cd0b1fe543..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -/* Define where padding goes in struct shmid_ds. SPARC version.
> - Copyright (C) 2018-2020 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
> - <https://www.gnu.org/licenses/>. */
> -
> -#ifndef _SYS_SHM_H
> -# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
> -#endif
> -
> -#include <bits/timesize.h>
> -
> -#define __SHM_PAD_AFTER_TIME 0
> -#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
> -#define __SHM_SEGSZ_AFTER_TIME 1
> -#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_shmid_ds.h b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_shmid_ds.h
> new file mode 100644
> index 0000000000..d5fb61d374
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_shmid_ds.h
> @@ -0,0 +1,45 @@
> +/* Linux/SPARC implementation of the shared memory struct shmid_ds.
> + Copyright (C) 2020 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
> + <https://www.gnu.org/licenses/>. */
> +
> +#ifndef _SYS_SHM_H
> +# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
> +#endif
> +
> +/* Data structure describing a shared memory segment. */
> +struct shmid_ds
> + {
> + struct ipc_perm shm_perm; /* operation permission struct */
> +#if __TIMESIZE == 32
> + unsigned long int __glibc_reserved1;
> + __time_t shm_atime; /* time of last shmat() */
> + unsigned long int __glibc_reserved2;
> + __time_t shm_dtime; /* time of last shmdt() */
> + unsigned long int __glibc_reserved3;
> + __time_t shm_ctime; /* time of last change by shmctl() */
> +#else
> + __time_t shm_atime; /* time of last shmat() */
> + __time_t shm_dtime; /* time of last shmdt() */
> + __time_t shm_ctime; /* time of last change by shmctl() */
OK.
> +#endif
> + size_t shm_segsz; /* size of segment in bytes */
> + __pid_t shm_cpid; /* pid of creator */
> + __pid_t shm_lpid; /* pid of last shmop */
> + shmatt_t shm_nattch; /* number of current attaches */
> + __syscall_ulong_t __glibc_reserved5;
> + __syscall_ulong_t __glibc_reserved6;
> + };
>
@@ -85,7 +85,7 @@ sysdep_headers += sys/mount.h sys/acct.h \
bits/siginfo-arch.h bits/siginfo-consts-arch.h \
bits/procfs.h bits/procfs-id.h bits/procfs-extra.h \
bits/procfs-prregset.h bits/mman-map-flags-generic.h \
- bits/shmlba.h bits/shm-pad.h \
+ bits/shmlba.h \
bits/termios-struct.h bits/termios-c_cc.h \
bits/termios-c_iflag.h bits/termios-c_oflag.h \
bits/termios-baud.h bits/termios-c_cflag.h \
deleted file mode 100644
@@ -1,37 +0,0 @@
-/* Define where padding goes in struct shmid_ds. Generic version.
- Copyright (C) 2018-2020 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
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _SYS_SHM_H
-# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-/* On most architectures, padding goes after time fields for 32-bit
- systems and is omitted for 64-bit systems. Some architectures pad
- before time fields instead, or omit padding despite being 32-bit,
- or include it despite being 64-bit. Furthermore, some
- architectures place shm_segsz after the time fields rather than
- before them, with or without padding there. This must match the
- layout used for struct shmid64_ds in <asm/shmbuf.h>, as glibc does
- not do layout conversions for this structure. */
-
-#define __SHM_PAD_AFTER_TIME (__TIMESIZE == 32)
-#define __SHM_PAD_BEFORE_TIME 0
-#define __SHM_SEGSZ_AFTER_TIME 0
-#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0
@@ -22,7 +22,6 @@
#include <bits/types.h>
#include <bits/wordsize.h>
#include <bits/shmlba.h>
-#include <bits/shm-pad.h>
/* Permission flag for shmget. */
#define SHM_R 0400 /* or S_IRUGO from <linux/stat.h> */
@@ -20,34 +20,22 @@
# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
#endif
-#include <bits/shm-pad.h>
-
-#if __SHM_PAD_BEFORE_TIME
-# define __SHM_PAD_TIME(NAME, RES) \
- unsigned long int __glibc_reserved ## RES; __time_t NAME
-#elif __SHM_PAD_AFTER_TIME
-# define __SHM_PAD_TIME(NAME, RES) \
- __time_t NAME; unsigned long int __glibc_reserved ## RES
-#else
-# define __SHM_PAD_TIME(NAME, RES) \
- __time_t NAME
-#endif
-
/* Data structure describing a shared memory segment. */
struct shmid_ds
{
struct ipc_perm shm_perm; /* operation permission struct */
-#if !__SHM_SEGSZ_AFTER_TIME
- size_t shm_segsz; /* size of segment in bytes */
-#endif
- __SHM_PAD_TIME (shm_atime, 1); /* time of last shmat() */
- __SHM_PAD_TIME (shm_dtime, 2); /* time of last shmdt() */
- __SHM_PAD_TIME (shm_ctime, 3); /* time of last change by shmctl() */
-#if __SHM_PAD_BETWEEN_TIME_AND_SEGSZ
- unsigned long int __glibc_reserved4;
-#endif
-#if __SHM_SEGSZ_AFTER_TIME
size_t shm_segsz; /* size of segment in bytes */
+#if __TIMESIZE == 32
+ __time_t shm_atime; /* time of last shmat() */
+ unsigned long int __glibc_reserved1;
+ __time_t shm_dtime; /* time of last shmdt() */
+ unsigned long int __glibc_reserved2;
+ __time_t shm_ctime; /* time of last change by shmctl() */
+ unsigned long int __glibc_reserved3;
+#else
+ __time_t shm_atime; /* time of last shmat() */
+ __time_t shm_dtime; /* time of last shmdt() */
+ __time_t shm_ctime; /* time of last change by shmctl() */
#endif
__pid_t shm_cpid; /* pid of creator */
__pid_t shm_lpid; /* pid of last shmop */
deleted file mode 100644
@@ -1,28 +0,0 @@
-/* Define where padding goes in struct shmid_ds. HPPA version.
- Copyright (C) 2018-2020 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
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _SYS_SHM_H
-# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-#define __SHM_PAD_AFTER_TIME 0
-#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
-#define __SHM_SEGSZ_AFTER_TIME 1
-#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__TIMESIZE == 32)
new file mode 100644
@@ -0,0 +1,46 @@
+/* Linux/HPPA implementation of the shared memory struct shmid_ds.
+ Copyright (C) 2020 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
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_SHM_H
+# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
+#endif
+
+/* Data structure describing a shared memory segment. */
+struct shmid_ds
+ {
+ struct ipc_perm shm_perm; /* operation permission struct */
+#if __TIMESIZE == 32
+ unsigned long int __glibc_reserved1;
+ __time_t shm_atime; /* time of last shmat() */
+ unsigned long int __glibc_reserved2;
+ __time_t shm_dtime; /* time of last shmdt() */
+ unsigned long int __glibc_reserved3;
+ __time_t shm_ctime; /* time of last change by shmctl() */
+ unsigned long int __glibc_reserved4;
+#else
+ __time_t shm_atime; /* time of last shmat() */
+ __time_t shm_dtime; /* time of last shmdt() */
+ __time_t shm_ctime; /* time of last change by shmctl() */
+#endif
+ size_t shm_segsz; /* size of segment in bytes */
+ __pid_t shm_cpid; /* pid of creator */
+ __pid_t shm_lpid; /* pid of last shmop */
+ shmatt_t shm_nattch; /* number of current attaches */
+ __syscall_ulong_t __glibc_reserved5;
+ __syscall_ulong_t __glibc_reserved6;
+ };
deleted file mode 100644
@@ -1,26 +0,0 @@
-/* Define where padding goes in struct shmid_ds. MIPS version.
- Copyright (C) 2018-2020 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
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _SYS_SHM_H
-# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
-#endif
-
-#define __SHM_PAD_AFTER_TIME 0
-#define __SHM_PAD_BEFORE_TIME 0
-#define __SHM_SEGSZ_AFTER_TIME 0
-#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0
new file mode 100644
@@ -0,0 +1,49 @@
+/* Linux/MIPS implementation of the shared memory struct shmid_ds.
+ Copyright (C) 2020 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
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_SHM_H
+# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
+#endif
+
+/* Data structure describing a shared memory segment. */
+struct shmid_ds
+ {
+ struct ipc_perm shm_perm; /* operation permission struct */
+ size_t shm_segsz; /* size of segment in bytes */
+#if __TIMESIZE == 32
+ __time_t shm_atime; /* time of last shmat() */
+ __time_t shm_dtime; /* time of last shmdt() */
+ __time_t shm_ctime; /* time of last change by shmctl() */
+#else
+ __time_t shm_atime; /* time of last shmat() */
+ __time_t shm_dtime; /* time of last shmdt() */
+ __time_t shm_ctime; /* time of last change by shmctl() */
+#endif
+ __pid_t shm_cpid; /* pid of creator */
+ __pid_t shm_lpid; /* pid of last shmop */
+ shmatt_t shm_nattch; /* number of current attaches */
+#if __TIMESIZE == 32
+ unsigned short int __glibc_reserved1;
+ unsigned short int __glibc_reserved2;
+ unsigned short int __glibc_reserved3;
+ unsigned short int __glibc_reserved4;
+#else
+ __syscall_ulong_t __glibc_reserved5;
+ __syscall_ulong_t __glibc_reserved6;
+#endif
+ };
deleted file mode 100644
@@ -1,28 +0,0 @@
-/* Define where padding goes in struct shmid_ds. PowerPC version.
- Copyright (C) 2018-2020 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
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _SYS_SHM_H
-# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-#define __SHM_PAD_AFTER_TIME 0
-#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
-#define __SHM_SEGSZ_AFTER_TIME 1
-#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__TIMESIZE == 32)
new file mode 100644
@@ -0,0 +1,46 @@
+/* Linux/PowerPC implementation of the shared memory struct shmid_ds.
+ Copyright (C) 2020 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
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_SHM_H
+# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
+#endif
+
+/* Data structure describing a shared memory segment. */
+struct shmid_ds
+ {
+ struct ipc_perm shm_perm; /* operation permission struct */
+#if __TIMESIZE == 32
+ unsigned long int __glibc_reserved1;
+ __time_t shm_atime; /* time of last shmat() */
+ unsigned long int __glibc_reserved2;
+ __time_t shm_dtime; /* time of last shmdt() */
+ unsigned long int __glibc_reserved3;
+ __time_t shm_ctime; /* time of last change by shmctl() */
+ unsigned long int __glibc_reserved4;
+#else
+ __time_t shm_atime; /* time of last shmat() */
+ __time_t shm_dtime; /* time of last shmdt() */
+ __time_t shm_ctime; /* time of last change by shmctl() */
+#endif
+ size_t shm_segsz; /* size of segment in bytes */
+ __pid_t shm_cpid; /* pid of creator */
+ __pid_t shm_lpid; /* pid of last shmop */
+ shmatt_t shm_nattch; /* number of current attaches */
+ __syscall_ulong_t __glibc_reserved5;
+ __syscall_ulong_t __glibc_reserved6;
+ };
deleted file mode 100644
@@ -1,28 +0,0 @@
-/* Define where padding goes in struct shmid_ds. SPARC version.
- Copyright (C) 2018-2020 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
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _SYS_SHM_H
-# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-#define __SHM_PAD_AFTER_TIME 0
-#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
-#define __SHM_SEGSZ_AFTER_TIME 1
-#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0
new file mode 100644
@@ -0,0 +1,45 @@
+/* Linux/SPARC implementation of the shared memory struct shmid_ds.
+ Copyright (C) 2020 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
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_SHM_H
+# error "Never include <bits/types/struct_shmid_ds.h> directly; use <sys/shm.h> instead."
+#endif
+
+/* Data structure describing a shared memory segment. */
+struct shmid_ds
+ {
+ struct ipc_perm shm_perm; /* operation permission struct */
+#if __TIMESIZE == 32
+ unsigned long int __glibc_reserved1;
+ __time_t shm_atime; /* time of last shmat() */
+ unsigned long int __glibc_reserved2;
+ __time_t shm_dtime; /* time of last shmdt() */
+ unsigned long int __glibc_reserved3;
+ __time_t shm_ctime; /* time of last change by shmctl() */
+#else
+ __time_t shm_atime; /* time of last shmat() */
+ __time_t shm_dtime; /* time of last shmdt() */
+ __time_t shm_ctime; /* time of last change by shmctl() */
+#endif
+ size_t shm_segsz; /* size of segment in bytes */
+ __pid_t shm_cpid; /* pid of creator */
+ __pid_t shm_lpid; /* pid of last shmop */
+ shmatt_t shm_nattch; /* number of current attaches */
+ __syscall_ulong_t __glibc_reserved5;
+ __syscall_ulong_t __glibc_reserved6;
+ };