diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-08-01 19:05:10 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-08-01 19:05:10 -0700 |
| commit | 9b00d2790195654ff21b649682cccaa6ae88ea0b (patch) | |
| tree | 66a225a66cfd453c094922d18f8a636f9a0e575c /linux-user/riscv | |
| parent | 60205b71421cbc529ca60b12c79e0eeace007319 (diff) | |
| parent | 1eaa63429a9944265c92efdb94c02fabb231f564 (diff) | |
Merge tag 'pull-riscv-to-apply-20220802' of github.com:alistair23/qemu into staging
Seventh RISC-V PR for QEMU 7.1
This is a second PR to go in for RC1. It fixes a bug we have had
for awhile, but it's a simple fix so let's pull it in for RC1.
* linux-user/riscv: Align signal frame to 16 bytes
# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEE9sSsRtSTSGjTuM6PIeENKd+XcFQFAmLoWxwACgkQIeENKd+X
# cFTePAf8Ci1TmiEzZ8eZo/+3EGIU4sNk749bFUhkUeQa2fB8IwCBAOG4nMyX/DvT
# 4nmkzFjJIWu2FQ8KJ9oJPnb8kZD4fKsAPCUX7bDV9hk9Pv26ReZbgwUgme8v9ehM
# l28BH8zxvUAZgj3TIG96k+X/k9dBjPMvhmcukym+HSdznyCXiUEwENC5WIsI4ARC
# jK295wItcH23SMOSgvFYE/JUNxbTqNvBu76OaUqjnasNOC4QfcJK+HTU0Uu9tVIN
# CUrUjnu2sJApmFEyRfz4mQ+2DvINffXTtCvcyIhVF//EG698joFxcyi/cHLZBf7i
# h3WCBDHIINe1gZlmhWfpBDtRd9KQjQ==
# =o+Uw
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 01 Aug 2022 04:00:44 PM PDT
# gpg: using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054
# gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: F6C4 AC46 D493 4868 D3B8 CE8F 21E1 0D29 DF97 7054
* tag 'pull-riscv-to-apply-20220802' of github.com:alistair23/qemu:
linux-user/riscv: Align signal frame to 16 bytes
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'linux-user/riscv')
| -rw-r--r-- | linux-user/riscv/signal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux-user/riscv/signal.c b/linux-user/riscv/signal.c index 296e39fbf0..eaa168199a 100644 --- a/linux-user/riscv/signal.c +++ b/linux-user/riscv/signal.c @@ -64,9 +64,7 @@ static abi_ulong get_sigframe(struct target_sigaction *ka, /* This is the X/Open sanctioned signal stack switching. */ sp = target_sigsp(sp, ka) - framesize; - - /* XXX: kernel aligns with 0xf ? */ - sp &= ~3UL; /* align sp on 4-byte boundary */ + sp &= ~0xf; return sp; } |