mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
After my patch to move SHMLBA to its own header, the bits/shm.h headers for architectures using the Linux kernel still vary in a few ways: the use of __syscall_ulong_t; whether padding for 32-bit systems is present before or after time fields, or missing altogether (mips, x32); whether shm_segsz is before or after the time fields; whether, if after time fields, there is extra padding before shm_segsz. This patch arranges for a single header to be used. __syscall_ulong_t is safe to use everywhere, while bits/shm-pad.h is added with new macros __SHM_PAD_AFTER_TIME, __SHM_PAD_BEFORE_TIME, __SHM_SEGSZ_AFTER_TIME and __SHM_PAD_BETWEEN_TIME_AND_SEGSZ to describe the differences. Tested for x86_64 and x86, and with build-many-glibcs.py. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add bits/shm-pad.h. * sysdeps/unix/sysv/linux/bits/shm.h: Include <bits/shm-pad.h>. (shmatt_t): Define as __syscall_ulong_t. (__SHM_PAD_TIME): New macro, depending on [__SHM_PAD_BEFORE_TIME] and [__SHM_PAD_AFTER_TIME]. (struct shmid_ds): Define time fields using __SHM_PAD_TIME. Define shm_segsz and associated padding based on [__SHM_SEGSZ_AFTER_TIME] and [__SHM_PAD_BETWEEN_TIME_AND_SEGSZ]. Use __syscall_ulong_t instead of unsigned long int. [__USE_MISC] (struct shminfo): Use __syscall_ulong_t instead of unsigned long int. [__USE_MISC] (struct shm_info): Likewise. * sysdeps/unix/sysv/linux/bits/shm-pad.h: New file. * sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/shm-pad.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h: Likewise. * sysdeps/unix/sysv/linux/x86/bits/shm-pad.h: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/shm.h: Remove. * sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/x86/bits/shm.h: Likewise. |
||
---|---|---|
.. | ||
bits | ||
include/asm | ||
sys | ||
arch-pkey.h | ||
cpu-features.c | ||
dl-cet.h | ||
dl-sysdep.c | ||
elision-conf.c | ||
elision-conf.h | ||
elision-lock.c | ||
elision-timed.c | ||
elision-trylock.c | ||
elision-unlock.c | ||
force-elision.h | ||
gettimeofday.c | ||
hle.h | ||
Implies | ||
jmp_buf-ssp.sym | ||
libc-vdso.h | ||
Makefile | ||
pkey_get.c | ||
pkey_set.c | ||
pthread_mutex_cond_lock.c | ||
pthread_mutex_lock.c | ||
pthread_mutex_timedlock.c | ||
pthread_mutex_trylock.c | ||
setjmpP.h | ||
sysconf.c | ||
time.c | ||
tst-cet-property-1.c | ||
tst-cet-property-2.c | ||
tst-cet-property-dep-2.S | ||
tst-cet-setcontext-1.c | ||
tst-saved_mask-1.c |