From patchwork Thu Mar 5 01:26:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38421 Received: (qmail 120150 invoked by alias); 5 Mar 2020 01:33:32 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 119927 invoked by uid 89); 5 Mar 2020 01:33:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy=1718 X-HELO: esa2.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1583372008; x=1614908008; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XLmKrM0IsZbZng6PpcD4B0TkN9PAVC1oykGcrXOfbyk=; b=V/gMfy7qRvFkbM8XDFi2Du0jeRP2vn3CM555ehIhmCTiRaLUvZwmVOTp ecbbmymUoDOakcLE9vnXmJwQYpywKJpVoQpDtbhY+6SsJvH5/3CPtZXA1 LltfwDCCkd6hloKz/kkawYO4bOt4vpGppM5gi3Z9J2O3FsUDJgq8PO7Fv yxP/o5RSwcv9mXXRjVp3/hcc0fhwgrxpSYa08we5BpaEPQFcpHNNzm0Y4 zXpH8PJQvlVVq+6g1om7wSkaW7X2vy67+QH9moHm/SLT93f/fwPkmg17x cWEzwGBE4t/+tdBq3dqkNptbpZyH1J3hOK9QeOV5IkX+6nrmuzxppD5kP Q==; IronPort-SDR: 9JNSGujvkErF2Aeg/GqR7vNQ6HiDuM7VziebrzAdqN2R3AOpOlNVxVG/p5KsfdDHH8twQMOPlB dUxHlMOrMMHuaK8I1R54Jrxuj24qjfC9I+xMSlUoQE8sRNGPj4uZWu+KoIV9OIkG3+U3z9Uldu 9pVjWKRH+99yuOsCA0DV54UpazXf3MlAHL0N55nsadOperbtYaaq2PE8SJNCJ/4Fr+oF7gIG7n IWllFTNVzfTJcgpPqnDayQSfnFvrhNDubyYUSS87HilQMxHG37itITAh08wcdHTx01ZrALZZ2q Ef0= IronPort-SDR: PitUJxnT2Efw1uqFCMFC568d1M5PSYAPgErTPYn/9GH6zQ7Bi1ULKzFGRrD6APb84on+dIeSO9 Lp0pH1iBkDP0dzxET/OUbCyvEweSaeMVgVLAlGWgZ+40JYupnSL5Q72xTwA4EzX7OSEpAhUX+3 ijwENEPCqEvYGk2TY07IeEsdlP6Lm7Pb1Ax8BEw6V+mQwHzLRa5Hh3V5Tij7SJqKWwJLRJcGNn uDmyQSUUbYiLJGO4ftT6N+GJj+xKx+zSkbttsSaA61LU30oa0uP1KTo2SrceGnRYVrh2moK/5S xanMhTGK/WH1MC6F4cTD7xsh IronPort-SDR: Mpq6LOM6+Fo6IVAwSiFbSpZnK1LUuijpoeHWnVua4KrASysgTmuk3ed9F/EwvDvWhpoYdDy68n 1BVKEP2w1EorqACzSjtosOVsJXMd9VR8EeGfq2LeVdyrijdmBz4sEQUoED9puJIzdABvw/XQ/x MnIcbvDkbhPKsiuytbag5cx0FL+FZtn/kWDgiErs+OyC2MSarrkZphbsMDb/yfU0AUMSkgplf3 b4aF5a4qIHurdyx7kEHTrzg8EEbFOqShyCyGRnmXk4CepsGNL6obA2Bqi4Ia6/URgoLqoRG471 mvc= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH v3 2/3] semctl: Remove the sem-pad.h file Date: Wed, 4 Mar 2020 17:26:04 -0800 Message-Id: <20200305012605.26870-3-alistair.francis@wdc.com> In-Reply-To: <20200305012605.26870-1-alistair.francis@wdc.com> References: <20200305012605.26870-1-alistair.francis@wdc.com> MIME-Version: 1.0 Remove the sem-pad.h file and instead have architectures override the struct semid_ds via the semid_ds_t.h file. --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/bits/sem-pad.h | 33 ------------- sysdeps/unix/sysv/linux/bits/sem.h | 2 +- sysdeps/unix/sysv/linux/bits/semid_ds_t.h | 29 ++++++------ .../unix/sysv/linux/hppa/bits/semid_ds_t.h | 46 +++++++++++++++++++ sysdeps/unix/sysv/linux/mips/bits/sem-pad.h | 24 ---------- .../bits/sem-pad.h => mips/bits/semid_ds_t.h} | 20 +++++--- .../unix/sysv/linux/powerpc/bits/sem-pad.h | 26 ----------- .../unix/sysv/linux/powerpc/bits/semid_ds_t.h | 46 +++++++++++++++++++ .../unix/sysv/linux/sparc/bits/semid_ds_t.h | 46 +++++++++++++++++++ sysdeps/unix/sysv/linux/x86/bits/sem-pad.h | 24 ---------- .../bits/sem-pad.h => x86/bits/semid_ds_t.h} | 22 ++++++--- 12 files changed, 184 insertions(+), 136 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/bits/sem-pad.h create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h delete mode 100644 sysdeps/unix/sysv/linux/mips/bits/sem-pad.h rename sysdeps/unix/sysv/linux/{sparc/bits/sem-pad.h => mips/bits/semid_ds_t.h} (56%) delete mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h create mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h delete mode 100644 sysdeps/unix/sysv/linux/x86/bits/sem-pad.h rename sysdeps/unix/sysv/linux/{hppa/bits/sem-pad.h => x86/bits/semid_ds_t.h} (53%) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index cd6721bdbb..bde1e9f03f 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -86,7 +86,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.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/msq-pad.h bits/semid_ds_t.h bits/sem-pad.h bits/shmlba.h bits/shm-pad.h \ + bits/msq-pad.h bits/semid_ds_t.h bits/shmlba.h bits/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/sem-pad.h b/sysdeps/unix/sysv/linux/bits/sem-pad.h deleted file mode 100644 index 566ce039cc..0000000000 --- a/sysdeps/unix/sysv/linux/bits/sem-pad.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Define where padding goes in struct semid_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 - . */ - -#ifndef _SYS_SEM_H -# error "Never use directly; include instead." -#endif - -#include - -/* 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. This must match the layout - used for struct semid64_ds in , as glibc does not do - layout conversions for this structure. */ - -#define __SEM_PAD_AFTER_TIME (__TIMESIZE == 32) -#define __SEM_PAD_BEFORE_TIME 0 diff --git a/sysdeps/unix/sysv/linux/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h index 5c2f6be4c3..771ce00327 100644 --- a/sysdeps/unix/sysv/linux/bits/sem.h +++ b/sysdeps/unix/sysv/linux/bits/sem.h @@ -20,7 +20,7 @@ #endif #include -#include +#include #include /* Flags for `semop'. */ diff --git a/sysdeps/unix/sysv/linux/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/bits/semid_ds_t.h index baed55ca8b..d9d902ed0d 100644 --- a/sysdeps/unix/sysv/linux/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/bits/semid_ds_t.h @@ -20,24 +20,27 @@ # error "Never include directly; use instead." #endif -#if __SEM_PAD_BEFORE_TIME -# define __SEM_PAD_TIME(NAME, RES) \ - __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME -#elif __SEM_PAD_AFTER_TIME -# define __SEM_PAD_TIME(NAME, RES) \ - __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES -#else -# define __SEM_PAD_TIME(NAME, RES) \ - __time_t NAME -#endif - /* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t __glibc_reserved2; + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else struct semid_ds { struct ipc_perm sem_perm; /* operation permission struct */ - __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */ - __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */ + __time_t sem_otime; /* last semop() time */ + __time_t sem_ctime; /* last time changed by semctl() */ __syscall_ulong_t sem_nsems; /* number of semaphores in set */ __syscall_ulong_t __glibc_reserved3; __syscall_ulong_t __glibc_reserved4; }; +#endif diff --git a/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h new file mode 100644 index 0000000000..39c0e53f38 --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h @@ -0,0 +1,46 @@ +/* HPPA implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 + . */ + +#ifndef _SYS_SEM_H +# error "Never include directly; use instead." +#endif + +/* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved2; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else +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() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/mips/bits/sem-pad.h b/sysdeps/unix/sysv/linux/mips/bits/sem-pad.h deleted file mode 100644 index 4c581f7694..0000000000 --- a/sysdeps/unix/sysv/linux/mips/bits/sem-pad.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Define where padding goes in struct semid_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 - . */ - -#ifndef _SYS_SEM_H -# error "Never use directly; include instead." -#endif - -#define __SEM_PAD_AFTER_TIME 0 -#define __SEM_PAD_BEFORE_TIME 0 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h b/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h similarity index 56% rename from sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h rename to sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h index 5f4e214d12..1ab16492dd 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h +++ b/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h @@ -1,5 +1,5 @@ -/* Define where padding goes in struct semid_ds. SPARC version. - Copyright (C) 2018-2020 Free Software Foundation, Inc. +/* MIPS implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 @@ -17,10 +17,16 @@ . */ #ifndef _SYS_SEM_H -# error "Never use directly; include instead." +# error "Never include directly; use instead." #endif -#include - -#define __SEM_PAD_AFTER_TIME 0 -#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32) +/* 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() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h b/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h deleted file mode 100644 index 42d8827906..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Define where padding goes in struct semid_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 - . */ - -#ifndef _SYS_SEM_H -# error "Never use directly; include instead." -#endif - -#include - -#define __SEM_PAD_AFTER_TIME 0 -#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32) diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h new file mode 100644 index 0000000000..79b4cba939 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h @@ -0,0 +1,46 @@ +/* PowerPC implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 + . */ + +#ifndef _SYS_SEM_H +# error "Never include directly; use instead." +#endif + +/* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved2; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else +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() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h new file mode 100644 index 0000000000..f8de676e79 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h @@ -0,0 +1,46 @@ +/* Sparc implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 + . */ + +#ifndef _SYS_SEM_H +# error "Never include directly; use instead." +#endif + +/* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved2; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else +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() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/x86/bits/sem-pad.h b/sysdeps/unix/sysv/linux/x86/bits/sem-pad.h deleted file mode 100644 index 102e226997..0000000000 --- a/sysdeps/unix/sysv/linux/x86/bits/sem-pad.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Define where padding goes in struct semid_ds. x86 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 - . */ - -#ifndef _SYS_SEM_H -# error "Never use directly; include instead." -#endif - -#define __SEM_PAD_AFTER_TIME 1 -#define __SEM_PAD_BEFORE_TIME 0 diff --git a/sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h b/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h similarity index 53% rename from sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h rename to sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h index ee0332325b..42694069d5 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h +++ b/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h @@ -1,5 +1,5 @@ -/* Define where padding goes in struct semid_ds. HPPA version. - Copyright (C) 2018-2020 Free Software Foundation, Inc. +/* Sparc implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 @@ -17,10 +17,18 @@ . */ #ifndef _SYS_SEM_H -# error "Never use directly; include instead." +# error "Never include directly; use instead." #endif -#include - -#define __SEM_PAD_AFTER_TIME 0 -#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32) +/* 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 */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t __glibc_reserved2; + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +};