diff options
| author | Peter Maydell | 2019-09-27 16:43:41 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-09-27 16:43:41 +0200 |
| commit | c6f5012ba5fa834cbd5274b1b8369e2c5d2f5933 (patch) | |
| tree | 916817555b31f747fc4046728c8c68af157f6965 /linux-user | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190925' into staging (diff) | |
| parent | tests/docker: remove debian-powerpc-user-cross (diff) | |
| download | qemu-c6f5012ba5fa834cbd5274b1b8369e2c5d2f5933.tar.gz qemu-c6f5012ba5fa834cbd5274b1b8369e2c5d2f5933.tar.xz qemu-c6f5012ba5fa834cbd5274b1b8369e2c5d2f5933.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-260919-1' into staging
Testing updates plus alpha FP fixes:
- fix alpha handling of FtoI overflow
- various docker cleanups
- fix docker.py cleanup race
- fix podman invocation
- tests/tcg: add float and record/replay tests
- remove unused docker images
- expand documentation for check-tcg
# gpg: Signature made Thu 26 Sep 2019 19:33:38 BST
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-next-260919-1: (28 commits)
tests/docker: remove debian-powerpc-user-cross
docker: move tests from python2 to python3
docker: remove unused debian-sid
docker: remove unused debian-ports
docker: remove 'deprecated' image definitions
docker: remove unused debian8 partial image
docker: remove debian8-mxe definitions
target/i386: Fix broken build with WHPX enabled
docs/devel: add "check-tcg" to testing.rst
configure: preserve PKG_CONFIG for subdir builds
tests/tcg: add simple record/replay smoke test for aarch64
tests/tcg: add generic version of float_convs
tests/tcg: add float_madds test to multiarch
tests/tcg: re-enable linux-test for ppc64abi32
tests/tcg: clean-up some comments after the de-tangling
podman: fix command invocation
tests/docker: reduce scary warnings by cleaning up clean up
tests/docker: remove python2.7 from debian9-mxe
tests/docker: fix DOCKER_PARTIAL_IMAGES
tests/docker: add sanitizers back to clang build
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/ppc/signal.c | 4 |
1 files changed, 3 insertions, 1 deletions
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,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 = |