From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Riku Voipio" <riku.voipio@iki.fi>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
qemu-arm@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v2 06/16] target/ppc: fix signal delivery for ppc64abi32
Date: Thu, 19 Sep 2019 18:10:05 +0100 [thread overview]
Message-ID: <20190919171015.12681-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190919171015.12681-1-alex.bennee@linaro.org>
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>
---
v2
- change to wording
---
linux-user/ppc/signal.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index 619a56950df..5b82af6cb62 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
next prev parent reply other threads:[~2019-09-19 17:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 17:09 [PATCH v2 00/16] testing/next (docker/podman, tcg, build fixes) Alex Bennée
2019-09-19 17:10 ` [PATCH v2 01/16] tests/docker: add sanitizers back to clang build Alex Bennée
2019-09-19 17:10 ` [PATCH v2 02/16] tests/docker: fix DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-23 19:46 ` Cleber Rosa
2019-09-19 17:10 ` [PATCH v2 03/16] tests/docker: remove python2.7 from docker9-mxe Alex Bennée
2019-09-23 19:49 ` Cleber Rosa
2019-09-23 19:55 ` John Snow
2019-09-19 17:10 ` [PATCH v2 04/16] tests/docker: reduce scary warnings from failed inspect Alex Bennée
2019-09-23 20:51 ` Cleber Rosa
2019-09-23 23:00 ` Alex Bennée
2019-09-19 17:10 ` [PATCH v2 05/16] podman: fix command invocation Alex Bennée
2019-09-23 18:47 ` Cleber Rosa
2019-09-19 17:10 ` Alex Bennée [this message]
2019-09-20 19:27 ` [PATCH v2 06/16] target/ppc: fix signal delivery for ppc64abi32 Laurent Vivier
2019-09-19 17:10 ` [PATCH v2 07/16] tests/tcg: clean-up some comments after the de-tangling Alex Bennée
2019-09-19 17:10 ` [PATCH v2 08/16] tests/tcg: re-enable linux-test for ppc64abi32 Alex Bennée
2019-09-19 22:00 ` Richard Henderson
2019-09-19 17:10 ` [PATCH v2 09/16] tests/tcg: add float_madds test to multiarch Alex Bennée
2019-09-19 22:07 ` Richard Henderson
2019-09-19 17:10 ` [PATCH v2 10/16] tests/tcg: add generic version of float_convs Alex Bennée
2019-09-19 22:09 ` Richard Henderson
2019-09-20 9:29 ` Alex Bennée
2019-09-20 10:15 ` Alex Bennée
2019-09-20 22:09 ` Richard Henderson
2019-09-19 17:10 ` [PATCH v2 11/16] tests/tcg: add simple record/replay smoke test for aarch64 Alex Bennée
2019-09-19 17:10 ` [PATCH v2 12/16] tests/docker: Add fedora-win10sdk-cross image Alex Bennée
2019-09-19 17:10 ` [PATCH v2 13/16] .shippable.yml: Build WHPX enabled binaries Alex Bennée
2019-09-19 17:10 ` [PATCH v2 14/16] configure: preserve PKG_CONFIG for subdir builds Alex Bennée
2019-09-19 22:12 ` Richard Henderson
2019-09-19 17:10 ` [PATCH v2 15/16] docs/devel: add "check-tcg" to testing.rst Alex Bennée
2019-09-19 17:10 ` [PATCH v2 16/16] Makefile: fix-up qemu-ga.8 paths to take in-src builds into account Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190919171015.12681-7-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).