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.

diff --git a/ChangeLog b/ChangeLog
index bef50d40f60f8d8f57cba46aa4429ffaa7071a8d..54b90015ad9ef1c4c1450162b2ed3087bc98fa7b 100644 (file)
--- 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

diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
index 0b0a94af2c8be0b9a221c0d6f8da2d6c4aca289a..f3298b234e765d4a87dce6589b2260a83727324c 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