diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2014-07-31 20:04:54 +0200 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2014-07-31 20:04:54 +0200 |
| commit | 2f438e20ab591641760e97458d5d1569942eced5 (patch) | |
| tree | 3fb25d366c77a51ecfbf1c79d4b0b02521573443 /sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S | |
| parent | 6c9578a24b5c4182d1c475a32a147478bc757bf3 (diff) | |
| download | glibc-2f438e20ab591641760e97458d5d1569942eced5.tar.gz glibc-2f438e20ab591641760e97458d5d1569942eced5.tar.xz glibc-2f438e20ab591641760e97458d5d1569942eced5.zip | |
S/390: Revert the jmp_buf/ucontext_t ABI change.
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S b/sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S index 41ede4b7b2..9206aa334d 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S @@ -65,31 +65,19 @@ ENTRY(__swapcontext) std %f14,SC_FPRS+112(%r1) std %f15,SC_FPRS+120(%r1) - /* Store access registers. */ - stam %a0,%a15,SC_ACRS(%r1) - /* Set __swapcontext return value to 0. */ slr %r2,%r2 + /* Store access registers. */ + stam %a0,%a15,SC_ACRS(%r1) + /* Store general purpose registers. */ stm %r0,%r15,SC_GPRS(%r1) - /* Copy uc_flags into the new ucontext_t. */ + /* sigprocmask (SIG_SETMASK, &sc->sc_mask, NULL). */ + la %r2,SIG_BLOCK lr %r5,%r0 - l %r2,SC_FLGS(%r5) - st %r2,SC_FLGS(%r1) - - /* Save/restore the upper halfs if necessary. */ - tml %r2,1 /* UCONTEXT_UC_FLAGS_HIGH_GPRS */ - jz 0f - .machine "z900" - .machinemode "zarch_nohighgprs" - stmh %r0,%r15,SC_HIGHGPRS(%r1) - lmh %r0,%r15,SC_HIGHGPRS(%r5) - - /* rt_sigprocmask (SIG_SETMASK, &sc->sc_mask, NULL, sigsetsize). */ -0: la %r2,SIG_BLOCK - la %r3,SC_MASK(%r5) + la %r3,SC_MASK(%r5) slr %r4,%r4 lhi %r5,_NSIG8 svc SYS_ify(rt_sigprocmask) |