diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
commit | a65dd355fb80a05215e15ae97649de52aec885e3 (patch) | |
tree | 81701bb0c6b648630f2bf1729a85d7f5eb49e67b /ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S | |
parent | 296a5732f94abe4d5699dc981e4ccfb950b48cee (diff) | |
parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S')
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S b/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S index 3d291fd0b4..6efa7386d5 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 |