summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/strace/strace-4.7/0027-Add-AArch64-support-to-strace.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/strace/strace-4.7/0027-Add-AArch64-support-to-strace.patch')
-rw-r--r--meta/recipes-devtools/strace/strace-4.7/0027-Add-AArch64-support-to-strace.patch542
1 files changed, 542 insertions, 0 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.7/0027-Add-AArch64-support-to-strace.patch b/meta/recipes-devtools/strace/strace-4.7/0027-Add-AArch64-support-to-strace.patch
new file mode 100644
index 0000000000..9c204e441b
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace-4.7/0027-Add-AArch64-support-to-strace.patch
@@ -0,0 +1,542 @@
1Upstream-Status: Backport
2
3From d8d3bd3709eb52581c8ce86cec5a7a9c43c3c5b9 Mon Sep 17 00:00:00 2001
4From: Steve McIntyre <steve.mcintyre@linaro.org>
5Date: Wed, 24 Oct 2012 17:58:16 +0100
6Subject: [PATCH 27/31] Add AArch64 support to strace
7
8AArch64 has been included in linux from 3.7 onwards.
9Add support for AArch64 in strace, tested on linux in a simulator.
10
11* configure.ac: Support AArch64.
12* defs.h [AARCH64]: Include <sys/ptrace.h>, define TCB_WAITEXECVE.
13* ipc.c (indirect_ipccall): Support AArch64.
14* process.c (struct_user_offsets): Likewise.
15* syscall.c [AARCH64]: Include <asm/ptrace.h>, <sys/uio.h>, and
16<elf.h>. Define struct user_pt_regs regs.
17(get_scno, get_syscall_result): Support AArch64 using PTRACE_GETREGSET.
18(get_syscall_args, get_error): Support AArch64.
19* linux/aarch64/ioctlent.h.in: New file.
20* linux/aarch64/syscallent.h: New file, based on linux 3.7 version of
21asm-generic/unistd.h.
22
23Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
24---
25 configure.ac | 4 +
26 defs.h | 5 +-
27 ipc.c | 2 +-
28 linux/aarch64/ioctlent.h.in | 1 +
29 linux/aarch64/syscallent.h | 330 ++++++++++++++++++++++++++++++++++++++++++++
30 process.c | 7 +-
31 syscall.c | 32 +++++
32 7 files changed, 375 insertions(+), 6 deletions(-)
33 create mode 100644 linux/aarch64/ioctlent.h.in
34 create mode 100644 linux/aarch64/syscallent.h
35
36diff --git a/configure.ac b/configure.ac
37index a9f8d15..f44eaf1 100644
38--- a/configure.ac
39+++ b/configure.ac
40@@ -56,6 +56,10 @@ arm*)
41 arch=arm
42 AC_DEFINE([ARM], 1, [Define for the ARM architecture.])
43 ;;
44+aarch64*)
45+ arch=aarch64
46+ AC_DEFINE([AARCH64], 1, [Define for the AArch64 architecture.])
47+ ;;
48 avr32*)
49 arch=avr32
50 AC_DEFINE([AVR32], 1, [Define for the AVR32 architecture.])
51diff --git a/defs.h b/defs.h
52index d366b21..11e26bb 100644
53--- a/defs.h
54+++ b/defs.h
55@@ -134,7 +134,7 @@ extern char *stpcpy(char *dst, const char *src);
56 # define LINUX_MIPS64
57 #endif
58
59-#if (defined(LINUXSPARC) || defined(X86_64) || defined(ARM) || defined(AVR32)) && defined(__GLIBC__)
60+#if (defined(LINUXSPARC) || defined(X86_64) || defined(ARM) || defined(AARCH64) || defined(AVR32)) && defined(__GLIBC__)
61 # include <sys/ptrace.h>
62 #else
63 /* Work around awkward prototype in ptrace.h. */
64@@ -389,7 +389,8 @@ struct tcb {
65 #if defined(ALPHA) || defined(AVR32) || defined(SPARC) || defined(SPARC64) \
66 || defined(POWERPC) || defined(IA64) || defined(HPPA) \
67 || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) \
68- || defined(ARM) || defined(MIPS) || defined(BFIN) || defined(TILE)
69+ || defined(ARM) || defined(AARCH64) || defined(MIPS) || defined(BFIN) \
70+ || defined(TILE)
71 /* This tracee has entered into execve syscall. Expect post-execve SIGTRAP
72 * to happen. (When it is detected, tracee is continued and this bit is cleared.)
73 */
74diff --git a/ipc.c b/ipc.c
75index f4ec522..0bde1cf 100644
76--- a/ipc.c
77+++ b/ipc.c
78@@ -174,7 +174,7 @@ indirect_ipccall(struct tcb *tcp)
79 #if defined IA64
80 return tcp->scno < 1024; /* ia32 emulation syscalls are low */
81 #endif
82-#if defined(ALPHA) || defined(MIPS) || defined(HPPA) || defined(__ARM_EABI__)
83+#if defined(ALPHA) || defined(MIPS) || defined(HPPA) || defined(__ARM_EABI__) || defined(AARCH64)
84 return 0;
85 #endif
86 return 1;
87diff --git a/linux/aarch64/ioctlent.h.in b/linux/aarch64/ioctlent.h.in
88new file mode 100644
89index 0000000..83e6eb2
90--- /dev/null
91+++ b/linux/aarch64/ioctlent.h.in
92@@ -0,0 +1 @@
93+#include "../arm/ioctlent.h.in"
94diff --git a/linux/aarch64/syscallent.h b/linux/aarch64/syscallent.h
95new file mode 100644
96index 0000000..eeda429
97--- /dev/null
98+++ b/linux/aarch64/syscallent.h
99@@ -0,0 +1,330 @@
100+ { 2, 0, sys_io_setup, "io_setup" }, /* 0 */
101+ { 1, 0, sys_io_destroy, "io_destroy" }, /* 1 */
102+ { 3, 0, sys_io_submit, "io_submit" }, /* 2 */
103+ { 3, 0, sys_io_cancel, "io_cancel" }, /* 3 */
104+ { 5, 0, sys_io_getevents, "io_getevents" }, /* 4 */
105+ { 5, TF, sys_setxattr, "setxattr" }, /* 5 */
106+ { 5, TF, sys_setxattr, "lsetxattr" }, /* 6 */
107+ { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 7 */
108+ { 4, TF, sys_getxattr, "getxattr" }, /* 8 */
109+ { 4, TF, sys_getxattr, "lgetxattr" }, /* 9 */
110+ { 4, TD, sys_fgetxattr, "fgetxattr" }, /* 10 */
111+ { 3, TF, sys_listxattr, "listxattr" }, /* 11 */
112+ { 3, TF, sys_listxattr, "llistxattr" }, /* 12 */
113+ { 3, TD, sys_flistxattr, "flistxattr" }, /* 13 */
114+ { 2, TF, sys_removexattr, "removexattr" }, /* 14 */
115+ { 2, TF, sys_removexattr, "lremovexattr" }, /* 15 */
116+ { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 16 */
117+ { 2, TF, sys_getcwd, "getcwd" }, /* 17 */
118+ { 4, 0, sys_lookup_dcookie, "lookup_dcookie" }, /* 18 */
119+ { 2, TD, sys_eventfd2, "eventfd2" }, /* 19 */
120+ { 1, TD, sys_epoll_create1, "epoll_create1" }, /* 20 */
121+ { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 21 */
122+ { 6, TD, sys_epoll_pwait, "epoll_pwait" }, /* 22 */
123+ { 1, TD, sys_dup, "dup" }, /* 23 */
124+ { 3, TD, sys_dup3, "dup3" }, /* 24 */
125+ { 3, TD, sys_fcntl, "fcntl" }, /* 25 */
126+ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 26 */
127+ { 3, TD, sys_inotify_add_watch, "inotify_add_watch" }, /* 27 */
128+ { 2, TD, sys_inotify_rm_watch, "inotify_rm_watch" }, /* 28 */
129+ { 3, TD, sys_ioctl, "ioctl" }, /* 29 */
130+ { 3, 0, sys_ioprio_set, "ioprio_set" }, /* 30 */
131+ { 2, 0, sys_ioprio_get, "ioprio_get" }, /* 31 */
132+ { 2, TD, sys_flock, "flock" }, /* 32 */
133+ { 4, TD|TF, sys_mknodat, "mknodat" }, /* 33 */
134+ { 3, TD|TF, sys_mkdirat, "mkdirat" }, /* 34 */
135+ { 3, TD|TF, sys_unlinkat, "unlinkat" }, /* 35 */
136+ { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 36 */
137+ { 5, TD|TF, sys_linkat, "linkat" }, /* 37 */
138+ { 4, TD|TF, sys_renameat, "renameat" }, /* 38 */
139+ { 2, TF, sys_umount2, "umount2" }, /* 39 */
140+ { 5, TF, sys_mount, "mount" }, /* 40 */
141+ { 2, TF, sys_pivotroot, "pivot_root" }, /* 41 */
142+ { 3, 0, sys_nfsservctl, "nfsservctl" }, /* 42 */
143+ { 2, TF, sys_statfs, "statfs64" }, /* 43 */
144+ { 2, TD, sys_fstatfs, "fstatfs64" }, /* 44 */
145+ { 2, TF, sys_truncate, "truncate64" }, /* 45 */
146+ { 2, TD, sys_ftruncate, "ftruncate64" }, /* 46 */
147+ { 6, TD, sys_fallocate, "fallocate" }, /* 47 */
148+ { 3, TD|TF, sys_faccessat, "faccessat" }, /* 48 */
149+ { 1, TF, sys_chdir, "chdir" }, /* 49 */
150+ { 1, TD, sys_fchdir, "fchdir" }, /* 50 */
151+ { 1, TF, sys_chroot, "chroot" }, /* 51 */
152+ { 2, TD, sys_fchmod, "fchmod" }, /* 52 */
153+ { 3, TD|TF, sys_fchmodat, "fchmodat" }, /* 53 */
154+ { 5, TD|TF, sys_fchownat, "fchownat" }, /* 54 */
155+ { 3, TD, sys_fchown, "fchown" }, /* 55 */
156+ { 4, TD|TF, sys_openat, "openat" }, /* 56 */
157+ { 1, TD, sys_close, "close" }, /* 57 */
158+ { 0, 0, sys_vhangup, "vhangup" }, /* 58 */
159+ { 2, TD, sys_pipe2, "pipe2" }, /* 59 */
160+ { 4, 0, sys_quotactl, "quotactl" }, /* 60 */
161+ { 3, TD, sys_getdents64, "getdents64" }, /* 61 */
162+ { 3, TD, sys_lseek, "lseek" }, /* 62 */
163+ { 3, TD, sys_read, "read" }, /* 63 */
164+ { 3, TD, sys_write, "write" }, /* 64 */
165+ { 3, TD, sys_readv, "readv" }, /* 65 */
166+ { 3, TD, sys_writev, "writev" }, /* 66 */
167+ { 5, TD, sys_pread, "pread64" }, /* 67 */
168+ { 5, TD, sys_pwrite, "pwrite64" }, /* 68 */
169+ { 5, TD, sys_preadv, "preadv" }, /* 69 */
170+ { 5, TD, sys_pwritev, "pwritev" }, /* 70 */
171+ { 4, TD|TN, sys_sendfile, "sendfile" }, /* 71 */
172+ { 6, TD, sys_pselect6, "pselect6" }, /* 72 */
173+ { 5, TD, sys_ppoll, "ppoll" }, /* 73 */
174+ { 4, TD|TS, sys_signalfd4, "signalfd4" }, /* 74 */
175+ { 4, TD, sys_vmsplice, "vmsplice" }, /* 75 */
176+ { 6, TD, sys_splice, "splice" }, /* 76 */
177+ { 4, TD, sys_tee, "tee" }, /* 77 */
178+ { 4, TD|TF, sys_readlinkat, "readlinkat" }, /* 78 */
179+ { 4, TD|TF, sys_newfstatat, "newfstatat" }, /* 79 */
180+ { 2, TD, sys_fstat, "fstat" }, /* 80 */
181+ { 0, 0, sys_sync, "sync" }, /* 81 */
182+ { 1, TD, sys_fsync, "fsync" }, /* 82 */
183+ { 1, TD, sys_fdatasync, "fdatasync" }, /* 83 */
184+ { 4, TD, sys_sync_file_range, "sync_file_range" }, /* 84 */
185+ { 2, TD, sys_timerfd_create, "timerfd_create" }, /* 85 */
186+ { 4, TD, sys_timerfd_settime, "timerfd_settime" }, /* 86 */
187+ { 2, TD, sys_timerfd_gettime, "timerfd_gettime" }, /* 87 */
188+ { 4, TD|TF, sys_utimensat, "utimensat" }, /* 88 */
189+ { 1, TF, sys_acct, "acct" }, /* 89 */
190+ { 2, 0, sys_capget, "capget" }, /* 90 */
191+ { 2, 0, sys_capset, "capset" }, /* 91 */
192+ { 1, 0, sys_personality, "personality" }, /* 92 */
193+ { 1, TP, sys_exit, "exit" }, /* 93 */
194+ { 1, TP, sys_exit, "exit_group" }, /* 94 */
195+ { 5, TP, sys_waitid, "waitid" }, /* 95 */
196+ { 1, 0, sys_set_tid_address, "set_tid_address" }, /* 96 */
197+ { 1, TP, sys_unshare, "unshare" }, /* 97 */
198+ { 6, 0, sys_futex, "futex" }, /* 98 */
199+ { 2, 0, sys_set_robust_list, "set_robust_list" }, /* 99 */
200+ { 3, 0, sys_get_robust_list, "get_robust_list" }, /* 100 */
201+ { 2, 0, sys_nanosleep, "nanosleep" }, /* 101 */
202+ { 2, 0, sys_getitimer, "getitimer" }, /* 102 */
203+ { 3, 0, sys_setitimer, "setitimer" }, /* 103 */
204+ { 4, 0, sys_kexec_load, "kexec_load" }, /* 104 */
205+ { 3, 0, sys_init_module, "init_module" }, /* 105 */
206+ { 2, 0, sys_delete_module, "delete_module" }, /* 106 */
207+ { 3, 0, sys_timer_create, "timer_create" }, /* 107 */
208+ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 108 */
209+ { 1, 0, sys_timer_getoverrun, "timer_getoverrun" }, /* 109 */
210+ { 4, 0, sys_timer_settime, "timer_settime" }, /* 110 */
211+ { 1, 0, sys_timer_delete, "timer_delete" }, /* 111 */
212+ { 2, 0, sys_clock_settime, "clock_settime" }, /* 112 */
213+ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 113 */
214+ { 2, 0, sys_clock_getres, "clock_getres" }, /* 114 */
215+ { 4, 0, sys_clock_nanosleep, "clock_nanosleep" }, /* 115 */
216+ { 3, 0, sys_syslog, "syslog" }, /* 116 */
217+ { 4, 0, sys_ptrace, "ptrace" }, /* 117 */
218+ { 0, 0, sys_sched_setparam, "sched_setparam" }, /* 118 */
219+ { 3, 0, sys_sched_setscheduler, "sched_setscheduler" }, /* 119 */
220+ { 1, 0, sys_sched_getscheduler, "sched_getscheduler" }, /* 120 */
221+ { 2, 0, sys_sched_getparam, "sched_getparam" }, /* 121 */
222+ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" }, /* 122 */
223+ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" }, /* 123 */
224+ { 0, 0, sys_sched_yield, "sched_yield" }, /* 124 */
225+ { 1, 0, sys_sched_get_priority_max, "sched_get_priority_max" }, /* 125 */
226+ { 1, 0, sys_sched_get_priority_min, "sched_get_priority_min" }, /* 126 */
227+ { 2, 0, sys_sched_rr_get_interval, "sched_rr_get_interval" }, /* 127 */
228+ { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 128 */
229+ { 2, TS, sys_kill, "kill" }, /* 129 */
230+ { 2, TS, sys_kill, "tkill" }, /* 130 */
231+ { 3, TS, sys_tgkill, "tgkill" }, /* 131 */
232+ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 132 */
233+ { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 133 */
234+ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 134 */
235+ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask" }, /* 135 */
236+ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 136 */
237+ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait" }, /* 137 */
238+ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo" }, /* 138 */
239+ { 0, TS, sys_rt_sigreturn, "rt_sigreturn" }, /* 139 */
240+ { 3, 0, sys_setpriority, "setpriority" }, /* 140 */
241+ { 2, 0, sys_getpriority, "getpriority" }, /* 141 */
242+ { 4, 0, sys_reboot, "reboot" }, /* 142 */
243+ { 2, 0, sys_setregid, "setregid" }, /* 143 */
244+ { 1, 0, sys_setgid, "setgid" }, /* 144 */
245+ { 2, 0, sys_setreuid, "setreuid" }, /* 145 */
246+ { 1, 0, sys_setuid, "setuid" }, /* 146 */
247+ { 3, 0, sys_setresuid, "setresuid" }, /* 147 */
248+ { 3, 0, sys_getresuid, "getresuid" }, /* 148 */
249+ { 3, 0, sys_setresgid, "setresgid" }, /* 149 */
250+ { 3, 0, sys_getresgid, "getresgid" }, /* 150 */
251+ { 1, NF, sys_setfsuid, "setfsuid" }, /* 151 */
252+ { 1, NF, sys_setfsgid, "setfsgid" }, /* 152 */
253+ { 1, 0, sys_times, "times" }, /* 153 */
254+ { 2, 0, sys_setpgid, "setpgid" }, /* 154 */
255+ { 1, 0, sys_getpgid, "getpgid" }, /* 155 */
256+ { 1, 0, sys_getsid, "getsid" }, /* 156 */
257+ { 0, 0, sys_setsid, "setsid" }, /* 157 */
258+ { 2, 0, sys_getgroups, "getgroups" }, /* 158 */
259+ { 2, 0, sys_setgroups, "setgroups" }, /* 159 */
260+ { 1, 0, sys_uname, "uname" }, /* 160 */
261+ { 2, 0, sys_sethostname, "sethostname" }, /* 161 */
262+ { 2, 0, sys_setdomainname, "setdomainname" }, /* 162 */
263+ { 2, 0, sys_getrlimit, "getrlimit" }, /* 163 */
264+ { 2, 0, sys_setrlimit, "setrlimit" }, /* 164 */
265+ { 2, 0, sys_getrusage, "getrusage" }, /* 165 */
266+ { 1, 0, sys_umask, "umask" }, /* 166 */
267+ { 5, 0, sys_prctl, "prctl" }, /* 167 */
268+ { 3, 0, sys_getcpu, "getcpu" }, /* 168 */
269+ { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 169 */
270+ { 2, 0, sys_settimeofday, "settimeofday" }, /* 170 */
271+ { 1, 0, sys_adjtimex, "adjtimex" }, /* 171 */
272+ { 0, 0, sys_getpid, "getpid" }, /* 172 */
273+ { 0, 0, sys_getppid, "getppid" }, /* 173 */
274+ { 0, NF, sys_getuid, "getuid" }, /* 174 */
275+ { 0, NF, sys_geteuid, "geteuid" }, /* 175 */
276+ { 0, NF, sys_getgid, "getgid" }, /* 176 */
277+ { 0, NF, sys_getegid, "getegid" }, /* 177 */
278+ { 0, 0, sys_gettid, "gettid" }, /* 178 */
279+ { 1, 0, sys_sysinfo, "sysinfo" }, /* 179 */
280+ { 4, 0, sys_mq_open, "mq_open" }, /* 180 */
281+ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 181 */
282+ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 182 */
283+ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 183 */
284+ { 2, 0, sys_mq_notify, "mq_notify" }, /* 184 */
285+ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 185 */
286+ { 4, TI, sys_msgget, "msgget" }, /* 186 */
287+ { 3, TI, sys_msgctl, "msgctl" }, /* 187 */
288+ { 5, TI, sys_msgrcv, "msgrcv" }, /* 188 */
289+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 189 */
290+ { 4, TI, sys_semget, "semget" }, /* 190 */
291+ { 4, TI, sys_semctl, "semctl" }, /* 191 */
292+ { 5, TI, sys_semtimedop, "semtimedop" }, /* 192 */
293+ { 4, TI, sys_semop, "semop" }, /* 193 */
294+ { 4, TI, sys_shmget, "shmget" }, /* 194 */
295+ { 4, TI, sys_shmctl, "shmctl" }, /* 195 */
296+ { 4, TI, sys_shmat, "shmat" }, /* 196 */
297+ { 4, TI, sys_shmdt, "shmdt" }, /* 197 */
298+ { 3, TN, sys_socket, "socket" }, /* 198 */
299+ { 4, TN, sys_socketpair, "socketpair" }, /* 199 */
300+ { 3, TN, sys_bind, "bind" }, /* 200 */
301+ { 2, TN, sys_listen, "listen" }, /* 201 */
302+ { 3, TN, sys_accept, "accept" }, /* 202 */
303+ { 3, TN, sys_connect, "connect" }, /* 203 */
304+ { 3, TN, sys_getsockname, "getsockname" }, /* 204 */
305+ { 3, TN, sys_getpeername, "getpeername" }, /* 205 */
306+ { 6, TN, sys_sendto, "sendto" }, /* 206 */
307+ { 6, TN, sys_recvfrom, "recvfrom" }, /* 207 */
308+ { 5, TN, sys_setsockopt, "setsockopt" }, /* 208 */
309+ { 5, TN, sys_getsockopt, "getsockopt" }, /* 209 */
310+ { 2, TN, sys_shutdown, "shutdown" }, /* 210 */
311+ { 3, TN, sys_sendmsg, "sendmsg" }, /* 211 */
312+ { 5, TN, sys_recvmsg, "recvmsg" }, /* 212 */
313+ { 4, TD, sys_readahead, "readahead" }, /* 213 */
314+ { 1, TM, sys_brk, "brk" }, /* 214 */
315+ { 2, TM, sys_munmap, "munmap" }, /* 215 */
316+ { 5, TM, sys_mremap, "mremap" }, /* 216 */
317+ { 5, 0, sys_add_key, "add_key" }, /* 217 */
318+ { 4, 0, sys_request_key, "request_key" }, /* 218 */
319+ { 5, 0, sys_keyctl, "keyctl" }, /* 219 */
320+ { 5, TP, sys_clone, "clone" }, /* 220 */
321+ { 3, TF|TP, sys_execve, "execve" }, /* 221 */
322+ { 6, TD|TM, sys_mmap, "mmap" }, /* 222 */
323+ { 4, TD, sys_fadvise64, "fadvise64" }, /* 223 */
324+ { 2, TF, sys_swapon, "swapon" }, /* 224 */
325+ { 1, TF, sys_swapoff, "swapoff" }, /* 225 */
326+ { 3, TM, sys_mprotect, "mprotect" }, /* 226 */
327+ { 3, TM, sys_msync, "msync" }, /* 227 */
328+ { 3, TM, sys_msync, "msync" }, /* 228 */
329+ { 2, TM, sys_munlock, "munlock" }, /* 229 */
330+ { 1, TM, sys_mlockall, "mlockall" }, /* 230 */
331+ { 0, TM, sys_munlockall, "munlockall" }, /* 231 */
332+ { 3, TM, sys_mincore, "mincore" }, /* 232 */
333+ { 3, TM, sys_madvise, "madvise" }, /* 233 */
334+ { 5, TM, sys_remap_file_pages, "remap_file_pages" }, /* 234 */
335+ { 6, TM, sys_mbind, "mbind" }, /* 235 */
336+ { 5, TM, sys_get_mempolicy, "get_mempolicy" }, /* 236 */
337+ { 3, TM, sys_set_mempolicy, "set_mempolicy" }, /* 237 */
338+ { 4, TM, sys_migrate_pages, "migrate_pages" }, /* 238 */
339+ { 6, TM, sys_move_pages, "move_pages" }, /* 239 */
340+ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 240 */
341+ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 241 */
342+ { 4, TN, sys_accept4, "accept4" }, /* 242 */
343+ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 243 */
344+
345+ /* Arch-specific block, not used on AArch64 */
346+ [244 ... 259] = { },
347+
348+ { 4, TP, sys_wait4, "wait4" }, /* 260 */
349+ { 4, 0, sys_prlimit64, "prlimit64" }, /* 261 */
350+ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 262 */
351+ { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 263 */
352+ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at" }, /* 264 */
353+ { 3, TD, sys_open_by_handle_at, "open_by_handle_at" }, /* 265 */
354+ { 2, 0, sys_clock_adjtime, "clock_adjtime" }, /* 266 */
355+ { 1, TD, sys_syncfs, "syncfs" }, /* 267 */
356+ { 2, TD, sys_setns, "setns" }, /* 268 */
357+ { 4, TN, sys_sendmmsg, "sendmmsg" }, /* 269 */
358+ { 6, 0, sys_process_vm_readv, "process_vm_readv" }, /* 270 */
359+ { 6, 0, sys_process_vm_writev, "process_vm_writev" }, /* 271 */
360+
361+ /* Blank down to 1023 */
362+ [272 ... 1023] = { },
363+
364+ /* Quote from asm-generic/unistd.h:
365+ *
366+ * All syscalls below here should go away really,
367+ * these are provided for both review and as a porting
368+ * help for the C library version.
369+ *
370+ * Last chance: are any of these important enough to
371+ * enable by default?
372+ */
373+
374+ { 3, TD|TF, sys_open, "open" }, /* 1024 */
375+ { 2, TF, sys_link, "link" }, /* 1025 */
376+ { 1, TF, sys_unlink, "unlink" }, /* 1026 */
377+ { 3, TF, sys_mknod, "mknod" }, /* 1027 */
378+ { 2, TF, sys_chmod, "chmod" }, /* 1028 */
379+ { 3, TF, sys_chown, "chown" }, /* 1029 */
380+ { 2, TF, sys_mkdir, "mkdir" }, /* 1030 */
381+ { 1, TF, sys_rmdir, "rmdir" }, /* 1031 */
382+ { 3, TF, sys_chown, "lchown" }, /* 1032 */
383+ { 2, TF, sys_access, "access" }, /* 1033 */
384+ { 2, TF, sys_rename, "rename" }, /* 1034 */
385+ { 3, TF, sys_readlink, "readlink" }, /* 1035 */
386+ { 2, TF, sys_symlink, "symlink" }, /* 1036 */
387+ { 2, TF, sys_utimes, "utimes" }, /* 1037 */
388+ { 2, TF, sys_stat, "stat" }, /* 1038 */
389+ { 2, TF, sys_lstat, "lstat" }, /* 1039 */
390+ { 1, TD, sys_pipe, "pipe" }, /* 1040 */
391+ { 2, TD, sys_dup2, "dup2" }, /* 1041 */
392+ { 1, TD, sys_epoll_create, "epoll_create" }, /* 1042 */
393+ { 0, TD, sys_inotify_init, "inotify_init" }, /* 1043 */
394+ { 1, TD, sys_eventfd, "eventfd" }, /* 1044 */
395+ { 3, TD|TS, sys_signalfd, "signalfd" }, /* 1045 */
396+ { 4, TD|TN, sys_sendfile, "sendfile" }, /* 1046 */
397+ { 2, TD, sys_ftruncate, "ftruncate" }, /* 1047 */
398+ { 2, TF, sys_truncate, "truncate" }, /* 1048 */
399+ { 2, TF, sys_stat, "stat" }, /* 1049 */
400+ { 2, TF, sys_lstat, "lstat" }, /* 1050 */
401+ { 2, TD, sys_fstat, "fstat" }, /* 1051 */
402+ { 3, TD, sys_fcntl, "fcntl" }, /* 1052 */
403+ { 4, TD, sys_fadvise64, "fadvise64" }, /* 1053 */
404+ { 4, TD|TF, sys_newfstatat, "newfstatat" }, /* 1054 */
405+ { 2, TD, sys_fstatfs, "fstatfs" }, /* 1055 */
406+ { 2, TF, sys_statfs, "statfs" }, /* 1056 */
407+ { 3, TD, sys_lseek, "lseek" }, /* 1057 */
408+ { 6, TD|TM, sys_mmap, "mmap" }, /* 1058 */
409+ { 1, 0, sys_alarm, "alarm" }, /* 1059 */
410+ { 0, 0, sys_getpgrp, "getpgrp" }, /* 1060 */
411+ { 0, TS, sys_pause, "pause" }, /* 1061 */
412+ { 1, 0, sys_time, "time" }, /* 1062 */
413+ { 2, TF, sys_utime, "utime" }, /* 1063 */
414+ { 2, TD|TF, sys_creat, "creat" }, /* 1064 */
415+ { 3, TD, sys_getdents, "getdents" }, /* 1065 */
416+ { 3, TD|TF, sys_futimesat, "futimesat" }, /* 1066 */
417+ { 5, TD, sys_select, "select" }, /* 1067 */
418+ { 3, TD, sys_poll, "poll" }, /* 1068 */
419+ { 4, TD, sys_epoll_wait, "epoll_wait" }, /* 1069 */
420+ { 2, 0, sys_ustat, "ustat" }, /* 1070 */
421+ { 0, TP, sys_vfork, "vfork" }, /* 1071 */
422+ { 4, TP, sys_wait4, "wait4" }, /* 1072 */
423+ { 6, TN, sys_recv, "recv" }, /* 1073 */
424+ { 4, TD|TN, sys_send, "send" }, /* 1074 */
425+ { 2, 0, sys_bdflush, "bdflush" }, /* 1075 */
426+ { 2, TF, sys_umount, "umount" }, /* 1076 */
427+ { 1, TF, sys_uselib, "uselib" }, /* 1077 */
428+ { 1, 0, sys_sysctl, "sysctl" }, /* 1078 */
429+ { 0, TP, sys_fork, "fork" }, /* 1079 */
430diff --git a/process.c b/process.c
431index fa304e5..467c096 100644
432--- a/process.c
433+++ b/process.c
434@@ -2119,7 +2119,8 @@ const struct xlat struct_user_offsets[] = {
435
436 #if !defined(SPARC) && !defined(HPPA) && !defined(POWERPC) \
437 && !defined(ALPHA) && !defined(IA64) \
438- && !defined(CRISV10) && !defined(CRISV32) && !defined(MICROBLAZE)
439+ && !defined(CRISV10) && !defined(CRISV32) && !defined(MICROBLAZE) \
440+ && !defined(AARCH64)
441 # if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32) && !defined(BFIN) && !defined(TILE)
442 { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" },
443 # endif
444@@ -2148,7 +2149,7 @@ const struct xlat struct_user_offsets[] = {
445 # if !defined(SPARC64)
446 { uoff(u_ar0), "offsetof(struct user, u_ar0)" },
447 # endif
448-# if !defined(ARM) && !defined(AVR32) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) && !defined(BFIN) && !defined(TILE)
449+# if !defined(ARM) && !defined(AARCH64) && !defined(AVR32) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) && !defined(BFIN) && !defined(TILE)
450 { uoff(u_fpstate), "offsetof(struct user, u_fpstate)" },
451 # endif
452 { uoff(magic), "offsetof(struct user, magic)" },
453@@ -2158,7 +2159,7 @@ const struct xlat struct_user_offsets[] = {
454 # endif
455 #endif /* !defined(many arches) */
456
457-#ifndef HPPA
458+#if !defined(HPPA) && !defined(AARCH64)
459 { sizeof(struct user), "sizeof(struct user)" },
460 #endif
461 { 0, NULL },
462diff --git a/syscall.c b/syscall.c
463index 37936ad..680cbc3 100644
464--- a/syscall.c
465+++ b/syscall.c
466@@ -65,6 +65,12 @@
467 # include <asm/rse.h>
468 #endif
469
470+#if defined(AARCH64)
471+# include <asm/ptrace.h>
472+# include <sys/uio.h>
473+# include <elf.h>
474+#endif
475+
476 #ifndef ERESTARTSYS
477 # define ERESTARTSYS 512
478 #endif
479@@ -657,6 +663,8 @@ static long d0;
480 static long r0;
481 #elif defined(ARM)
482 static struct pt_regs regs;
483+#elif defined(AARCH64)
484+static struct user_pt_regs regs;
485 #elif defined(ALPHA)
486 static long r0;
487 static long a3;
488@@ -967,6 +975,13 @@ get_scno(struct tcb *tcp)
489 fprintf(stderr, "pid %d stray syscall entry\n", tcp->pid);
490 tcp->flags |= TCB_INSYSCALL;
491 }
492+#elif defined(AARCH64)
493+ struct iovec io;
494+ io.iov_base = &regs;
495+ io.iov_len = sizeof(regs);
496+ if (ptrace(PTRACE_GETREGSET, tcp->pid, NT_PRSTATUS, (void *)&io) == -1)
497+ return -1;
498+ scno = regs.regs[8];
499 #elif defined(M68K)
500 if (upeek(tcp, 4*PT_ORIG_D0, &scno) < 0)
501 return -1;
502@@ -1403,6 +1418,9 @@ get_syscall_args(struct tcb *tcp)
503 #elif defined(ARM)
504 for (i = 0; i < nargs; ++i)
505 tcp->u_arg[i] = regs.uregs[i];
506+#elif defined(AARCH64)
507+ for (i = 0; i < nargs; ++i)
508+ tcp->u_arg[i] = regs.regs[i];
509 #elif defined(AVR32)
510 (void)i;
511 (void)nargs;
512@@ -1641,6 +1659,12 @@ get_syscall_result(struct tcb *tcp)
513 /* Read complete register set in one go. */
514 if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (void *)&regs) == -1)
515 return -1;
516+#elif defined(AARCH64)
517+ struct iovec io;
518+ io.iov_base = &regs;
519+ io.iov_len = sizeof(regs);
520+ if (ptrace(PTRACE_GETREGSET, tcp->pid, NT_PRSTATUS, (void *)&io) == -1)
521+ return -1;
522 #elif defined(M68K)
523 if (upeek(tcp, 4*PT_D0, &d0) < 0)
524 return -1;
525@@ -1823,6 +1847,14 @@ get_error(struct tcb *tcp)
526 else {
527 tcp->u_rval = regs.ARM_r0;
528 }
529+#elif defined(AARCH64)
530+ if (check_errno && is_negated_errno(regs.regs[0])) {
531+ tcp->u_rval = -1;
532+ u_error = -regs.regs[0];
533+ }
534+ else {
535+ tcp->u_rval = regs.regs[0];
536+ }
537 #elif defined(AVR32)
538 if (check_errno && regs.r12 && (unsigned) -regs.r12 < nerrnos) {
539 tcp->u_rval = -1;
540--
5411.8.0
542