未验证 提交 cf485f70 编辑于 作者: Kito Cheng's avatar Kito Cheng 提交者: GitHub
浏览文件

Merge pull request #872 from riscv/bump-glibc

Bump glibc and linux kernel
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
branch = riscv-gcc-10.2.0 branch = riscv-gcc-10.2.0
[submodule "riscv-glibc"] [submodule "riscv-glibc"]
path = riscv-glibc path = riscv-glibc
url = ../riscv-glibc.git url = git://sourceware.org/git/glibc.git
branch = riscv-glibc-2.29
[submodule "riscv-dejagnu"] [submodule "riscv-dejagnu"]
path = riscv-dejagnu path = riscv-dejagnu
url = ../riscv-dejagnu.git url = ../riscv-dejagnu.git
......
cmd_/home/users/kito/riscv-gnu-toolchain-workspace/riscv-gnu-toolchain/linux/install_hdr/include/asm-generic/.install := /bin/sh scripts/headers_install.sh /home/users/kito/riscv-gnu-toolchain-workspace/riscv-gnu-toolchain/linux/install_hdr/include/asm-generic ./include/uapi/asm-generic sembuf.h fcntl.h errno.h int-ll64.h termios.h ipcbuf.h posix_types.h ioctls.h msgbuf.h siginfo.h socket.h termbits.h swab.h sockios.h resource.h bpf_perf_event.h stat.h kvm_para.h signal.h auxvec.h mman.h statfs.h ucontext.h param.h poll.h mman-common.h int-l64.h errno-base.h unistd.h bitsperlong.h shmbuf.h ioctl.h setup.h types.h hugetlb_encode.h signal-defs.h; /bin/sh scripts/headers_install.sh /home/users/kito/riscv-gnu-toolchain-workspace/riscv-gnu-toolchain/linux/install_hdr/include/asm-generic ./include/generated/uapi/asm-generic ; touch /home/users/kito/riscv-gnu-toolchain-workspace/riscv-gnu-toolchain/linux/install_hdr/include/asm-generic/.install
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define HUGETLB_FLAG_ENCODE_SHIFT 26 #define HUGETLB_FLAG_ENCODE_SHIFT 26
#define HUGETLB_FLAG_ENCODE_MASK 0x3f #define HUGETLB_FLAG_ENCODE_MASK 0x3f
#define HUGETLB_FLAG_ENCODE_16KB (14 << HUGETLB_FLAG_ENCODE_SHIFT)
#define HUGETLB_FLAG_ENCODE_64KB (16 << HUGETLB_FLAG_ENCODE_SHIFT) #define HUGETLB_FLAG_ENCODE_64KB (16 << HUGETLB_FLAG_ENCODE_SHIFT)
#define HUGETLB_FLAG_ENCODE_512KB (19 << HUGETLB_FLAG_ENCODE_SHIFT) #define HUGETLB_FLAG_ENCODE_512KB (19 << HUGETLB_FLAG_ENCODE_SHIFT)
#define HUGETLB_FLAG_ENCODE_1MB (20 << HUGETLB_FLAG_ENCODE_SHIFT) #define HUGETLB_FLAG_ENCODE_1MB (20 << HUGETLB_FLAG_ENCODE_SHIFT)
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#ifndef __ASM_GENERIC_IPCBUF_H #ifndef __ASM_GENERIC_IPCBUF_H
#define __ASM_GENERIC_IPCBUF_H #define __ASM_GENERIC_IPCBUF_H
#include <linux/posix_types.h>
/* /*
* The generic ipc64_perm structure: * The generic ipc64_perm structure:
* Note extra padding because this structure is passed back and forth * Note extra padding because this structure is passed back and forth
......
...@@ -11,25 +11,28 @@ ...@@ -11,25 +11,28 @@
#define PROT_WRITE 0x2 /* page can be written */ #define PROT_WRITE 0x2 /* page can be written */
#define PROT_EXEC 0x4 /* page can be executed */ #define PROT_EXEC 0x4 /* page can be executed */
#define PROT_SEM 0x8 /* page may be used for atomic ops */ #define PROT_SEM 0x8 /* page may be used for atomic ops */
/* 0x10 reserved for arch-specific use */
/* 0x20 reserved for arch-specific use */
#define PROT_NONE 0x0 /* page can not be accessed */ #define PROT_NONE 0x0 /* page can not be accessed */
#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */ #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */ #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
#define MAP_SHARED 0x01 /* Share changes */ /* 0x01 - 0x03 are defined in linux/mman.h */
#define MAP_PRIVATE 0x02 /* Changes are private */
#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
#define MAP_TYPE 0x0f /* Mask for type of mapping */ #define MAP_TYPE 0x0f /* Mask for type of mapping */
#define MAP_FIXED 0x10 /* Interpret addr exactly */ #define MAP_FIXED 0x10 /* Interpret addr exactly */
#define MAP_ANONYMOUS 0x20 /* don't use a file */ #define MAP_ANONYMOUS 0x20 /* don't use a file */
#ifdef CONFIG_MMAP_ALLOW_UNINITIALIZED
# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized */
#else
# define MAP_UNINITIALIZED 0x0 /* Don't support this flag */
#endif
/* 0x0100 - 0x80000 flags are defined in asm-generic/mman.h */ /* 0x0100 - 0x4000 flags are defined in asm-generic/mman.h */
#define MAP_POPULATE 0x008000 /* populate (prefault) pagetables */
#define MAP_NONBLOCK 0x010000 /* do not block on IO */
#define MAP_STACK 0x020000 /* give out an address that is best suited for process/thread stacks */
#define MAP_HUGETLB 0x040000 /* create a huge page mapping */
#define MAP_SYNC 0x080000 /* perform synchronous page faults for the mapping */
#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */ #define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
#define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be
* uninitialized */
/* /*
* Flags for mlock * Flags for mlock
*/ */
...@@ -66,6 +69,9 @@ ...@@ -66,6 +69,9 @@
#define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */ #define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */
#define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */ #define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */
#define MADV_COLD 20 /* deactivate these pages */
#define MADV_PAGEOUT 21 /* reclaim these pages */
/* compatibility flags */ /* compatibility flags */
#define MAP_FILE 0 #define MAP_FILE 0
......
...@@ -9,13 +9,11 @@ ...@@ -9,13 +9,11 @@
#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */
#define MAP_LOCKED 0x2000 /* pages are locked */ #define MAP_LOCKED 0x2000 /* pages are locked */
#define MAP_NORESERVE 0x4000 /* don't check for reservations */ #define MAP_NORESERVE 0x4000 /* don't check for reservations */
#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */
#define MAP_NONBLOCK 0x10000 /* do not block on IO */
#define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */
#define MAP_HUGETLB 0x40000 /* create a huge page mapping */
#define MAP_SYNC 0x80000 /* perform synchronous page faults for the mapping */
/* Bits [26:31] are reserved, see mman-common.h for MAP_HUGETLB usage */ /*
* Bits [26:31] are reserved, see asm-generic/hugetlb_encode.h
* for MAP_HUGETLB usage
*/
#define MCL_CURRENT 1 /* lock all current mappings */ #define MCL_CURRENT 1 /* lock all current mappings */
#define MCL_FUTURE 2 /* lock all future mappings */ #define MCL_FUTURE 2 /* lock all future mappings */
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
#define __ASM_GENERIC_MSGBUF_H #define __ASM_GENERIC_MSGBUF_H
#include <asm/bitsperlong.h> #include <asm/bitsperlong.h>
#include <asm/ipcbuf.h>
/* /*
* generic msqid64_ds structure. * generic msqid64_ds structure.
* *
...@@ -13,9 +15,9 @@ ...@@ -13,9 +15,9 @@
* everyone just ended up making identical copies without specific * everyone just ended up making identical copies without specific
* optimizations, so we may just as well all use the same one. * optimizations, so we may just as well all use the same one.
* *
* 64 bit architectures typically define a 64 bit __kernel_time_t, * 64 bit architectures use a 64-bit long time field here, while
* so they do not need the first three padding words. * 32 bit architectures have a pair of unsigned long values.
* On big-endian systems, the padding is in the wrong place. * On big-endian systems, the lower half is in the wrong place.
* *
* Pad space is left for: * Pad space is left for:
* - 2 miscellaneous 32-bit values * - 2 miscellaneous 32-bit values
...@@ -24,9 +26,9 @@ ...@@ -24,9 +26,9 @@
struct msqid64_ds { struct msqid64_ds {
struct ipc64_perm msg_perm; struct ipc64_perm msg_perm;
#if __BITS_PER_LONG == 64 #if __BITS_PER_LONG == 64
__kernel_time_t msg_stime; /* last msgsnd time */ long msg_stime; /* last msgsnd time */
__kernel_time_t msg_rtime; /* last msgrcv time */ long msg_rtime; /* last msgrcv time */
__kernel_time_t msg_ctime; /* last change time */ long msg_ctime; /* last change time */
#else #else
unsigned long msg_stime; /* last msgsnd time */ unsigned long msg_stime; /* last msgsnd time */
unsigned long msg_stime_high; unsigned long msg_stime_high;
......
...@@ -86,6 +86,7 @@ typedef struct { ...@@ -86,6 +86,7 @@ typedef struct {
*/ */
typedef __kernel_long_t __kernel_off_t; typedef __kernel_long_t __kernel_off_t;
typedef long long __kernel_loff_t; typedef long long __kernel_loff_t;
typedef __kernel_long_t __kernel_old_time_t;
typedef __kernel_long_t __kernel_time_t; typedef __kernel_long_t __kernel_time_t;
typedef long long __kernel_time64_t; typedef long long __kernel_time64_t;
typedef __kernel_long_t __kernel_clock_t; typedef __kernel_long_t __kernel_clock_t;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#define __ASM_GENERIC_SEMBUF_H #define __ASM_GENERIC_SEMBUF_H
#include <asm/bitsperlong.h> #include <asm/bitsperlong.h>
#include <asm/ipcbuf.h>
/* /*
* The semid64_ds structure for x86 architecture. * The semid64_ds structure for x86 architecture.
...@@ -13,9 +14,8 @@ ...@@ -13,9 +14,8 @@
* everyone just ended up making identical copies without specific * everyone just ended up making identical copies without specific
* optimizations, so we may just as well all use the same one. * optimizations, so we may just as well all use the same one.
* *
* 64 bit architectures use a 64-bit __kernel_time_t here, while * 64 bit architectures use a 64-bit long time field here, while
* 32 bit architectures have a pair of unsigned long values. * 32 bit architectures have a pair of unsigned long values.
* so they do not need the first two padding words.
* *
* On big-endian systems, the padding is in the wrong place for * On big-endian systems, the padding is in the wrong place for
* historic reasons, so user space has to reconstruct a time_t * historic reasons, so user space has to reconstruct a time_t
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
struct semid64_ds { struct semid64_ds {
struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
#if __BITS_PER_LONG == 64 #if __BITS_PER_LONG == 64
__kernel_time_t sem_otime; /* last semop time */ long sem_otime; /* last semop time */
__kernel_time_t sem_ctime; /* last change time */ long sem_ctime; /* last change time */
#else #else
unsigned long sem_otime; /* last semop time */ unsigned long sem_otime; /* last semop time */
unsigned long sem_otime_high; unsigned long sem_otime_high;
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
* everyone just ended up making identical copies without specific * everyone just ended up making identical copies without specific
* optimizations, so we may just as well all use the same one. * optimizations, so we may just as well all use the same one.
* *
* 64 bit architectures typically define a 64 bit __kernel_time_t, * 64 bit architectures use a 64-bit long time field here, while
* so they do not need the first two padding words. * 32 bit architectures have a pair of unsigned long values.
* On big-endian systems, the padding is in the wrong place. * On big-endian systems, the lower half is in the wrong place.
* *
* *
* Pad space is left for: * Pad space is left for:
...@@ -26,9 +26,9 @@ struct shmid64_ds { ...@@ -26,9 +26,9 @@ struct shmid64_ds {
struct ipc64_perm shm_perm; /* operation perms */ struct ipc64_perm shm_perm; /* operation perms */
size_t shm_segsz; /* size of segment (bytes) */ size_t shm_segsz; /* size of segment (bytes) */
#if __BITS_PER_LONG == 64 #if __BITS_PER_LONG == 64
__kernel_time_t shm_atime; /* last attach time */ long shm_atime; /* last attach time */
__kernel_time_t shm_dtime; /* last detach time */ long shm_dtime; /* last detach time */
__kernel_time_t shm_ctime; /* last change time */ long shm_ctime; /* last change time */
#else #else
unsigned long shm_atime; /* last attach time */ unsigned long shm_atime; /* last attach time */
unsigned long shm_atime_high; unsigned long shm_atime_high;
......
...@@ -229,7 +229,9 @@ typedef struct siginfo { ...@@ -229,7 +229,9 @@ typedef struct siginfo {
#define SEGV_ACCADI 5 /* ADI not enabled for mapped object */ #define SEGV_ACCADI 5 /* ADI not enabled for mapped object */
#define SEGV_ADIDERR 6 /* Disrupting MCD error */ #define SEGV_ADIDERR 6 /* Disrupting MCD error */
#define SEGV_ADIPERR 7 /* Precise MCD exception */ #define SEGV_ADIPERR 7 /* Precise MCD exception */
#define NSIGSEGV 7 #define SEGV_MTEAERR 8 /* Asynchronous ARM MTE error */
#define SEGV_MTESERR 9 /* Synchronous ARM MTE exception */
#define NSIGSEGV 9
/* /*
* SIGBUS si_codes * SIGBUS si_codes
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef __ASM_GENERIC_SOCKET_H #ifndef __ASM_GENERIC_SOCKET_H
#define __ASM_GENERIC_SOCKET_H #define __ASM_GENERIC_SOCKET_H
#include <linux/posix_types.h>
#include <asm/sockios.h> #include <asm/sockios.h>
/* For setsockopt(2) */ /* For setsockopt(2) */
...@@ -29,8 +30,8 @@ ...@@ -29,8 +30,8 @@
#define SO_PEERCRED 17 #define SO_PEERCRED 17
#define SO_RCVLOWAT 18 #define SO_RCVLOWAT 18
#define SO_SNDLOWAT 19 #define SO_SNDLOWAT 19
#define SO_RCVTIMEO 20 #define SO_RCVTIMEO_OLD 20
#define SO_SNDTIMEO 21 #define SO_SNDTIMEO_OLD 21
#endif #endif
/* Security levels - as per NRL IPv6 - don't actually do anything */ /* Security levels - as per NRL IPv6 - don't actually do anything */
...@@ -46,21 +47,14 @@ ...@@ -46,21 +47,14 @@
#define SO_GET_FILTER SO_ATTACH_FILTER #define SO_GET_FILTER SO_ATTACH_FILTER
#define SO_PEERNAME 28 #define SO_PEERNAME 28
#define SO_TIMESTAMP 29
#define SCM_TIMESTAMP SO_TIMESTAMP
#define SO_ACCEPTCONN 30 #define SO_ACCEPTCONN 30
#define SO_PEERSEC 31 #define SO_PEERSEC 31
#define SO_PASSSEC 34 #define SO_PASSSEC 34
#define SO_TIMESTAMPNS 35
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
#define SO_MARK 36 #define SO_MARK 36
#define SO_TIMESTAMPING 37
#define SCM_TIMESTAMPING SO_TIMESTAMPING
#define SO_PROTOCOL 38 #define SO_PROTOCOL 38
#define SO_DOMAIN 39 #define SO_DOMAIN 39
...@@ -110,4 +104,42 @@ ...@@ -110,4 +104,42 @@
#define SO_TXTIME 61 #define SO_TXTIME 61
#define SCM_TXTIME SO_TXTIME #define SCM_TXTIME SO_TXTIME
#define SO_BINDTOIFINDEX 62
#define SO_TIMESTAMP_OLD 29
#define SO_TIMESTAMPNS_OLD 35
#define SO_TIMESTAMPING_OLD 37
#define SO_TIMESTAMP_NEW 63
#define SO_TIMESTAMPNS_NEW 64
#define SO_TIMESTAMPING_NEW 65
#define SO_RCVTIMEO_NEW 66
#define SO_SNDTIMEO_NEW 67
#define SO_DETACH_REUSEPORT_BPF 68
#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))
/* on 64-bit and x32, avoid the ?: operator */
#define SO_TIMESTAMP SO_TIMESTAMP_OLD
#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD
#define SO_TIMESTAMPING SO_TIMESTAMPING_OLD
#define SO_RCVTIMEO SO_RCVTIMEO_OLD
#define SO_SNDTIMEO SO_SNDTIMEO_OLD
#else
#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)
#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)
#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)
#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)
#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)
#endif
#define SCM_TIMESTAMP SO_TIMESTAMP
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
#define SCM_TIMESTAMPING SO_TIMESTAMPING
#endif /* __ASM_GENERIC_SOCKET_H */ #endif /* __ASM_GENERIC_SOCKET_H */
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#define FIOGETOWN 0x8903 #define FIOGETOWN 0x8903
#define SIOCGPGRP 0x8904 #define SIOCGPGRP 0x8904
#define SIOCATMARK 0x8905 #define SIOCATMARK 0x8905
#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ #define SIOCGSTAMP_OLD 0x8906 /* Get stamp (timeval) */
#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ #define SIOCGSTAMPNS_OLD 0x8907 /* Get stamp (timespec) */
#endif /* __ASM_GENERIC_SOCKIOS_H */ #endif /* __ASM_GENERIC_SOCKIOS_H */
...@@ -38,8 +38,10 @@ __SYSCALL(__NR_io_destroy, sys_io_destroy) ...@@ -38,8 +38,10 @@ __SYSCALL(__NR_io_destroy, sys_io_destroy)
__SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit) __SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit)
#define __NR_io_cancel 3 #define __NR_io_cancel 3
__SYSCALL(__NR_io_cancel, sys_io_cancel) __SYSCALL(__NR_io_cancel, sys_io_cancel)
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_io_getevents 4 #define __NR_io_getevents 4
__SC_COMP(__NR_io_getevents, sys_io_getevents, compat_sys_io_getevents) __SC_3264(__NR_io_getevents, sys_io_getevents_time32, sys_io_getevents)
#endif
/* fs/xattr.c */ /* fs/xattr.c */
#define __NR_setxattr 5 #define __NR_setxattr 5
...@@ -138,7 +140,7 @@ __SYSCALL(__NR_renameat, sys_renameat) ...@@ -138,7 +140,7 @@ __SYSCALL(__NR_renameat, sys_renameat)
#define __NR_umount2 39 #define __NR_umount2 39
__SYSCALL(__NR_umount2, sys_umount) __SYSCALL(__NR_umount2, sys_umount)
#define __NR_mount 40 #define __NR_mount 40
__SC_COMP(__NR_mount, sys_mount, compat_sys_mount) __SYSCALL(__NR_mount, sys_mount)
#define __NR_pivot_root 41 #define __NR_pivot_root 41
__SYSCALL(__NR_pivot_root, sys_pivot_root) __SYSCALL(__NR_pivot_root, sys_pivot_root)
...@@ -179,7 +181,7 @@ __SYSCALL(__NR_fchownat, sys_fchownat) ...@@ -179,7 +181,7 @@ __SYSCALL(__NR_fchownat, sys_fchownat)
#define __NR_fchown 55 #define __NR_fchown 55
__SYSCALL(__NR_fchown, sys_fchown) __SYSCALL(__NR_fchown, sys_fchown)
#define __NR_openat 56 #define __NR_openat 56
__SC_COMP(__NR_openat, sys_openat, compat_sys_openat) __SYSCALL(__NR_openat, sys_openat)
#define __NR_close 57 #define __NR_close 57
__SYSCALL(__NR_close, sys_close) __SYSCALL(__NR_close, sys_close)
#define __NR_vhangup 58 #define __NR_vhangup 58
...@@ -205,9 +207,9 @@ __SYSCALL(__NR_read, sys_read) ...@@ -205,9 +207,9 @@ __SYSCALL(__NR_read, sys_read)
#define __NR_write 64 #define __NR_write 64
__SYSCALL(__NR_write, sys_write) __SYSCALL(__NR_write, sys_write)
#define __NR_readv 65 #define __NR_readv 65
__SC_COMP(__NR_readv, sys_readv, compat_sys_readv) __SC_COMP(__NR_readv, sys_readv, sys_readv)
#define __NR_writev 66 #define __NR_writev 66
__SC_COMP(__NR_writev, sys_writev, compat_sys_writev) __SC_COMP(__NR_writev, sys_writev, sys_writev)
#define __NR_pread64 67 #define __NR_pread64 67
__SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64) __SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64)
#define __NR_pwrite64 68 #define __NR_pwrite64 68
...@@ -222,10 +224,12 @@ __SC_COMP(__NR_pwritev, sys_pwritev, compat_sys_pwritev) ...@@ -222,10 +224,12 @@ __SC_COMP(__NR_pwritev, sys_pwritev, compat_sys_pwritev)
__SYSCALL(__NR3264_sendfile, sys_sendfile64) __SYSCALL(__NR3264_sendfile, sys_sendfile64)
/* fs/select.c */ /* fs/select.c */
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_pselect6 72 #define __NR_pselect6 72
__SC_COMP(__NR_pselect6, sys_pselect6, compat_sys_pselect6) __SC_COMP_3264(__NR_pselect6, sys_pselect6_time32, sys_pselect6, compat_sys_pselect6_time32)
#define __NR_ppoll 73 #define __NR_ppoll 73
__SC_COMP(__NR_ppoll, sys_ppoll, compat_sys_ppoll) __SC_COMP_3264(__NR_ppoll, sys_ppoll_time32, sys_ppoll, compat_sys_ppoll_time32)
#endif
/* fs/signalfd.c */ /* fs/signalfd.c */
#define __NR_signalfd4 74 #define __NR_signalfd4 74
...@@ -233,7 +237,7 @@ __SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4) ...@@ -233,7 +237,7 @@ __SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4)
/* fs/splice.c */ /* fs/splice.c */
#define __NR_vmsplice 75 #define __NR_vmsplice 75
__SC_COMP(__NR_vmsplice, sys_vmsplice, compat_sys_vmsplice) __SYSCALL(__NR_vmsplice, sys_vmsplice)
#define __NR_splice 76 #define __NR_splice 76
__SYSCALL(__NR_splice, sys_splice) __SYSCALL(__NR_splice, sys_splice)
#define __NR_tee 77 #define __NR_tee 77
...@@ -269,16 +273,20 @@ __SC_COMP(__NR_sync_file_range, sys_sync_file_range, \ ...@@ -269,16 +273,20 @@ __SC_COMP(__NR_sync_file_range, sys_sync_file_range, \
/* fs/timerfd.c */ /* fs/timerfd.c */
#define __NR_timerfd_create 85 #define __NR_timerfd_create 85
__SYSCALL(__NR_timerfd_create, sys_timerfd_create) __SYSCALL(__NR_timerfd_create, sys_timerfd_create)
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_timerfd_settime 86 #define __NR_timerfd_settime 86
__SC_COMP(__NR_timerfd_settime, sys_timerfd_settime, \ __SC_3264(__NR_timerfd_settime, sys_timerfd_settime32, \
compat_sys_timerfd_settime) sys_timerfd_settime)
#define __NR_timerfd_gettime 87 #define __NR_timerfd_gettime 87
__SC_COMP(__NR_timerfd_gettime, sys_timerfd_gettime, \ __SC_3264(__NR_timerfd_gettime, sys_timerfd_gettime32, \
compat_sys_timerfd_gettime) sys_timerfd_gettime)
#endif
/* fs/utimes.c */ /* fs/utimes.c */
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_utimensat 88 #define __NR_utimensat 88
__SC_COMP(__NR_utimensat, sys_utimensat, compat_sys_utimensat) __SC_3264(__NR_utimensat, sys_utimensat_time32, sys_utimensat)
#endif
/* kernel/acct.c */ /* kernel/acct.c */
#define __NR_acct 89 #define __NR_acct 89
...@@ -309,8 +317,10 @@ __SYSCALL(__NR_set_tid_address, sys_set_tid_address) ...@@ -309,8 +317,10 @@ __SYSCALL(__NR_set_tid_address, sys_set_tid_address)
__SYSCALL(__NR_unshare, sys_unshare) __SYSCALL(__NR_unshare, sys_unshare)
/* kernel/futex.c */ /* kernel/futex.c */
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_futex 98 #define __NR_futex 98
__SC_COMP(__NR_futex, sys_futex, compat_sys_futex) __SC_3264(__NR_futex, sys_futex_time32, sys_futex)
#endif
#define __NR_set_robust_list 99 #define __NR_set_robust_list 99
__SC_COMP(__NR_set_robust_list, sys_set_robust_list, \ __SC_COMP(__NR_set_robust_list, sys_set_robust_list, \
compat_sys_set_robust_list) compat_sys_set_robust_list)
...@@ -319,8 +329,10 @@ __SC_COMP(__NR_get_robust_list, sys_get_robust_list, \ ...@@ -319,8 +329,10 @@ __SC_COMP(__NR_get_robust_list, sys_get_robust_list, \
compat_sys_get_robust_list) compat_sys_get_robust_list)
/* kernel/hrtimer.c */ /* kernel/hrtimer.c */
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_nanosleep 101 #define __NR_nanosleep 101
__SC_COMP(__NR_nanosleep, sys_nanosleep, compat_sys_nanosleep) __SC_3264(__NR_nanosleep, sys_nanosleep_time32, sys_nanosleep)
#endif
/* kernel/itimer.c */ /* kernel/itimer.c */
#define __NR_getitimer 102 #define __NR_getitimer 102
...@@ -341,23 +353,29 @@ __SYSCALL(__NR_delete_module, sys_delete_module) ...@@ -341,23 +353,29 @@ __SYSCALL(__NR_delete_module, sys_delete_module)
/* kernel/posix-timers.c */ /* kernel/posix-timers.c */
#define __NR_timer_create 107 #define __NR_timer_create 107
__SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create) __SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create)
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_timer_gettime 108 #define __NR_timer_gettime 108
__SC_COMP(__NR_timer_gettime, sys_timer_gettime, compat_sys_timer_gettime) __SC_3264(__NR_timer_gettime, sys_timer_gettime32, sys_timer_gettime)
#endif
#define __NR_timer_getoverrun 109 #define __NR_timer_getoverrun 109
__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun) __SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_timer_settime 110 #define __NR_timer_settime 110
__SC_COMP(__NR_timer_settime, sys_timer_settime, compat_sys_timer_settime) __SC_3264(__NR_timer_settime, sys_timer_settime32, sys_timer_settime)
#endif
#define __NR_timer_delete 111 #define __NR_timer_delete 111
__SYSCALL(__NR_timer_delete, sys_timer_delete) __SYSCALL(__NR_timer_delete, sys_timer_delete)
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_clock_settime 112 #define __NR_clock_settime 112
__SC_COMP(__NR_clock_settime, sys_clock_settime, compat_sys_clock_settime) __SC_3264(__NR_clock_settime, sys_clock_settime32, sys_clock_settime)
#define __NR_clock_gettime 113 #define __NR_clock_gettime 113
__SC_COMP(__NR_clock_gettime, sys_clock_gettime, compat_sys_clock_gettime)