Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
linux-user/syscall-defs.h | 4 ++++
linux-user/syscall-sig.inc.c | 18 ++++++++++++++++++
linux-user/syscall.c | 12 ------------
linux-user/strace.list | 6 ------
4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/linux-user/syscall-defs.h b/linux-user/syscall-defs.h
index 11851535e1..77d750f66f 100644
--- a/linux-user/syscall-defs.h
+++ b/linux-user/syscall-defs.h
@@ -197,6 +197,7 @@ SYSCALL_DEF(rt_sigaction, ARG_SIGNAL, ARG_PTR, ARG_PTR,
ARG_DEC);
SYSCALL_DEF(rt_sigpending, ARG_PTR, ARG_DEC);
SYSCALL_DEF(rt_sigprocmask, ARG_SIGPROCMASKHOW, ARG_PTR, ARG_PTR, ARG_DEC);
SYSCALL_DEF(rt_sigqueueinfo, ARG_DEC, ARG_SIGNAL, ARG_PTR);
+SYSCALL_DEF(rt_sigreturn);
SYSCALL_DEF(rt_sigsuspend, ARG_PTR, ARG_DEC);
SYSCALL_DEF(rt_sigtimedwait, ARG_PTR, ARG_PTR, ARG_PTR, ARG_DEC);
SYSCALL_DEF(rt_tgsigqueueinfo, ARG_DEC, ARG_DEC, ARG_SIGNAL, ARG_PTR);
@@ -236,6 +237,9 @@ SYSCALL_DEF(sigprocmask, ARG_SIGPROCMASKHOW, ARG_HEX);
#elif defined(TARGET_NR_sigprocmask)
SYSCALL_DEF(sigprocmask, ARG_SIGPROCMASKHOW, ARG_PTR, ARG_PTR);
#endif
+#ifdef TARGET_NR_sigreturn
+SYSCALL_DEF(sigreturn);
+#endif
#if defined(TARGET_ALPHA)
SYSCALL_DEF(sigsuspend, ARG_HEX);
#elif defined(TARGET_NR_sigsuspend)
diff --git a/linux-user/syscall-sig.inc.c b/linux-user/syscall-sig.inc.c
index 774346838b..d5c0ccdcc3 100644
--- a/linux-user/syscall-sig.inc.c
+++ b/linux-user/syscall-sig.inc.c
@@ -206,6 +206,14 @@ SYSCALL_IMPL(rt_sigqueueinfo)
return get_errno(sys_rt_sigqueueinfo(arg1, arg2, &uinfo));
}
+SYSCALL_IMPL(rt_sigreturn)
+{
+ if (block_signals()) {
+ return -TARGET_ERESTARTSYS;
+ }
+ return do_rt_sigreturn(cpu_env);
+}
+
SYSCALL_IMPL(rt_sigsuspend)
{
CPUState *cpu = ENV_GET_CPU(cpu_env);
@@ -471,6 +479,16 @@ SYSCALL_IMPL(sigprocmask)
}
#endif
+#ifdef TARGET_NR_sigreturn
+SYSCALL_IMPL(sigreturn)
+{
+ if (block_signals()) {
+ return -TARGET_ERESTARTSYS;
+ }
+ return do_sigreturn(cpu_env);
+}
+#endif
+
#ifdef TARGET_NR_sigsuspend
SYSCALL_IMPL(sigsuspend)
{
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e489d12103..b8b18ac1de 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4240,18 +4240,6 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
void *p;
switch(num) {
-#ifdef TARGET_NR_sigreturn
- case TARGET_NR_sigreturn:
- if (block_signals()) {
- return -TARGET_ERESTARTSYS;
- }
- return do_sigreturn(cpu_env);
-#endif
- case TARGET_NR_rt_sigreturn:
- if (block_signals()) {
- return -TARGET_ERESTARTSYS;
- }
- return do_rt_sigreturn(cpu_env);
case TARGET_NR_sethostname:
if (!(p = lock_user_string(arg1)))
return -TARGET_EFAULT;
diff --git a/linux-user/strace.list b/linux-user/strace.list
index 57445a8d81..b1c2f7851e 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -926,9 +926,6 @@
#ifdef TARGET_NR_rmdir
{ TARGET_NR_rmdir, "rmdir" , NULL, NULL, NULL },
#endif
-#ifdef TARGET_NR_rt_sigreturn
-{ TARGET_NR_rt_sigreturn, "rt_sigreturn" , NULL, NULL, NULL },
-#endif
#ifdef TARGET_NR_sched_getaffinity
{ TARGET_NR_sched_getaffinity, "sched_getaffinity" , NULL, NULL, NULL },
#endif
@@ -1113,9 +1110,6 @@
#ifdef TARGET_NR_signalfd4
{ TARGET_NR_signalfd4, "signalfd4" , NULL, NULL, NULL },
#endif
-#ifdef TARGET_NR_sigreturn
-{ TARGET_NR_sigreturn, "sigreturn" , NULL, NULL, NULL },
-#endif
#ifdef TARGET_NR_socket
{ TARGET_NR_socket, "socket" , NULL, print_socket, NULL },
#endif
--
2.17.1
