diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-02-02 13:44:27 +1000 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-02-09 10:44:49 +0300 |
| commit | 3a970decfee1f82dcafce8b9e56bc1b382975f77 (patch) | |
| tree | 29ee4cd1ed3ecd9bba636af59e7afdb40a649b59 | |
| parent | 8b7750c66f191ec830c2985dcc1382703b48a117 (diff) | |
linux-user/aarch64: Add padding before __kernel_rt_sigreturn
Without this padding, an unwind through the signal handler
will pick up the unwind info for the preceding syscall.
This fixes gcc's 30_threads/thread/native_handle/cancel.cc.
Cc: qemu-stable@nongnu.org
Fixes: ee95fae075c6 ("linux-user/aarch64: Add vdso")
Resolves: https://linaro.atlassian.net/browse/GNU-974
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240202034427.504686-1-richard.henderson@linaro.org>
(cherry picked from commit 6400be014f80e4c2c246eb8be709ea3a96428233)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rwxr-xr-x | linux-user/aarch64/vdso-be.so | bin | 3216 -> 3224 bytes | |||
| -rwxr-xr-x | linux-user/aarch64/vdso-le.so | bin | 3216 -> 3224 bytes | |||
| -rw-r--r-- | linux-user/aarch64/vdso.S | 4 |
3 files changed, 4 insertions, 0 deletions
diff --git a/linux-user/aarch64/vdso-be.so b/linux-user/aarch64/vdso-be.so Binary files differindex 6084f3d1a7..808206ade8 100755 --- a/linux-user/aarch64/vdso-be.so +++ b/linux-user/aarch64/vdso-be.so diff --git a/linux-user/aarch64/vdso-le.so b/linux-user/aarch64/vdso-le.so Binary files differindex 947d534ec1..941aaf2993 100755 --- a/linux-user/aarch64/vdso-le.so +++ b/linux-user/aarch64/vdso-le.so diff --git a/linux-user/aarch64/vdso.S b/linux-user/aarch64/vdso.S index 34d3a9ebd2..a0ac1487b0 100644 --- a/linux-user/aarch64/vdso.S +++ b/linux-user/aarch64/vdso.S @@ -63,7 +63,11 @@ vdso_syscall __kernel_clock_getres, __NR_clock_getres * For now, elide the unwind info for __kernel_rt_sigreturn and rely on * the libgcc fallback routine as we have always done. This requires * that the code sequence used be exact. + * + * Add a nop as a spacer to ensure that unwind does not pick up the + * unwind info from the preceding syscall. */ + nop __kernel_rt_sigreturn: /* No BTI C insn here -- we arrive via RET. */ mov x8, #__NR_rt_sigreturn |