mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-11 11:50:06 +00:00
Use common bits/sem.h for more architectures.
sysdeps/unix/sysv/linux/bits/sem.h has padding after time fields in struct semid_ds unconditionally, and thus is only suitable for 32-bit architectures (no 64-bit configurations use this file); sysdeps/unix/sysv/linux/generic/bits/sem.h is substantively the same, except that the padding is conditioned on __WORDSIZE == 32, and so it can be used for 64-bit architectures as well. This patch adds the conditionals to sysdeps/unix/sysv/linux/bits/sem.h. The linux/generic/ version is then no longer needed and so is removed, as are the alpha, ia64 and s390 versions which are also no longer needed. The other architecture-specific versions have different padding or types and so are still needed after this change. This is essentially the same change for bits/sem.h as the bits/msq.h patch. However, the details of the padding variations for the architectures that aren't changed are not all the same between msqid_ds and semid_ds. Tested with build-many-glibcs.py. * sysdeps/unix/sysv/linux/bits/sem.h: Include <bits/wordsize.h>. (struct semid_ds): Condition padding after time fields on [__WORDSIZE == 32]. * sysdeps/unix/sysv/linux/alpha/bits/sem.h: Remove file. * sysdeps/unix/sysv/linux/generic/bits/sem.h: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sem.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sem.h: Likewise.
This commit is contained in:
Joseph Myers
parent
b9c0f6c11a
commit
19e62f2690
@ -1,5 +1,13 @@
|
|||||||
2018-10-10 Joseph Myers <joseph@codesourcery.com>
|
2018-10-10 Joseph Myers <joseph@codesourcery.com>
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/bits/sem.h: Include <bits/wordsize.h>.
|
||||||
|
(struct semid_ds): Condition padding after time fields on
|
||||||
|
[__WORDSIZE == 32].
|
||||||
|
* sysdeps/unix/sysv/linux/alpha/bits/sem.h: Remove file.
|
||||||
|
* sysdeps/unix/sysv/linux/generic/bits/sem.h: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/ia64/bits/sem.h: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/s390/bits/sem.h: Likewise.
|
||||||
|
|
||||||
* sysdeps/unix/sysv/linux/bits/msq.h: Include <bits/wordsize.h>.
|
* sysdeps/unix/sysv/linux/bits/msq.h: Include <bits/wordsize.h>.
|
||||||
(struct msqid_ds): Condition padding after time fields on
|
(struct msqid_ds): Condition padding after time fields on
|
||||||
[__WORDSIZE == 32].
|
[__WORDSIZE == 32].
|
||||||
|
|||||||
@ -1,85 +0,0 @@
|
|||||||
/* Copyright (C) 1995-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_SEM_H
|
|
||||||
# error "Never include <bits/sem.h> directly; use <sys/sem.h> instead."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
/* Flags for `semop'. */
|
|
||||||
#define SEM_UNDO 0x1000 /* undo the operation on exit */
|
|
||||||
|
|
||||||
/* Commands for `semctl'. */
|
|
||||||
#define GETPID 11 /* get sempid */
|
|
||||||
#define GETVAL 12 /* get semval */
|
|
||||||
#define GETALL 13 /* get all semval's */
|
|
||||||
#define GETNCNT 14 /* get semncnt */
|
|
||||||
#define GETZCNT 15 /* get semzcnt */
|
|
||||||
#define SETVAL 16 /* set semval */
|
|
||||||
#define SETALL 17 /* set all semval's */
|
|
||||||
|
|
||||||
|
|
||||||
/* Data structure describing a set of semaphores. */
|
|
||||||
struct semid_ds
|
|
||||||
{
|
|
||||||
struct ipc_perm sem_perm; /* operation permission struct */
|
|
||||||
__time_t sem_otime; /* last semop() time */
|
|
||||||
__time_t sem_ctime; /* last time changed by semctl() */
|
|
||||||
unsigned long int sem_nsems; /* number of semaphores in set */
|
|
||||||
unsigned long int __glibc_reserved1;
|
|
||||||
unsigned long int __glibc_reserved2;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* The user should define a union like the following to use it for arguments
|
|
||||||
for `semctl'.
|
|
||||||
|
|
||||||
union semun
|
|
||||||
{
|
|
||||||
int val; <= value for SETVAL
|
|
||||||
struct semid_ds *buf; <= buffer for IPC_STAT & IPC_SET
|
|
||||||
unsigned short int *array; <= array for GETALL & SETALL
|
|
||||||
struct seminfo *__buf; <= buffer for IPC_INFO
|
|
||||||
};
|
|
||||||
|
|
||||||
Previous versions of this file used to define this union but this is
|
|
||||||
incorrect. One can test the macro _SEM_SEMUN_UNDEFINED to see whether
|
|
||||||
one must define the union or not. */
|
|
||||||
#define _SEM_SEMUN_UNDEFINED 1
|
|
||||||
|
|
||||||
#ifdef __USE_MISC
|
|
||||||
|
|
||||||
/* ipcs ctl cmds */
|
|
||||||
# define SEM_STAT 18
|
|
||||||
# define SEM_INFO 19
|
|
||||||
# define SEM_STAT_ANY 20
|
|
||||||
|
|
||||||
struct seminfo
|
|
||||||
{
|
|
||||||
int semmap;
|
|
||||||
int semmni;
|
|
||||||
int semmns;
|
|
||||||
int semmnu;
|
|
||||||
int semmsl;
|
|
||||||
int semopm;
|
|
||||||
int semume;
|
|
||||||
int semusz;
|
|
||||||
int semvmx;
|
|
||||||
int semaem;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* __USE_MISC */
|
|
||||||
@ -20,6 +20,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#include <bits/wordsize.h>
|
||||||
|
|
||||||
/* Flags for `semop'. */
|
/* Flags for `semop'. */
|
||||||
#define SEM_UNDO 0x1000 /* undo the operation on exit */
|
#define SEM_UNDO 0x1000 /* undo the operation on exit */
|
||||||
@ -39,9 +40,13 @@ struct semid_ds
|
|||||||
{
|
{
|
||||||
struct ipc_perm sem_perm; /* operation permission struct */
|
struct ipc_perm sem_perm; /* operation permission struct */
|
||||||
__time_t sem_otime; /* last semop() time */
|
__time_t sem_otime; /* last semop() time */
|
||||||
|
#if __WORDSIZE == 32
|
||||||
unsigned long int __glibc_reserved1;
|
unsigned long int __glibc_reserved1;
|
||||||
|
#endif
|
||||||
__time_t sem_ctime; /* last time changed by semctl() */
|
__time_t sem_ctime; /* last time changed by semctl() */
|
||||||
|
#if __WORDSIZE == 32
|
||||||
unsigned long int __glibc_reserved2;
|
unsigned long int __glibc_reserved2;
|
||||||
|
#endif
|
||||||
unsigned long int sem_nsems; /* number of semaphores in set */
|
unsigned long int sem_nsems; /* number of semaphores in set */
|
||||||
unsigned long int __glibc_reserved3;
|
unsigned long int __glibc_reserved3;
|
||||||
unsigned long int __glibc_reserved4;
|
unsigned long int __glibc_reserved4;
|
||||||
|
|||||||
@ -1,93 +0,0 @@
|
|||||||
/* Copyright (C) 2011-2018 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
|
|
||||||
|
|
||||||
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_SEM_H
|
|
||||||
# error "Never include <bits/sem.h> directly; use <sys/sem.h> instead."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <bits/wordsize.h>
|
|
||||||
|
|
||||||
/* Flags for `semop'. */
|
|
||||||
#define SEM_UNDO 0x1000 /* undo the operation on exit */
|
|
||||||
|
|
||||||
/* Commands for `semctl'. */
|
|
||||||
#define GETPID 11 /* get sempid */
|
|
||||||
#define GETVAL 12 /* get semval */
|
|
||||||
#define GETALL 13 /* get all semval's */
|
|
||||||
#define GETNCNT 14 /* get semncnt */
|
|
||||||
#define GETZCNT 15 /* get semzcnt */
|
|
||||||
#define SETVAL 16 /* set semval */
|
|
||||||
#define SETALL 17 /* set all semval's */
|
|
||||||
|
|
||||||
|
|
||||||
/* Data structure describing a set of semaphores. */
|
|
||||||
struct semid_ds
|
|
||||||
{
|
|
||||||
struct ipc_perm sem_perm; /* operation permission struct */
|
|
||||||
__time_t sem_otime; /* last semop() time */
|
|
||||||
#if __WORDSIZE == 32
|
|
||||||
unsigned long int __glibc_reserved1;
|
|
||||||
#endif
|
|
||||||
__time_t sem_ctime; /* last time changed by semctl() */
|
|
||||||
#if __WORDSIZE == 32
|
|
||||||
unsigned long int __glibc_reserved2;
|
|
||||||
#endif
|
|
||||||
unsigned long int sem_nsems; /* number of semaphores in set */
|
|
||||||
unsigned long int __glibc_reserved3;
|
|
||||||
unsigned long int __glibc_reserved4;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* The user should define a union like the following to use it for arguments
|
|
||||||
for `semctl'.
|
|
||||||
|
|
||||||
union semun
|
|
||||||
{
|
|
||||||
int val; <= value for SETVAL
|
|
||||||
struct semid_ds *buf; <= buffer for IPC_STAT & IPC_SET
|
|
||||||
unsigned short int *array; <= array for GETALL & SETALL
|
|
||||||
struct seminfo *__buf; <= buffer for IPC_INFO
|
|
||||||
};
|
|
||||||
|
|
||||||
Previous versions of this file used to define this union but this is
|
|
||||||
incorrect. One can test the macro _SEM_SEMUN_UNDEFINED to see whether
|
|
||||||
one must define the union or not. */
|
|
||||||
#define _SEM_SEMUN_UNDEFINED 1
|
|
||||||
|
|
||||||
#ifdef __USE_MISC
|
|
||||||
|
|
||||||
/* ipcs ctl cmds */
|
|
||||||
# define SEM_STAT 18
|
|
||||||
# define SEM_INFO 19
|
|
||||||
# define SEM_STAT_ANY 20
|
|
||||||
|
|
||||||
struct seminfo
|
|
||||||
{
|
|
||||||
int semmap;
|
|
||||||
int semmni;
|
|
||||||
int semmns;
|
|
||||||
int semmnu;
|
|
||||||
int semmsl;
|
|
||||||
int semopm;
|
|
||||||
int semume;
|
|
||||||
int semusz;
|
|
||||||
int semvmx;
|
|
||||||
int semaem;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* __USE_MISC */
|
|
||||||
@ -1,86 +0,0 @@
|
|||||||
/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
|
|
||||||
|
|
||||||
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_SEM_H
|
|
||||||
# error "Never include <bits/sem.h> directly; use <sys/sem.h> instead."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
/* Flags for `semop'. */
|
|
||||||
#define SEM_UNDO 0x1000 /* undo the operation on exit */
|
|
||||||
|
|
||||||
/* Commands for `semctl'. */
|
|
||||||
#define GETPID 11 /* get sempid */
|
|
||||||
#define GETVAL 12 /* get semval */
|
|
||||||
#define GETALL 13 /* get all semval's */
|
|
||||||
#define GETNCNT 14 /* get semncnt */
|
|
||||||
#define GETZCNT 15 /* get semzcnt */
|
|
||||||
#define SETVAL 16 /* set semval */
|
|
||||||
#define SETALL 17 /* set all semval's */
|
|
||||||
|
|
||||||
|
|
||||||
/* Data structure describing a set of semaphores. */
|
|
||||||
struct semid_ds
|
|
||||||
{
|
|
||||||
struct ipc_perm sem_perm; /* operation permission struct */
|
|
||||||
__time_t sem_otime; /* last semop() time */
|
|
||||||
__time_t sem_ctime; /* last time changed by semctl() */
|
|
||||||
unsigned long int sem_nsems; /* number of semaphores in set */
|
|
||||||
unsigned long int __glibc_reserved1;
|
|
||||||
unsigned long int __glibc_reserved2;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* The user should define a union like the following to use it for arguments
|
|
||||||
for `semctl'.
|
|
||||||
|
|
||||||
union semun
|
|
||||||
{
|
|
||||||
int val; <= value for SETVAL
|
|
||||||
struct semid_ds *buf; <= buffer for IPC_STAT & IPC_SET
|
|
||||||
unsigned short int *array; <= array for GETALL & SETALL
|
|
||||||
struct seminfo *__buf; <= buffer for IPC_INFO
|
|
||||||
};
|
|
||||||
|
|
||||||
Previous versions of this file used to define this union but this is
|
|
||||||
incorrect. One can test the macro _SEM_SEMUN_UNDEFINED to see whether
|
|
||||||
one must define the union or not. */
|
|
||||||
#define _SEM_SEMUN_UNDEFINED 1
|
|
||||||
|
|
||||||
#ifdef __USE_MISC
|
|
||||||
|
|
||||||
/* ipcs ctl cmds */
|
|
||||||
# define SEM_STAT 18
|
|
||||||
# define SEM_INFO 19
|
|
||||||
# define SEM_STAT_ANY 20
|
|
||||||
|
|
||||||
struct seminfo
|
|
||||||
{
|
|
||||||
int semmap;
|
|
||||||
int semmni;
|
|
||||||
int semmns;
|
|
||||||
int semmnu;
|
|
||||||
int semmsl;
|
|
||||||
int semopm;
|
|
||||||
int semume;
|
|
||||||
int semusz;
|
|
||||||
int semvmx;
|
|
||||||
int semaem;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* __USE_MISC */
|
|
||||||
@ -1,91 +0,0 @@
|
|||||||
/* Copyright (C) 2001-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_SEM_H
|
|
||||||
# error "Never include <bits/sem.h> directly; use <sys/sem.h> instead."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
/* Flags for `semop'. */
|
|
||||||
#define SEM_UNDO 0x1000 /* undo the operation on exit */
|
|
||||||
|
|
||||||
/* Commands for `semctl'. */
|
|
||||||
#define GETPID 11 /* get sempid */
|
|
||||||
#define GETVAL 12 /* get semval */
|
|
||||||
#define GETALL 13 /* get all semval's */
|
|
||||||
#define GETNCNT 14 /* get semncnt */
|
|
||||||
#define GETZCNT 15 /* get semzcnt */
|
|
||||||
#define SETVAL 16 /* set semval */
|
|
||||||
#define SETALL 17 /* set all semval's */
|
|
||||||
|
|
||||||
|
|
||||||
/* Data structure describing a set of semaphores. */
|
|
||||||
struct semid_ds
|
|
||||||
{
|
|
||||||
struct ipc_perm sem_perm; /* operation permission struct */
|
|
||||||
__time_t sem_otime; /* last semop() time */
|
|
||||||
#if __WORDSIZE != 64
|
|
||||||
unsigned long int __glibc_reserved1;
|
|
||||||
#endif
|
|
||||||
__time_t sem_ctime; /* last time changed by semctl() */
|
|
||||||
#if __WORDSIZE != 64
|
|
||||||
unsigned long int __glibc_reserved2;
|
|
||||||
#endif
|
|
||||||
unsigned long int sem_nsems; /* number of semaphores in set */
|
|
||||||
unsigned long int __glibc_reserved3;
|
|
||||||
unsigned long int __glibc_reserved4;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* The user should define a union like the following to use it for arguments
|
|
||||||
for `semctl'.
|
|
||||||
|
|
||||||
union semun
|
|
||||||
{
|
|
||||||
int val; <= value for SETVAL
|
|
||||||
struct semid_ds *buf; <= buffer for IPC_STAT & IPC_SET
|
|
||||||
unsigned short int *array; <= array for GETALL & SETALL
|
|
||||||
struct seminfo *__buf; <= buffer for IPC_INFO
|
|
||||||
};
|
|
||||||
|
|
||||||
Previous versions of this file used to define this union but this is
|
|
||||||
incorrect. One can test the macro _SEM_SEMUN_UNDEFINED to see whether
|
|
||||||
one must define the union or not. */
|
|
||||||
#define _SEM_SEMUN_UNDEFINED 1
|
|
||||||
|
|
||||||
#ifdef __USE_MISC
|
|
||||||
|
|
||||||
/* ipcs ctl cmds */
|
|
||||||
# define SEM_STAT 18
|
|
||||||
# define SEM_INFO 19
|
|
||||||
# define SEM_STAT_ANY 20
|
|
||||||
|
|
||||||
struct seminfo
|
|
||||||
{
|
|
||||||
int semmap;
|
|
||||||
int semmni;
|
|
||||||
int semmns;
|
|
||||||
int semmnu;
|
|
||||||
int semmsl;
|
|
||||||
int semopm;
|
|
||||||
int semume;
|
|
||||||
int semusz;
|
|
||||||
int semvmx;
|
|
||||||
int semaem;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* __USE_MISC */
|
|
||||||
Loading…
Reference in New Issue
Block a user