[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.1 5/5] linux-user: use TARGET_SA_ONSTACK in get
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL for-2.1 5/5] linux-user: use TARGET_SA_ONSTACK in get_sigframe |
Date: |
Tue, 15 Jul 2014 17:24:57 +0300 |
From: Riku Voipio <address@hidden>
As reported by Laurent, which should use TARGET_SA_ONSTACK
on arm, microblaze and openrisc targets like we do on all
others. Practical matter is minimal as for almost all archs
SA_ONSTACK is 0x08000000:
http://lxr.free-electrons.com/ident?i=SA_ONSTACK
Reported-by: Laurent Desnogues <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/signal.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index f3b4378..1141054 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -1305,7 +1305,7 @@ static abi_ulong get_sigframe(struct target_sigaction
*ka, CPUARMState *env)
/*
* This is the X/Open sanctioned signal stack switching.
*/
- if ((ka->sa_flags & SA_ONSTACK) && !sas_ss_flags(sp)) {
+ if ((ka->sa_flags & TARGET_SA_ONSTACK) && !sas_ss_flags(sp)) {
sp = target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_size;
}
@@ -3509,8 +3509,9 @@ static abi_ulong get_sigframe(struct target_sigaction *ka,
{
abi_ulong sp = env->regs[1];
- if ((ka->sa_flags & SA_ONSTACK) != 0 && !on_sig_stack(sp))
+ if ((ka->sa_flags & TARGET_SA_ONSTACK) != 0 && !on_sig_stack(sp)) {
sp = target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_size;
+ }
return ((sp - frame_size) & -8UL);
}
@@ -3891,7 +3892,7 @@ static inline abi_ulong get_sigframe(struct
target_sigaction *ka,
/* redzone */
/* This is the X/Open sanctioned signal stack switching. */
- if ((ka->sa_flags & SA_ONSTACK) != 0 && !onsigstack) {
+ if ((ka->sa_flags & TARGET_SA_ONSTACK) != 0 && !onsigstack) {
sp = target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_size;
}
--
2.0.0
- [Qemu-devel] [PULL for-2.1 0/5] linux-user fixes for 2.1, riku . voipio, 2014/07/15
- [Qemu-devel] [PULL for-2.1 1/5] SIOCGIFINDEX: fix typo, riku . voipio, 2014/07/15
- [Qemu-devel] [PULL for-2.1 4/5] alloca one extra byte sockets, riku . voipio, 2014/07/15
- [Qemu-devel] [PULL for-2.1 3/5] linux-user: handle AF_PACKET sockaddrs in target_to_host_sockaddr, riku . voipio, 2014/07/15
- [Qemu-devel] [PULL for-2.1 5/5] linux-user: use TARGET_SA_ONSTACK in get_sigframe,
riku . voipio <=
- [Qemu-devel] [PULL for-2.1 2/5] qemu-user: Impl. setsockopt(SO_BINDTODEVICE), riku . voipio, 2014/07/15
- Re: [Qemu-devel] [PULL for-2.1 0/5] linux-user fixes for 2.1, Peter Maydell, 2014/07/15