public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/vineet/arc-port-latest] msgctl: Remove the msg-pad.h file
@ 2020-06-26  0:21 Vineet Gupta
  0 siblings, 0 replies; only message in thread
From: Vineet Gupta @ 2020-06-26  0:21 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=aad0a9cbe1d9c6551f75311e2068d03595fd64a6

commit aad0a9cbe1d9c6551f75311e2068d03595fd64a6
Author: Alistair Francis <alistair.francis@wdc.com>
Date:   Wed Apr 29 10:08:41 2020 -0700

    msgctl: Remove the msg-pad.h file
    
    Remove the msg-pad.h file and instead have architectures override the
    struct msqid_ds via the bits/types/struct_msqid_ds.h file.

Diff:
---
 sysdeps/unix/sysv/linux/Makefile                   |  2 +-
 sysdeps/unix/sysv/linux/bits/msq-pad.h             | 31 ---------
 sysdeps/unix/sysv/linux/bits/msq.h                 |  2 +-
 .../unix/sysv/linux/bits/types/struct_msqid_ds.h   | 37 ++++++----
 sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h        | 26 --------
 .../sysv/linux/hppa/bits/types/struct_msqid_ds.h   | 58 ++++++++++++++++
 sysdeps/unix/sysv/linux/mips/bits/msq-pad.h        | 31 ---------
 .../sysv/linux/mips/bits/types/struct_msqid_ds.h   | 78 ++++++++++++++++++++++
 sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h     | 26 --------
 .../linux/powerpc/bits/types/struct_msqid_ds.h     | 58 ++++++++++++++++
 sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h       | 26 --------
 .../sysv/linux/sparc/bits/types/struct_msqid_ds.h  | 58 ++++++++++++++++
 12 files changed, 277 insertions(+), 156 deletions(-)

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 \
 		  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
-   <https://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MSG_H
-# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-/* On most architectures, padding goes after time fields for 32-bit
-   systems and is omitted for 64-bit systems.  Some architectures pad
-   before time fields instead, or omit padding despite being
-   32-bit.  */
-
-#define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32)
-#define __MSQ_PAD_BEFORE_TIME 0
diff --git a/sysdeps/unix/sysv/linux/bits/msq.h b/sysdeps/unix/sysv/linux/bits/msq.h
index 246c18f7fe..93b93f4ade 100644
--- a/sysdeps/unix/sysv/linux/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/bits/msq.h
@@ -20,7 +20,7 @@
 #endif
 
 #include <bits/types.h>
-#include <bits/msq-pad.h>
+#include <bits/timesize.h>
 
 /* Define options for message queue functions.  */
 #define MSG_NOERROR	010000	/* no error if message is too big */
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 21a9f3e04e..4864cc68d5 100644
--- a/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
+++ b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
@@ -20,25 +20,33 @@
 # error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
 #endif
 
-#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.  */
+#if __TIMESIZE == 32
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  __time_t msg_stime;  /* time of last msgsnd command */
+  unsigned long int __glibc_reserved1;
+  __time_t msg_rtime;  /* time of last msgrcv command */
+  unsigned long int __glibc_reserved2;
+  __time_t msg_ctime;  /* time of last change */
+  unsigned long int __glibc_reserved3;
+  __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;
+};
+#else
 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 */
+  __time_t msg_stime;  /* time of last msgsnd command */
+  __time_t msg_rtime;  /* time of last msgrcv command */
+  __time_t msg_ctime;  /* time of last change */
   __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 */
@@ -47,3 +55,4 @@ struct msqid_ds
   __syscall_ulong_t __glibc_reserved4;
   __syscall_ulong_t __glibc_reserved5;
 };
+#endif
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
-   <https://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MSG_H
-# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-#define __MSQ_PAD_AFTER_TIME 0
-#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
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..ff4e011d99
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h
@@ -0,0 +1,58 @@
+/* HPPA implementation of the message struct msqid_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
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_MSG_H
+# error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
+#endif
+
+/* Structure of record for one message inside the kernel.
+   The type `struct msg' is opaque.  */
+#if __TIMESIZE == 32
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  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 msgrcv command */
+  unsigned long int __glibc_reserved3;
+  __time_t msg_ctime;  /* time of last change */
+  __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;
+};
+#else
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  __time_t msg_stime;  /* time of last msgsnd command */
+  __time_t msg_rtime;  /* time of last msgrcv command */
+  __time_t msg_ctime;  /* time of last change */
+  __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;
+};
+#endif
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
-   <https://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MSG_H
-# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-#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
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..15c0c94a7a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h
@@ -0,0 +1,78 @@
+/* MIPS implementation of the message struct msqid_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
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_MSG_H
+# error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
+#endif
+
+/* Structure of record for one message inside the kernel.
+   The type `struct msg' is opaque.  */
+#if __TIMESIZE == 32
+# ifdef __MIPSEL__
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  __time_t msg_stime;  /* time of last msgsnd command */
+  unsigned long int __glibc_reserved1;
+  __time_t msg_rtime;  /* time of last msgrcv command */
+  unsigned long int __glibc_reserved2;
+  __time_t msg_ctime;  /* time of last change */
+  unsigned long int __glibc_reserved3;
+  __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;
+};
+# else
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  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 msgrcv command */
+  unsigned long int __glibc_reserved3;
+  __time_t msg_ctime;  /* time of last change */
+  __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;
+};
+# endif
+#else
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  __time_t msg_stime;  /* time of last msgsnd command */
+  __time_t msg_rtime;  /* time of last msgrcv command */
+  __time_t msg_ctime;  /* time of last change */
+  __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;
+};
+#endif
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
-   <https://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MSG_H
-# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-#define __MSQ_PAD_AFTER_TIME 0
-#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
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..25d2ec1280
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h
@@ -0,0 +1,58 @@
+/* PowerPC implementation of the message struct msqid_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
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_MSG_H
+# error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
+#endif
+
+/* Structure of record for one message inside the kernel.
+   The type `struct msg' is opaque.  */
+#if __TIMESIZE == 32
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  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 msgrcv command */
+  unsigned long int __glibc_reserved3;
+  __time_t msg_ctime;  /* time of last change */
+  __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;
+};
+#else
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  __time_t msg_stime;  /* time of last msgsnd command */
+  __time_t msg_rtime;  /* time of last msgrcv command */
+  __time_t msg_ctime;  /* time of last change */
+  __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;
+};
+#endif
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
-   <https://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MSG_H
-# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
-#endif
-
-#include <bits/timesize.h>
-
-#define __MSQ_PAD_AFTER_TIME 0
-#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
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..a7401dc09e
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h
@@ -0,0 +1,58 @@
+/* Sparc implementation of the message struct msqid_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
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_MSG_H
+# error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
+#endif
+
+/* Structure of record for one message inside the kernel.
+   The type `struct msg' is opaque.  */
+#if __TIMESIZE == 32
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  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 msgrcv command */
+  unsigned long int __glibc_reserved3;
+  __time_t msg_ctime;  /* time of last change */
+  __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;
+};
+#else
+struct msqid_ds
+{
+  struct ipc_perm msg_perm; /* structure describing operation permission */
+  __time_t msg_stime;  /* time of last msgsnd command */
+  __time_t msg_rtime;  /* time of last msgrcv command */
+  __time_t msg_ctime;  /* time of last change */
+  __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;
+};
+#endif


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2020-06-26  0:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-26  0:21 [glibc/vineet/arc-port-latest] msgctl: Remove the msg-pad.h file Vineet Gupta

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).