From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id 9DC2D3858D35 for ; Tue, 7 Jul 2020 19:05:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9DC2D3858D35 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-9EeKjVt7N8aTPzI1BLi5Fw-1; Tue, 07 Jul 2020 15:05:16 -0400 X-MC-Unique: 9EeKjVt7N8aTPzI1BLi5Fw-1 Received: by mail-qv1-f71.google.com with SMTP id m18so14583190qvt.8 for ; Tue, 07 Jul 2020 12:05:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=JERtou/JEWsQIvDYk83H4IQYJqXPr9CFUDXundp9ppI=; b=KVq/nc/oQWAT8mMP7XzN50k/RGNhk/FoDh3gQo1DqUANd+tHGrYwj4in6PQvPQpsz6 zvWiKWed77GRMlTFIymM7ipOMPpHrqudIGJnK1ezOukhko3qrGDehk4Mhj+Jvcg6Qm35 HYQzWFnu2WJE42dMApxjxDN2veLnY6Phid+stiERenvByLX7ILyJNUC68Rrt2ty484n7 xMHXycRaojYfd0X7uuF4vveL0vQm19X3p14SnDuuknBYCldMwfBK0swwomlgMtKea2hB ZgKbODGxxoEGRsGdlTq8J7wBtvDjMTmiyTxgy7O22z64gYiNMnguE36K1CRB8XhXLhnk R+aQ== X-Gm-Message-State: AOAM532to1ly7TSx6r+jKE8jbrQapB2WUqTKKHLfsX4alSC7vtK1Nu7s HrLWnLkN4PgWuea0ZYo3f4V6WMJWurD4B3JLrvMtAZLfMqOaSqhYzt7WMG7vkFssNwF7bfbYfPa 6VjoyW+XbZmmH6abLjPcf X-Received: by 2002:ac8:774d:: with SMTP id g13mr55046648qtu.317.1594148715771; Tue, 07 Jul 2020 12:05:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDuz0EwcOOHi3jxw/gbFFexnZoupC0IgA4BKzqA7J936Usy8rIa49a6rvrH6xw8fgYlMNatA== X-Received: by 2002:ac8:774d:: with SMTP id g13mr55046582qtu.317.1594148715127; Tue, 07 Jul 2020 12:05:15 -0700 (PDT) Received: from [192.168.1.4] (198-84-170-103.cpe.teksavvy.com. [198.84.170.103]) by smtp.gmail.com with ESMTPSA id u22sm28558350qtb.23.2020.07.07.12.05.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jul 2020 12:05:13 -0700 (PDT) Subject: Re: [PATCH 3/7] sysvipc: Remove the linux msq-pad.h file To: Adhemerval Zanella , libc-alpha@sourceware.org Cc: stepan@golosunov.pp.ru, Alistair Francis References: <20200630192441.3299710-1-adhemerval.zanella@linaro.org> <20200630192441.3299710-3-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat Message-ID: Date: Tue, 7 Jul 2020 15:05:12 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200630192441.3299710-3-adhemerval.zanella@linaro.org> Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: Tue, 07 Jul 2020 19:05:21 -0000 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. > > Checked on x86_64-linux-gnu and some bases sysvipc tests on hppa, > mips, mipsle, mips64, mips64le, sparc64, sparcv9, powerpc64le, > powerpc64, and powerpc. OK for master with one comment fix. No regressions on x86_64 and i686. Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell > --- > sysdeps/unix/sysv/linux/Makefile | 2 +- > sysdeps/unix/sysv/linux/bits/msq-pad.h | 31 ---------- > .../sysv/linux/bits/types/struct_msqid_ds.h | 28 ++++------ > sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h | 26 --------- > .../linux/hppa/bits/types/struct_msqid_ds.h | 47 ++++++++++++++++ > sysdeps/unix/sysv/linux/mips/bits/msq-pad.h | 31 ---------- > .../linux/mips/bits/types/struct_msqid_ds.h | 56 +++++++++++++++++++ > .../unix/sysv/linux/powerpc/bits/msq-pad.h | 26 --------- > .../powerpc/bits/types/struct_msqid_ds.h | 47 ++++++++++++++++ > sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h | 26 --------- > .../linux/sparc/bits/types/struct_msqid_ds.h | 47 ++++++++++++++++ > 11 files changed, 210 insertions(+), 157 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/bits/msq-pad.h > delete mode 100644 sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h > create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h > delete mode 100644 sysdeps/unix/sysv/linux/mips/bits/msq-pad.h > create mode 100644 sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h > delete mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h > create mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h > delete mode 100644 sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h > create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h > > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index 70e2d9e044..505087e617 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/msq-pad.h bits/shmlba.h bits/shm-pad.h \ > + bits/shmlba.h bits/shm-pad.h \ OK. Remove msq-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/msq-pad.h b/sysdeps/unix/sysv/linux/bits/msq-pad.h > deleted file mode 100644 > index e4ffd39f27..0000000000 > --- a/sysdeps/unix/sysv/linux/bits/msq-pad.h > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* Define where padding goes in struct msqid_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_MSG_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. */ > - > -#define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32) > -#define __MSQ_PAD_BEFORE_TIME 0 OK. No generic version required. > diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h > index bfc56f6ac1..32173a7b60 100644 > --- a/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h > +++ b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h > @@ -20,27 +20,23 @@ > # error "Never use directly; include instead." > #endif > > -#include > - > -#if __MSQ_PAD_BEFORE_TIME > -# define __MSQ_PAD_TIME(NAME, RES) \ > - unsigned long int __glibc_reserved ## RES; __time_t NAME > -#elif __MSQ_PAD_AFTER_TIME > -# define __MSQ_PAD_TIME(NAME, RES) \ > - __time_t NAME; unsigned long int __glibc_reserved ## RES > -#else > -# define __MSQ_PAD_TIME(NAME, RES) \ > - __time_t NAME > -#endif > - > /* Structure of record for one message inside the kernel. > The type `struct msg' is opaque. */ > struct msqid_ds > { > struct ipc_perm msg_perm; /* structure describing operation permission */ > - __MSQ_PAD_TIME (msg_stime, 1); /* time of last msgsnd command */ > - __MSQ_PAD_TIME (msg_rtime, 2); /* time of last msgrcv command */ > - __MSQ_PAD_TIME (msg_ctime, 3); /* time of last change */ > +#if __TIMESIZE == 32 > + __time_t msg_stime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved1; > + __time_t msg_rtime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved2; > + __time_t msg_ctime; /* time of last change */ > + unsigned long int __glibc_reserved3; > +#else > + __time_t msg_stime; /* time of last msgsnd command */ > + __time_t msg_rtime; /* time of last msgsnd command */ > + __time_t msg_ctime; /* time of last change */ > +#endif OK. Generic linux version. > __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > msgqnum_t msg_qnum; /* number of messages currently on queue */ > msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > diff --git a/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h b/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h > deleted file mode 100644 > index 6986585ae7..0000000000 > --- a/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h > +++ /dev/null > @@ -1,26 +0,0 @@ > -/* Define where padding goes in struct msqid_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 > - . */ > - > -#ifndef _SYS_MSG_H > -# error "Never use directly; include instead." > -#endif > - > -#include > - > -#define __MSQ_PAD_AFTER_TIME 0 > -#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32) OK. > diff --git a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h > new file mode 100644 > index 0000000000..3cf70e36c4 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h > @@ -0,0 +1,47 @@ > +/* Linux/HPPA implementation of the SysV message struct msqid_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 > + . */ > + > +#ifndef _SYS_MSG_H > +# error "Never use directly; include instead." > +#endif > + > +/* Structure of record for one message inside the kernel. > + The type `struct msg' is opaque. */ > +struct msqid_ds > +{ > + struct ipc_perm msg_perm; /* structure describing operation permission */ > +#if __TIMESIZE == 32 > + unsigned long int __glibc_reserved1; > + __time_t msg_stime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved2; > + __time_t msg_rtime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved3; > + __time_t msg_ctime; /* time of last change */ > +#else > + __time_t msg_stime; /* time of last msgsnd command */ > + __time_t msg_rtime; /* time of last msgsnd command */ > + __time_t msg_ctime; /* time of last change */ > +#endif > + __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > + msgqnum_t msg_qnum; /* number of messages currently on queue */ > + msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > + __pid_t msg_lspid; /* pid of last msgsnd() */ > + __pid_t msg_lrpid; /* pid of last msgrcv() */ > + __syscall_ulong_t __glibc_reserved4; > + __syscall_ulong_t __glibc_reserved5; > +}; OK. Specific definition for hppa. > diff --git a/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h b/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h > deleted file mode 100644 > index 8e28c5abe1..0000000000 > --- a/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* Define where padding goes in struct msqid_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_MSG_H > -# error "Never use directly; include instead." > -#endif > - > -#include > - > -#ifdef __MIPSEL__ > -# define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32) > -# define __MSQ_PAD_BEFORE_TIME 0 > -#else > -# define __MSQ_PAD_AFTER_TIME 0 > -# define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32) > -#endif OK. > diff --git a/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h > new file mode 100644 > index 0000000000..85fdeef274 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h > @@ -0,0 +1,56 @@ > +/* Linux/PowerPC implementation of the SysV message struct msqid_ds. s/PowerPC/MIPS/g > + 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 > + . */ > + > +#ifndef _SYS_MSG_H > +# error "Never use directly; include instead." > +#endif > + > +/* Structure of record for one message inside the kernel. > + The type `struct msg' is opaque. */ > +struct msqid_ds > +{ > + struct ipc_perm msg_perm; /* structure describing operation permission */ > +#if __TIMESIZE == 32 > +# ifdef __MIPSEL__ > + __time_t msg_stime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved1; > + __time_t msg_rtime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved2; > + __time_t msg_ctime; /* time of last change */ > + unsigned long int __glibc_reserved3; > +# else > + unsigned long int __glibc_reserved1; > + __time_t msg_stime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved2; > + __time_t msg_rtime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved3; > + __time_t msg_ctime; /* time of last change */ > +# endif > +#else > + __time_t msg_stime; /* time of last msgsnd command */ > + __time_t msg_rtime; /* time of last msgsnd command */ > + __time_t msg_ctime; /* time of last change */ > +#endif > + __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > + msgqnum_t msg_qnum; /* number of messages currently on queue */ > + msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > + __pid_t msg_lspid; /* pid of last msgsnd() */ > + __pid_t msg_lrpid; /* pid of last msgrcv() */ > + __syscall_ulong_t __glibc_reserved4; > + __syscall_ulong_t __glibc_reserved5; > +}; > diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h b/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h > deleted file mode 100644 > index e2b9310800..0000000000 > --- a/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h > +++ /dev/null > @@ -1,26 +0,0 @@ > -/* Define where padding goes in struct msqid_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_MSG_H > -# error "Never use directly; include instead." > -#endif > - > -#include > - > -#define __MSQ_PAD_AFTER_TIME 0 > -#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32) OK. > diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h > new file mode 100644 > index 0000000000..4ae2fbcbdc > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h > @@ -0,0 +1,47 @@ > +/* Linux/PowerPC implementation of the SysV message struct msqid_ds. OK. > + 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 > + . */ > + > +#ifndef _SYS_MSG_H > +# error "Never use directly; include instead." > +#endif > + > +/* Structure of record for one message inside the kernel. > + The type `struct msg' is opaque. */ > +struct msqid_ds > +{ > + struct ipc_perm msg_perm; /* structure describing operation permission */ > +#if __TIMESIZE == 32 > + unsigned long int __glibc_reserved1; > + __time_t msg_stime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved2; > + __time_t msg_rtime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved3; > + __time_t msg_ctime; /* time of last change */ > +#else > + __time_t msg_stime; /* time of last msgsnd command */ > + __time_t msg_rtime; /* time of last msgsnd command */ > + __time_t msg_ctime; /* time of last change */ > +#endif > + __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > + msgqnum_t msg_qnum; /* number of messages currently on queue */ > + msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > + __pid_t msg_lspid; /* pid of last msgsnd() */ > + __pid_t msg_lrpid; /* pid of last msgrcv() */ > + __syscall_ulong_t __glibc_reserved4; > + __syscall_ulong_t __glibc_reserved5; > +}; > diff --git a/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h b/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h > deleted file mode 100644 > index 99fdf8c8f0..0000000000 > --- a/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h > +++ /dev/null > @@ -1,26 +0,0 @@ > -/* Define where padding goes in struct msqid_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 > - . */ > - > -#ifndef _SYS_MSG_H > -# error "Never use directly; include instead." > -#endif > - > -#include > - > -#define __MSQ_PAD_AFTER_TIME 0 > -#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32) OK. > diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h > new file mode 100644 > index 0000000000..71980839c7 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h > @@ -0,0 +1,47 @@ > +/* Linux/SPARC implementation of the SysV message struct msqid_ds. OK. > + 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 > + . */ > + > +#ifndef _SYS_MSG_H > +# error "Never use directly; include instead." > +#endif > + > +/* Structure of record for one message inside the kernel. > + The type `struct msg' is opaque. */ > +struct msqid_ds > +{ > + struct ipc_perm msg_perm; /* structure describing operation permission */ > +#if __TIMESIZE == 32 > + unsigned long int __glibc_reserved1; > + __time_t msg_stime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved2; > + __time_t msg_rtime; /* time of last msgsnd command */ > + unsigned long int __glibc_reserved3; > + __time_t msg_ctime; /* time of last change */ > +#else > + __time_t msg_stime; /* time of last msgsnd command */ > + __time_t msg_rtime; /* time of last msgsnd command */ > + __time_t msg_ctime; /* time of last change */ > +#endif > + __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > + msgqnum_t msg_qnum; /* number of messages currently on queue */ > + msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > + __pid_t msg_lspid; /* pid of last msgsnd() */ > + __pid_t msg_lrpid; /* pid of last msgrcv() */ > + __syscall_ulong_t __glibc_reserved4; > + __syscall_ulong_t __glibc_reserved5; > +}; > OK. -- Cheers, Carlos.