aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2013-11-16 06:34:39 +1000
committerRichard Henderson <rth@twiddle.net>2013-11-17 14:58:30 +1000
commit6d153c48a17487a1bd2ae47a1d6be8df28c21130 (patch)
tree72ac08dea867ea61a57dc10da963c14840fdd442
parent2293d2b10a583486cd22ce578796848f4c3a8b6d (diff)
downloadtermbaud-6d153c48a17487a1bd2ae47a1d6be8df28c21130.tar.gz
termbaud-6d153c48a17487a1bd2ae47a1d6be8df28c21130.tar.xz
termbaud-6d153c48a17487a1bd2ae47a1d6be8df28c21130.zip
alpha: Fix signal thunk unwind info
-rw-r--r--ports/ChangeLog.alpha5
-rw-r--r--ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S18
2 files changed, 19 insertions, 4 deletions
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 4a4db09fb86..0fc0a4b7754 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2013-11-16 Richard Henderson <rth@redhat.com>
+
+ * sysdeps/unix/sysv/linux/alpha/rt_sigaction.S: Include a nop
+ before each signal thunk.
+
2013-07-02 Richard Henderson <rth@redhat.com>
* sysdeps/alpha/fpu/libm-test-ulps: Update.
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S b/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S
index 3d291fd0b4b..6efa7386d58 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S
+++ b/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S
@@ -83,14 +83,21 @@ PSEUDO_END(__syscall_rt_sigaction)
cfi_offset (64, \base + 2 * 8)
.endm
- .align 4
-
cfi_startproc
cfi_return_column (64)
.cfi_signal_frame
SIGCONTEXT_REGS -648
-
cfi_def_cfa_offset (648)
+
+ /* While this frame is marked as a signal frame, that only applies
+ to how this return address is handled for the outer frame.
+ The return address that arrived here, from the inner frame, is
+ not marked as a signal frame and so the unwinder still tries to
+ subtract 1 to examine the presumed call insn. Thus we must
+ extend the unwind info to a nop before the start. */
+ nop
+ .align 4
+
__syscall_sigreturn:
mov sp, a0
ldi v0, __NR_sigreturn
@@ -98,8 +105,11 @@ __syscall_sigreturn:
.size __syscall_sigreturn, .-__syscall_sigreturn
.type __syscall_sigreturn, @function
- .align 4
+ /* See above wrt including the nop. */
cfi_def_cfa_offset (176 + 648)
+ nop
+ .align 4
+
__syscall_rt_sigreturn:
mov sp,a0
ldi v0,__NR_rt_sigreturn