about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/alpha/kernel-features.h
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2019-04-01 15:54:00 +0700
committerRichard Henderson <richard.henderson@linaro.org>2019-04-01 15:54:00 +0700
commitd5ecee822e72a2fd156338ab2be2f2e70a1da55a (patch)
tree955b6c394dd38e3acc97c59b158ca091725b3147 /sysdeps/unix/sysv/linux/alpha/kernel-features.h
parent656dd306d49f34fb89a118624def9c1db8a9cfcb (diff)
downloadglibc-d5ecee822e72a2fd156338ab2be2f2e70a1da55a.tar.gz
glibc-d5ecee822e72a2fd156338ab2be2f2e70a1da55a.tar.xz
glibc-d5ecee822e72a2fd156338ab2be2f2e70a1da55a.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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/alpha/kernel-features.h')
-rw-r--r--sysdeps/unix/sysv/linux/alpha/kernel-features.h6
1 files changed, 4 insertions, 2 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