From patchwork Thu Mar 26 16:37:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38633 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by sourceware.org (Postfix) with ESMTPS id F1049385E023 for ; Thu, 26 Mar 2020 16:45:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F1049385E023 IronPort-SDR: 3CiFMerqMlTMTRrbIe9ymBbGVoFXGZ/T/1XkXDN/U2vfEu6jfE2+IlrIBjGwk3kG/epxBBfTXq ytSxpRaJN6456UDCHmj+uV2dfawaihwZHGYdOWmHjrl0HtjEn1mLfCAErpGUZ90w7VhdxfpDqp 8gBcnpntYn/dbFmr5Up/vZNPikCtRTKw5HR3UYUDcM8ReqjGFTQLjDfxl8UiW47ADjzuGH2j9s CrYca14nXSMcHtxQLKzyvLc5BhSjBMg6WuHuBLo2gACCw2uHy1avmkyByYEIRJxcBbAu2KkymG WfU= X-IronPort-AV: E=Sophos;i="5.72,309,1580745600"; d="scan'208";a="134027529" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 27 Mar 2020 00:45:02 +0800 IronPort-SDR: 9JmjRsccEx2zau/0YAmbaEMK8uN07NUPL3Vf8Xb1mPxVq0RhEq3gs4qwPRVsy2Y755fX4qCcrB 5+MWet5EvUyVzB0QObLS1vQGoxRPODjRWCRqeDGIj9X7bmFFSh7jkjKXE9vlsjTBb/+ZBb8/Of tetYg4gtcR9+bvLKNuPr9fQT0iqdJPH0/fweZj8g2cQ017FnaIP/XjPpEMdLqnT8ei0xY+486u YzqkLRUm8DpF9JJXHNzcFX7lnIRsGs0eU1/H/vJT2liDa7UyFPccMu0BQRUjG8CHZnrGXM8U/i qTu1JUh8drYm+2KCO69HMUr4 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2020 09:36:04 -0700 IronPort-SDR: ILuT4hgF5xYNkD8lThSP476zYmaBqWZc6Iv9vMadOvNquwwMSGPqknHU7KKOBPZR3pCZNu64Fl CqiUILRte+/GJIOmVSoLdmvzSTV789WHZbPIEqib+HaO5RcimQ2iB+GV9lgvaacNV3nPrU/joT JasNl+ZQ5cc3ATrFvo2s7nE18u7TSztjutmMDExPowQ5BBpLvaQQ34TnLhYpiiTK9EDuq1ISlL PiXEow2FMz3Ha5dweBD+Yeqih43rKtznCzzutHIpfwozsPeFO/0UbaLcj5qDGyWMG8t3pprkX8 r0s= WDCIronportException: Internal Received: from lpt-shen-j.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.54.198]) by uls-op-cesaip02.wdc.com with ESMTP; 26 Mar 2020 09:45:01 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: Vineet.Gupta1@synopsys.com, alistair23@gmail.com, Alistair Francis Subject: [PATCH v4 1/3] bits/sem.h: Split out struct semid_ds Date: Thu, 26 Mar 2020 09:37:22 -0700 Message-Id: <20200326163724.377351-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200326163724.377351-1-alistair.francis@wdc.com> References: <20200326163724.377351-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-26.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 16:45:08 -0000 Split out the struct semid_ds into it's own file. This will allow us to have architectures specify their own version. --- sysdeps/unix/sysv/linux/Makefile | 1 + sysdeps/unix/sysv/linux/bits/sem.h | 24 +------------ sysdeps/unix/sysv/linux/bits/semid_ds_t.h | 43 +++++++++++++++++++++++ 3 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/bits/semid_ds_t.h diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 60dc5cf9e5..ddb2a54e57 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -92,6 +92,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ bits/termios-baud.h bits/termios-c_cflag.h \ bits/termios-c_lflag.h bits/termios-tcflow.h \ bits/termios-misc.h \ + bits/semid_ds_t.h \ bits/ipc-perm.h tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ diff --git a/sysdeps/unix/sysv/linux/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h index e0f4155c67..5c2f6be4c3 100644 --- a/sysdeps/unix/sysv/linux/bits/sem.h +++ b/sysdeps/unix/sysv/linux/bits/sem.h @@ -21,6 +21,7 @@ #include #include +#include /* Flags for `semop'. */ #define SEM_UNDO 0x1000 /* undo the operation on exit */ @@ -34,29 +35,6 @@ #define SETVAL 16 /* set semval */ #define SETALL 17 /* set all semval's */ - -#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. */ -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() */ - __syscall_ulong_t sem_nsems; /* number of semaphores in set */ - __syscall_ulong_t __glibc_reserved3; - __syscall_ulong_t __glibc_reserved4; -}; - /* The user should define a union like the following to use it for arguments for `semctl'. diff --git a/sysdeps/unix/sysv/linux/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/bits/semid_ds_t.h new file mode 100644 index 0000000000..baed55ca8b --- /dev/null +++ b/sysdeps/unix/sysv/linux/bits/semid_ds_t.h @@ -0,0 +1,43 @@ +/* Generic 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 + +#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. */ +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() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; From patchwork Thu Mar 26 16:37:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38632 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by sourceware.org (Postfix) with ESMTPS id 8C963385E026 for ; Thu, 26 Mar 2020 16:45:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8C963385E026 IronPort-SDR: 0/bza5skYBlse5CwegeXwf1j+SiAqf+A5HGsJV59prI3yOck1fDb+cGS40zSzIUK+3dST9tll1 QLv2xZo411k+EVGXeAYtQaXJAldOMvaIq6O+q6heAiV+q/Nlgvkt8xyUuE+JiIcEAJi94/krZl x9fP1vyOK0r2+kU1c3nbuW1sODlkfe7gyqfXBgkqaa3+Y0aCCD4V98zc+UEpx7eWs9SHlSyebP 7qaPEoALtI/QHU8L2RdDFcIxMt+KEM3Yyt7gUkserjn1ypFBdtfxlW6quDLNdQZd3WCp53oxrN Taw= X-IronPort-AV: E=Sophos;i="5.72,309,1580745600"; d="scan'208";a="134027532" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 27 Mar 2020 00:45:02 +0800 IronPort-SDR: zD+OGdQcJgClHDzMUWbM8b+DjgUPFaAgfPjzEvWxTOR3afQgLnLzsX7qsXpFaSbkReq5BPA5vJ fd1YTWcGgizI1AosbO5eaZm7yO4rekBGTWElMwyzh+0RS2Z8wggBe4+Sx0HPhdNdAOEOafwWWt FO1JYrBafX9wcO0LT/Gy7kFUurwfeu8Xm/JWMONfgRPewA0BKhmdqT3yL7i/YtLGijZWPcj/ip wDIPG9U0IUpydt2Gftk5R2oyZpeTYu9i7J9SJzxLbX0u74c++m0AbYglgN+xdJAjDga5/ef/vZ ivRWKe5vqBa+XD9E+gOevnRP Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2020 09:36:04 -0700 IronPort-SDR: l2sIxGqW/FkQLjy3vOlYR/6DWYMskcMVhJtu1prKTtbJMlJXSlxVf7pqPonSntgIFuks8Gmh50 hhp3i1uFUcktOwpV2ewsYWlsVnIYkAHSx+jidbrpTKqO8vrQpeTRWikwhPHX5Qt6+dcKN6iFWJ LS8DCgh5k9Y9I+nK1wiS8yCB/WTJ4QpURliO8xjNXbAKz4xG2uy1cstFvS8xOieD6UxMKbF1YF 2bUwIPjxKAYpDnih266mXn+JIutIwAaDwV/WVQHV0AF182Gcv0lufEnZJ7v2t1DMfa/Yom/Csk U/E= WDCIronportException: Internal Received: from lpt-shen-j.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.54.198]) by uls-op-cesaip02.wdc.com with ESMTP; 26 Mar 2020 09:45:01 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: Vineet.Gupta1@synopsys.com, alistair23@gmail.com, Alistair Francis Subject: [PATCH v4 2/3] semctl: Remove the sem-pad.h file Date: Thu, 26 Mar 2020 09:37:23 -0700 Message-Id: <20200326163724.377351-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200326163724.377351-1-alistair.francis@wdc.com> References: <20200326163724.377351-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-26.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 16:45:08 -0000 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 ddb2a54e57..af6dc61886 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/sem-pad.h bits/shmlba.h bits/shm-pad.h \ + bits/msq-pad.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; +}; From patchwork Thu Mar 26 16:37:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38631 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by sourceware.org (Postfix) with ESMTPS id 0A524385E023 for ; Thu, 26 Mar 2020 16:45:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0A524385E023 IronPort-SDR: m0XW43DVDsTqTAjdMZHcWmfoQwvQxvPTWbB9fhFWeA4iVtE9SMSOn5IDkLgQ00gKug2zWcND95 qZqzjzWCl9LL50TSV4LhpBZXro8/HZg6TDFWc4lR/8YgsCIyfGF68dibI4GqXS+rOW2aF0J4M+ gRxgUbpyndQPs7RDSBZRabNXL5uHmJIokrMr/g0XIYa1WjXczMIla6znVu7UQQcaBcrgQEvYPb clhRmWxxGrrMG/fi9mRwAi3Q7kAsCHVnJcnP44AEFGTOKS28jaLOgdWl5zOPp2xOcfy+2DM4R/ 2dU= X-IronPort-AV: E=Sophos;i="5.72,309,1580745600"; d="scan'208";a="134027533" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 27 Mar 2020 00:45:02 +0800 IronPort-SDR: DA2KHFS6mCBRYNOstS/Ae/wXZenTfCWIULGXGFSgwjnOcXV66QbreXUGod5P7rNT9m7IR6uEWQ xQ67Tm5ZC1Sbg4LpDADmlIgFV/0ov4h+AoinIQzwyaLwh+i2rDC2GR4/vya1s4MDV+8DVlDFuu iYvmgYNTMmPtK0l56cs+5B1HpayjSmMrQuAGPtkVEUCy+QYOG+aqphRiiUcX9LRtO8vmKoZyML PdmrLSfY3XPLxk4fiUzA1Fx3JCyUbrDXdYSo9bvjIfQZdye4ayG8aadiw0J5GwIGbYRO01JihJ XHvCB7Ftp9PCUxGJKe/Fgi1/ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2020 09:36:04 -0700 IronPort-SDR: oYPE+b41q7eWHNdPNM6RQTHKwIeCxZuuFz6TyeP9ktWSGRJCUbgqyxLpYcS/4LnwBPL9iRxXuG W0NmN9ONIuPD61MSy6pHOQOXvZq6Rsqnl6GgjGxNSGnxf4eQLtNMFpW3FjesI088LN0ikz+i2b De8zvzJCwpaP/1O1T7RsLFhX5MRxISzOznhzQG5KncovQXSyVxNE0uT1nWH/qOT2Oe6ErW/sEp 0PLDBR6L87HqZe5lt40qrScDQ+4RdVmg2Saqc9+pY35sToE5PS2SUYQT5oUZr790M3fGBhwwYP 2uo= WDCIronportException: Internal Received: from lpt-shen-j.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.54.198]) by uls-op-cesaip02.wdc.com with ESMTP; 26 Mar 2020 09:45:01 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: Vineet.Gupta1@synopsys.com, alistair23@gmail.com, Alistair Francis Subject: [PATCH v4 3/3] sysv: linux: Pass 64-bit version of semctl syscall Date: Thu, 26 Mar 2020 09:37:24 -0700 Message-Id: <20200326163724.377351-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200326163724.377351-1-alistair.francis@wdc.com> References: <20200326163724.377351-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-25.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 16:45:06 -0000 The semctl_syscall() function passes a union semun to the kernel. The union includes struct semid_ds as a member. On 32-bit architectures the Linux kernel provides a *_high version of the 32-bit sem_otime and sem_ctime values. These can be combined to get a 64-bit version of the time. This patch adjusts the struct semid_ds to support the *_high versions of sem_otime and sem_ctime. For 32-bit systems with a 64-bit time_t this can be used to get a 64-bit time from the two 32-bit values. Due to allignment differences between 64-bit and 32-bit variables we also need to set nsems to ensure it's correct. --- sysdeps/unix/sysv/linux/bits/semid_ds_t.h | 15 ++++++++++++ .../unix/sysv/linux/hppa/bits/semid_ds_t.h | 15 ++++++++++++ .../unix/sysv/linux/mips/bits/semid_ds_t.h | 13 ++++++++++ .../unix/sysv/linux/powerpc/bits/semid_ds_t.h | 15 ++++++++++++ sysdeps/unix/sysv/linux/semctl.c | 24 +++++++++++++++---- .../unix/sysv/linux/sparc/bits/semid_ds_t.h | 15 ++++++++++++ sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h | 15 ++++++++++++ 7 files changed, 108 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/bits/semid_ds_t.h index d9d902ed0d..b135301356 100644 --- a/sysdeps/unix/sysv/linux/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif + /* Data structure describing a set of semaphores. */ #if __TIMESIZE == 32 struct semid_ds diff --git a/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h index 39c0e53f38..3613c5ec94 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_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 + /* Data structure describing a set of semaphores. */ #if __TIMESIZE == 32 struct semid_ds diff --git a/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h index 1ab16492dd..e26906a67f 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h @@ -20,6 +20,19 @@ # error "Never include directly; use instead." #endif +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime; /* last semop time */ + __syscall_ulong_t sem_ctime; /* last change time */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t sem_otime_high; + __syscall_ulong_t sem_ctime_high; +}; +#endif + /* Data structure describing a set of semaphores. */ struct semid_ds { diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h index 79b4cba939..ec2ff552eb 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_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 + /* Data structure describing a set of semaphores. */ #if __TIMESIZE == 32 struct semid_ds diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c index 30571af49f..38c2fc6545 100644 --- a/sysdeps/unix/sysv/linux/semctl.c +++ b/sysdeps/unix/sysv/linux/semctl.c @@ -29,6 +29,9 @@ union semun { int val; /* value for SETVAL */ struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ +#if __WORDSIZE == 32 + struct __semid_ds32 *buf32; /* 32-bit buffer for IPC_STAT */ +#endif unsigned short int *array; /* array for GETALL & SETALL */ struct seminfo *__buf; /* buffer for IPC_INFO */ }; @@ -44,13 +47,26 @@ union semun static int semctl_syscall (int semid, int semnum, int cmd, union semun arg) { + int ret; #ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS - return INLINE_SYSCALL_CALL (semctl, semid, semnum, cmd | __IPC_64, - arg.array); + ret = INLINE_SYSCALL_CALL (semctl, semid, semnum, cmd | __IPC_64, + arg.array); #else - return INLINE_SYSCALL_CALL (ipc, IPCOP_semctl, semid, semnum, cmd | __IPC_64, - SEMCTL_ARG_ADDRESS (arg)); + ret = INLINE_SYSCALL_CALL (ipc, IPCOP_semctl, semid, semnum, cmd | __IPC_64, + SEMCTL_ARG_ADDRESS (arg)); #endif + +#if __WORDSIZE == 32 && __TIMESIZE == 64 + if (ret == 0 && cmd == IPC_STAT) + { + arg.buf->sem_nsems = arg.buf32->sem_nsems; + arg.buf->sem_otime = arg.buf32->sem_otime | + ((time_t) arg.buf32->sem_otime_high << 32); + arg.buf->sem_ctime = arg.buf32->sem_ctime | + ((time_t) arg.buf32->sem_ctime_high << 32); + } +#endif + return ret; } int diff --git a/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h index f8de676e79..b08fb8a79e 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_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 + /* Data structure describing a set of semaphores. */ #if __TIMESIZE == 32 struct semid_ds diff --git a/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h index 42694069d5..c7b9adce88 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif + /* Data structure describing a set of semaphores. */ struct semid_ds {