Skip to content

Commit

Permalink
Merge tag 'pull-riscv-to-apply-20220802' of github.com:alistair23/qem…
Browse files Browse the repository at this point in the history
…u 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>
  • Loading branch information
rth7680 committed Aug 2, 2022
2 parents 60205b7 + 1eaa634 commit 9b00d27
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions linux-user/riscv/signal.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit 9b00d27

Please sign in to comment.