This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat
- From: Richard Henderson <richard dot henderson at linaro dot org>
- To: libc-alpha at sourceware dot org
- Cc: Richard Henderson <richard dot henderson at linaro dot org>
- Date: Mon, 1 Apr 2019 16:05:10 +0700
- Subject: [PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat
From: Richard Henderson <richard.henderson@linaro.org>
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.
Committed.
r~
* 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.
---
sysdeps/unix/sysv/linux/alpha/kernel-features.h | 6 ++++--
sysdeps/unix/sysv/linux/alpha/sysdep.h | 4 +++-
ChangeLog | 7 +++++++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
index 0b0a94af2c..f3298b234e 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
diff --git a/ChangeLog b/ChangeLog
index bef50d40f6..54b90015ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-01 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-03-30 Maciej W. Rozycki <macro@wdc.com>
* sysdeps/unix/sysv/linux/riscv/configure.ac: Quote
--
2.17.1