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

in setcontext/swapcontext.

diff --git a/ChangeLog b/ChangeLog
index c11d03efb375ed900a4af3b401d86fbb28e5e402..eadd60fabbd26ed18f12693eeb4ea94551c5da51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/sysdeps/unix/sysv/linux/nios2/setcontext.S b/sysdeps/unix/sysv/linux/nios2/setcontext.S
index f40b73389d018cf93fa71c5b0330f3a672a4b00c..8d899d950fcd709fcf1e6b4cce30bcf14300d605 100644 (file)
--- a/sysdeps/unix/sysv/linux/nios2/setcontext.S
+++ b/sysdeps/unix/sysv/linux/nios2/setcontext.S
@@ -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

diff --git a/sysdeps/unix/sysv/linux/nios2/swapcontext.S b/sysdeps/unix/sysv/linux/nios2/swapcontext.S
index c2c321d96a5451503a33b8cf75ddd1c8afbe4187..cfbcf8d25627a1d186d164f3a084c8b77320d679 100644 (file)
--- a/sysdeps/unix/sysv/linux/nios2/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/nios2/swapcontext.S
@@ -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