[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/28] target/ppc: fix signal delivery for ppc64abi32
From: |
Alex Bennée |
Subject: |
[PULL 08/28] target/ppc: fix signal delivery for ppc64abi32 |
Date: |
Thu, 26 Sep 2019 19:35:33 +0100 |
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 <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index 619a56950d..5b82af6cb6 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -501,7 +501,9 @@ 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));
@@ -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 =
--
2.20.1
- [PULL 00/28] testing updates (docker,podman,tcg,alpha), Alex Bennée, 2019/09/26
- [PULL 01/28] target/alpha: Use array for FPCR_DYN conversion, Alex Bennée, 2019/09/26
- [PULL 02/28] target/alpha: Fix SWCR_MAP_UMZ, Alex Bennée, 2019/09/26
- [PULL 03/28] target/alpha: Fix SWCR_TRAP_ENABLE_MASK, Alex Bennée, 2019/09/26
- [PULL 05/28] target/alpha: Write to fpcr_flush_to_zero once, Alex Bennée, 2019/09/26
- [PULL 04/28] target/alpha: Handle SWCR_MAP_DMZ earlier, Alex Bennée, 2019/09/26
- [PULL 06/28] target/alpha: Mask IOV exception with INV for user-only, Alex Bennée, 2019/09/26
- [PULL 09/28] tests/docker: add sanitizers back to clang build, Alex Bennée, 2019/09/26
- [PULL 08/28] target/ppc: fix signal delivery for ppc64abi32,
Alex Bennée <=
- [PULL 10/28] tests/docker: fix DOCKER_PARTIAL_IMAGES, Alex Bennée, 2019/09/26
- [PULL 07/28] target/alpha: Tidy helper_fp_exc_raise_s, Alex Bennée, 2019/09/26
- [PULL 11/28] tests/docker: remove python2.7 from debian9-mxe, Alex Bennée, 2019/09/26
- [PULL 13/28] podman: fix command invocation, Alex Bennée, 2019/09/26
- [PULL 14/28] tests/tcg: clean-up some comments after the de-tangling, Alex Bennée, 2019/09/26
- [PULL 24/28] docker: remove 'deprecated' image definitions, Alex Bennée, 2019/09/26
- [PULL 12/28] tests/docker: reduce scary warnings by cleaning up clean up, Alex Bennée, 2019/09/26
- [PULL 17/28] tests/tcg: add generic version of float_convs, Alex Bennée, 2019/09/26
- [PULL 26/28] docker: remove unused debian-sid, Alex Bennée, 2019/09/26
- [PULL 19/28] configure: preserve PKG_CONFIG for subdir builds, Alex Bennée, 2019/09/26