diff options
| -rw-r--r-- | linux-user/cris/target_signal.h | 1 | ||||
| -rw-r--r-- | linux-user/main.c | 6 | ||||
| -rw-r--r-- | linux-user/signal.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h index 5611840f83..e0f1382815 100644 --- a/linux-user/cris/target_signal.h +++ b/linux-user/cris/target_signal.h @@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUCRISState *state) return state->regs[14]; } + #endif /* TARGET_SIGNAL_H */ diff --git a/linux-user/main.c b/linux-user/main.c index c16d7edc3a..a532221ebc 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2914,7 +2914,11 @@ void cpu_loop(CPUCRISState *env) env->pregs[7], env->pregs[11], 0, 0); - env->regs[10] = ret; + if (ret == -TARGET_ERESTARTSYS) { + env->pc -= 2; + } else if (ret != -TARGET_QEMU_ESIGRETURN) { + env->regs[10] = ret; + } break; case EXCP_DEBUG: { diff --git a/linux-user/signal.c b/linux-user/signal.c index 51e11c14fb..71a8e2ac66 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -3785,7 +3785,7 @@ long do_sigreturn(CPUCRISState *env) restore_sigcontext(&frame->sc, env); unlock_user_struct(frame, frame_addr, 0); - return env->regs[10]; + return -TARGET_QEMU_ESIGRETURN; badframe: force_sig(TARGET_SIGSEGV); } |