diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2019-07-30 14:05:11 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2019-07-30 14:05:11 +0000 |
| commit | c86b8e7579ac2c4a1f1f70a56715580ed77b4a79 (patch) | |
| tree | 50d4d3b94ce09e19a4ec5dea15113cb2a479d301 | |
| parent | 8a814e20d443adc460a1030fa1a66aa9ae817483 (diff) | |
| download | glibc-c86b8e7579ac2c4a1f1f70a56715580ed77b4a79.tar.gz glibc-c86b8e7579ac2c4a1f1f70a56715580ed77b4a79.tar.xz glibc-c86b8e7579ac2c4a1f1f70a56715580ed77b4a79.zip | |
Restore r31 setting in powerpc32 swapcontext.
Commit ffe8a9a8318e1db225b22da8bc067408494bac5c, "powerpc: Remove rt_sigreturn usage on context function", removed from powerpc32 swapcontext a setting of r31 that is relied upon in subsequent code. I'm not sure why this didn't produce test failures in Adhemerval's 32-bit testing; in my (soft-float) testing in preparation for 2.30 release, I see several context-related failures FAIL: stdlib/tst-makecontext2 FAIL: stdlib/tst-makecontext3 FAIL: stdlib/tst-setcontext FAIL: stdlib/tst-setcontext2 FAIL: stdlib/tst-setcontext4 FAIL: stdlib/tst-setcontext7 FAIL: stdlib/tst-setcontext9 FAIL: stdlib/tst-swapcontext1 that did not appear in 2.29 testing. This patch restores the removed register setting in question, and thus fixes those failures. Tested for powerpc (soft-float). * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S (__CONTEXT_FUNC_NAME): Restore setting of r31.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index a5384542a8..6b46bfa09d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-07-30 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S + (__CONTEXT_FUNC_NAME): Restore setting of r31. + 2019-07-30 Florian Weimer <fweimer@redhat.com> * nptl/tst-pthread-getattr.c (allocate_and_test): Change return diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S index efebb10bba..6fa1ab7d6e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S @@ -276,6 +276,9 @@ ENTRY(__CONTEXT_FUNC_NAME) cmpwi r3,0 bne 3f /* L(error_exit) */ + lwz r4,_FRAME_PARM_SAVE2(r1) + lwz r31,_UC_REGS_PTR(r4) + #ifdef __CONTEXT_ENABLE_FPRS # ifdef __CONTEXT_ENABLE_VRS |