aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/unix/sysv/linux/hppa/getcontext.S2
-rw-r--r--sysdeps/unix/sysv/linux/hppa/localplt.data1
-rw-r--r--sysdeps/unix/sysv/linux/hppa/setcontext.S2
4 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9007ceaf98..9bc1c16d2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2018-02-15 Joseph Myers <joseph@codesourcery.com>
+ [BZ #18124]
+ * sysdeps/hppa/bsd-setjmp.S: Include <sysdep.h>.
+ (setjmp): Use HIDDEN_JUMPTARGET with __sigsetjmp.
+ * sysdeps/unix/sysv/linux/hppa/getcontext.S (__getcontext): Call
+ __sigprocmask instead of sigprocmask.
+ * sysdeps/unix/sysv/linux/hppa/setcontext.S (__setcontext):
+ Likewise.
+ * sysdeps/unix/sysv/linux/hppa/localplt.data: Remove entries for
+ __sigsetjmp and sigprocmask.
+
[BZ #15105]
* include/argz.h (argz_next): Use libc_hidden_proto.
(__argz_next): Likewise.
diff --git a/sysdeps/unix/sysv/linux/hppa/getcontext.S b/sysdeps/unix/sysv/linux/hppa/getcontext.S
index 4261f60800..b8f978fde8 100644
--- a/sysdeps/unix/sysv/linux/hppa/getcontext.S
+++ b/sysdeps/unix/sysv/linux/hppa/getcontext.S
@@ -160,7 +160,7 @@ ENTRY(__getcontext)
/* sigprocmask(SIG_BLOCK, NULL, &ucp->uc_sigmask); */
ldo oSIGMASK(%r26), %r24
copy %r0, %r25
- bl sigprocmask, %r2
+ bl __sigprocmask, %r2
ldi SIG_BLOCK, %r26
/* Epilogue */
diff --git a/sysdeps/unix/sysv/linux/hppa/localplt.data b/sysdeps/unix/sysv/linux/hppa/localplt.data
index 3279c0af05..5f3475de19 100644
--- a/sysdeps/unix/sysv/linux/hppa/localplt.data
+++ b/sysdeps/unix/sysv/linux/hppa/localplt.data
@@ -8,7 +8,6 @@ libc.so: memalign
libc.so: realloc
libc.so: __sigsetjmp
libc.so: _IO_funlockfile
-libc.so: sigprocmask
libc.so: __errno_location
libm.so: matherr
libpthread.so: __errno_location
diff --git a/sysdeps/unix/sysv/linux/hppa/setcontext.S b/sysdeps/unix/sysv/linux/hppa/setcontext.S
index 8dc0ecf0d8..d5ebc7c4f6 100644
--- a/sysdeps/unix/sysv/linux/hppa/setcontext.S
+++ b/sysdeps/unix/sysv/linux/hppa/setcontext.S
@@ -43,7 +43,7 @@ ENTRY(__setcontext)
/* sigprocmask(SIG_BLOCK, &ucp->uc_sigmask, NULL); */
copy %r0, %r24
ldo oSIGMASK(%r3), %r25
- bl sigprocmask, %r2
+ bl __sigprocmask, %r2
ldi SIG_SETMASK, %r26
comib,<>,n 0,%ret0,.Lerror