Use single bits/msq.h for all architectures.
commit9f9feb6d5db3bf7b3cda6d7a23029f93da80895d
authorJoseph Myers <joseph@codesourcery.com>
Thu, 11 Oct 2018 12:07:27 +0000 (11 12:07 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Thu, 11 Oct 2018 12:07:27 +0000 (11 12:07 +0000)
treea16e9a322b8057186349ded89f5f999b7be310a5
parent2a4b25fad858ccae361afca6d4710e0e6b01b2b5
Use single bits/msq.h for all architectures.

The bits/msq.h headers for architectures using the Linux kernel vary
in a few ways:

* x32 uses __syscall_ulong_t instead of unsigned long int.

* x32 has 64-bit time_t, so no padding around time fields despite
  __WORDSIZE == 32.

* Some older 32-bit big-endian architectures have padding before
  rather than after time fields, although the preferred generic
  approach is padding after the time fields independent of endianness.

(There are also insubstantial differences such as use of unsigned int
for padding instead of unsigned long int, which makes no difference to
layout since the padding fields using unsigned int are only present on
32-bit architectures.)

For the first, __syscall_ulong_t can be used in the generic version as
it's the same as unsigned long int everywhere except x32.  For the
other two differences, this patch adds macros __MSQ_PAD_BEFORE_TIME
and __MSQ_PAD_AFTER_TIME in a new bits/msq-pad.h header, so that
header is the only one needing to be provided on architectures with
differences in this area, and everything else can go in a single
common bits/msq.h header.  Once we have __TIMESIZE, the generic
bits/msq-pad.h can change to use that instead of __WORDSIZE, at which
point the x86 version of bits/msq-pad.h won't be needed either.

Tested for x86_64 and x86, and with build-many-glibcs.py.

* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
bits/msq-pad.h.
* sysdeps/unix/sysv/linux/bits/msq.h: Include <bits/msq-pad.h>
instead of <bits/wordsize.h>.
(msgqnum_t): Define as __syscall_ulong_t.
(msglen_t): Likewise.
(__MSQ_PAD_TIME): New macro, depending on [__MSQ_PAD_BEFORE_TIME]
and [__MSQ_PAD_AFTER_TIME].
(struct msqid_ds): Define time fields using __MSQ_PAD_TIME.  Use
__syscall_ulong_t instead of unsigned long int.
* sysdeps/unix/sysv/linux/bits/msq-pad.h: New file.
* sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/msq-pad.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h: Likewise.
* sysdeps/unix/sysv/linux/x86/bits/msq-pad.h: Likewise.
* sysdeps/unix/sysv/linux/hppa/bits/msq.h: Remove.
* sysdeps/unix/sysv/linux/mips/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/x86/bits/msq.h: Likewise.
14 files changed:
ChangeLog
sysdeps/unix/sysv/linux/Makefile
sysdeps/unix/sysv/linux/bits/msq-pad.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/bits/msq.h
sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/hppa/bits/msq.h [deleted file]
sysdeps/unix/sysv/linux/mips/bits/msq-pad.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/mips/bits/msq.h [deleted file]
sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/powerpc/bits/msq.h [deleted file]
sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/sparc/bits/msq.h [deleted file]
sysdeps/unix/sysv/linux/x86/bits/msq-pad.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/x86/bits/msq.h [deleted file]