diff options
| author | John David Anglin <danglin@gcc.gnu.org> | 2017-10-01 11:58:04 -0400 |
|---|---|---|
| committer | John David Anglin <danglin@gcc.gnu.org> | 2017-10-01 11:58:04 -0400 |
| commit | 8da92e722ca66e35003abf64a77ae529f9989e6a (patch) | |
| tree | 0e56ce3883a28656ff27c9ded225f3a300fd75b1 | |
| parent | 388784cfddc20ada56d3e52f830d6445b14aa3af (diff) | |
| download | glibc-8da92e722ca66e35003abf64a77ae529f9989e6a.tar.gz glibc-8da92e722ca66e35003abf64a77ae529f9989e6a.tar.xz glibc-8da92e722ca66e35003abf64a77ae529f9989e6a.zip | |
Fix return pointer save and PIC register restore in __getcontext and
__setcontext on hppa. * sysdeps/unix/sysv/linux/hppa/getcontext.S (__getcontext): Save return pointer in frame. * sysdeps/unix/sysv/linux/hppa/setcontext.S (__setcontext): Likewise. Correct offset used to restore PIC register.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/getcontext.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/setcontext.S | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f639d0acb9..593ac8395a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-10-01 John David Anglin <danglin@gcc.gnu.org> + + * sysdeps/unix/sysv/linux/hppa/getcontext.S (__getcontext): Save return + pointer in frame. + * sysdeps/unix/sysv/linux/hppa/setcontext.S (__setcontext): Likewise. + Correct offset used to restore PIC register. + 2017-09-30 John David Anglin <danglin@gcc.gnu.org> [BZ libc/22165] diff --git a/sysdeps/unix/sysv/linux/hppa/getcontext.S b/sysdeps/unix/sysv/linux/hppa/getcontext.S index b201d8fda2..79a59cd557 100644 --- a/sysdeps/unix/sysv/linux/hppa/getcontext.S +++ b/sysdeps/unix/sysv/linux/hppa/getcontext.S @@ -129,6 +129,8 @@ ENTRY(__getcontext) fstds %fr31, 0(%r1) /* Prologue */ + stw %r2, -20(%sp) + .cfi_offset 2, -20 stwm %r4, 64(%sp) .cfi_def_cfa_offset -64 .cfi_offset 4, 0 diff --git a/sysdeps/unix/sysv/linux/hppa/setcontext.S b/sysdeps/unix/sysv/linux/hppa/setcontext.S index 92cb204f8d..78357941b3 100644 --- a/sysdeps/unix/sysv/linux/hppa/setcontext.S +++ b/sysdeps/unix/sysv/linux/hppa/setcontext.S @@ -25,6 +25,8 @@ ENTRY(__setcontext) /* Prologue */ + stw %r2, -20(%sp) + .cfi_offset 2, -20 stwm %r3, 64(%sp) .cfi_def_cfa_offset -64 .cfi_offset 3, 0 @@ -151,7 +153,7 @@ ENTRY(__setcontext) /* Epilogue */ ldw -84(%r30), %r2 #ifdef PIC - ldw -96(%r30), %r19 + ldw -32(%r30), %r19 #endif bv %r0(%r2) ldwm -64(%r30), %r3 |