diff options
| author |   Richard Henderson <richard.henderson@linaro.org> | 2019-04-01 15:54:00 +0700 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2019-11-25 01:54:40 +0100 |
| commit | c291129381de3323eed5ebaaf5d839fdaf67b895 (patch) | |
| tree | 8997ff96381a0af591df561120802aa7350799d8 | |
| parent | posix: Fix large mmap64 offset for mips64n32 (BZ#24699) (diff) | |
| download | glibc-c291129381de3323eed5ebaaf5d839fdaf67b895.tar.gz glibc-c291129381de3323eed5ebaaf5d839fdaf67b895.tar.bz2 glibc-c291129381de3323eed5ebaaf5d839fdaf67b895.zip | |
alpha: Do not redefine __NR_shmat or __NR_osf_shmat
Fixes build using v5.1-rc1 headers.
The kernel has cleaned up how these are defined. Previous behavior
was to define __NR_osf_shmat as 209 and not define __NR_shmat.
Current behavior is to define __NR_shmat as 209 and then define
__NR_osf_shmat as __NR_shmat.
* sysdeps/unix/sysv/linux/alpha/kernel-features.h (__NR_shmat):
Do not redefine.
* sysdeps/unix/sysv/linux/alpha/sysdep.h (__NR_osf_shmat):
Do not redefine.
(cherry picked from commit d5ecee822e72a2fd156338ab2be2f2e70a1da55a)
(cherry picked from commit 23ef51a50aed3ff235aba6d0efae0f1e8937e06e)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/kernel-features.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/sysdep.h | 4 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2019-08-15 Richard Henderson <rth@twiddle.net> + + * sysdeps/unix/sysv/linux/alpha/kernel-features.h (__NR_shmat): + Do not redefine. + * sysdeps/unix/sysv/linux/alpha/sysdep.h (__NR_osf_shmat): + Do not redefine. + 2019-07-15 Adhemerval Zanella <adhemerval.zanella@linaro.org> [BZ #24699] diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h index 46178c5636..fc8407c8ab 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h @@ -26,8 +26,10 @@ #undef __ASSUME_STATFS64 #define __ASSUME_STATFS64 0 -/* Alpha defines SysV ipc shmat syscall with a different name. */ -#define __NR_shmat __NR_osf_shmat +/* Alpha used to define SysV ipc shmat syscall with a different name. */ +#ifndef __NR_shmat +# define __NR_shmat __NR_osf_shmat +#endif #define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep.h b/sysdeps/unix/sysv/linux/alpha/sysdep.h index dcf2d1e3d7..d61d4df550 100644 --- a/sysdeps/unix/sysv/linux/alpha/sysdep.h +++ b/sysdeps/unix/sysv/linux/alpha/sysdep.h @@ -51,7 +51,9 @@ * Some syscalls no Linux program should know about: */ #define __NR_osf_sigprocmask 48 -#define __NR_osf_shmat 209 +#ifndef __NR_osf_shmat +# define __NR_osf_shmat 209 +#endif #define __NR_osf_getsysinfo 256 #define __NR_osf_setsysinfo 257 |