AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-14 01:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

alpha: Do not redefine __NR_shmat or __NR_osf_shmat

Browse Source 
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 d5ecee822e)
This commit is contained in:
Richard Henderson 2019-04-01 15:54:00 +07:00 committed by Aurelien Jarno
parent 2d3fefd7ce
commit 23ef51a50a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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]

6
sysdeps/unix/sysv/linux/alpha/kernel-features.h
View File

@ -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

4
sysdeps/unix/sysv/linux/alpha/sysdep.h
View File

@ -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