Fix order of arguments to rt_sigprocmask syscall when setting the signal mask

in setcontext/swapcontext.
This commit is contained in:
Chung-Lin Tang 2015-07-24 23:19:50 -07:00
parent 6b183b8339
commit 3f96834346
3 changed files with 13 additions and 6 deletions

View File

@ -1,3 +1,10 @@
2015-07-25 Chung-Lin Tang <cltang@codesourcery.com>
* sysdeps/unix/sysv/linux/nios2/setcontext.S (__setcontext):
Fix order of arguments to the rt_sigprocmask syscall.
* sysdeps/unix/sysv/linux/nios2/swapcontext.S (__swapcontext):
Likewise.
2015-07-24 Roland McGrath <roland@hack.frob.com>
* sysdeps/nacl/bits/fcntl.h (O_SHLOCK, O_EXLOCK): Macros removed.

View File

@ -29,10 +29,10 @@ ENTRY(__setcontext)
mov r10, r4
/* Restore signal mask. */
/* rt_sigprocmask (SIG_SETMASK, NULL, &ucp->uc_sigmask, _NSIG8) */
/* rt_sigprocmask (SIG_SETMASK, &ucp->uc_sigmask, NULL, _NSIG8) */
movi r7, _NSIG8
addi r6, r4, UCONTEXT_SIGMASK
mov r5, zero
addi r5, r4, UCONTEXT_SIGMASK
mov r6, zero
movi r4, SIG_SETMASK
movi r2, SYS_ify (rt_sigprocmask)
trap

View File

@ -68,10 +68,10 @@ ENTRY(__swapcontext)
bne r5, r6, .Lsigreturn
/* Restore signal mask. */
/* rt_sigprocmask (SIG_SETMASK, NULL, &ucp->uc_sigmask, _NSIG8) */
/* rt_sigprocmask (SIG_SETMASK, &ucp->uc_sigmask, NULL, _NSIG8) */
movi r7, _NSIG8
addi r6, r10, UCONTEXT_SIGMASK
mov r5, zero
addi r5, r10, UCONTEXT_SIGMASK
mov r6, zero
movi r4, SIG_SETMASK
movi r2, SYS_ify (rt_sigprocmask)
trap