aboutsummaryrefslogtreecommitdiff
path: root/linux-user/ppc/signal.c
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2019-09-11 10:37:43 +0100
committerAlex Bennée <alex.bennee@linaro.org>2019-09-26 19:00:53 +0100
commit2762f04d50b37d93ac8aeb5311b2a1ea4b7c91ac (patch)
tree2ca1a38ddc7f95312d35b7bc1609df46b53bbfdd /linux-user/ppc/signal.c
parent11bfdbdfc2863502967ea32f0576058e790a5149 (diff)
downloadqemu-2762f04d50b37d93ac8aeb5311b2a1ea4b7c91ac.zip
qemu-2762f04d50b37d93ac8aeb5311b2a1ea4b7c91ac.tar.gz
qemu-2762f04d50b37d93ac8aeb5311b2a1ea4b7c91ac.tar.bz2
target/ppc: fix signal delivery for ppc64abi32
We were incorrectly using the 64-bit AIX ABI instead of the 32-bit SYSV ABI for setting NIP for the signal handler. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user/ppc/signal.c')
-rw-r--r--linux-user/ppc/signal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index 619a569..5b82af6 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -501,8 +501,10 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
int i, err = 0;
#if defined(TARGET_PPC64)
struct target_sigcontext *sc = 0;
+#if !defined(TARGET_ABI32)
struct image_info *image = ((TaskState *)thread_cpu->opaque)->info;
#endif
+#endif
rt_sf_addr = get_sigframe(ka, env, sizeof(*rt_sf));
if (!lock_user_struct(VERIFY_WRITE, rt_sf, rt_sf_addr, 1))
@@ -557,7 +559,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
env->gpr[5] = (target_ulong) h2g(&rt_sf->uc);
env->gpr[6] = (target_ulong) h2g(rt_sf);
-#if defined(TARGET_PPC64)
+#if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
if (get_ppc64_abi(image) < 2) {
/* ELFv1 PPC64 function pointers are pointers to OPD entries. */
struct target_func_ptr *handler =