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)

diff --git a/ChangeLog b/ChangeLog
index 026f1d6b9e4a6aa7213432f5a63f14fb0243db1d..9ef062f6c083a3c703712f5516efbed90984d3cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 46178c5636a04fb67945dc3a86d555aa9d1e5240..fc8407c8abdf25d56cc1165685411b8b6da0e7f1 100644 (file)
--- 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 dcf2d1e3d7a8f9bf97abdcde7856d44aede3fbb0..d61d4df5500bd07a90de072f8ff234a10a4f5a7f 100644 (file)
--- 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