diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2015-09-19 20:56:48 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2015-09-19 20:56:48 +0000 |
| commit | 770304b5396c370623ba149135a86ee62fefdc3d (patch) | |
| tree | 73992938b87e8f7e6df2f4b6f5c37d8af3103952 /libexec/ld.so/hppa | |
| parent | 579353319059792ab9013a12c79e222bfd25e159 (diff) | |
kbind has eliminated the need for and use of the bind lock. Delete it, the
the callback, and the sigprocmask stub.
Keep around the DL_SETBINDLCK case until libpthread stops using it.
discussed with miod@ at l2k15
ok kettenis@
Diffstat (limited to 'libexec/ld.so/hppa')
| -rw-r--r-- | libexec/ld.so/hppa/ldasm.S | 24 | ||||
| -rw-r--r-- | libexec/ld.so/hppa/syscall.h | 4 |
2 files changed, 2 insertions, 26 deletions
diff --git a/libexec/ld.so/hppa/ldasm.S b/libexec/ld.so/hppa/ldasm.S index 062eec956a8..f1d9bf2a453 100644 --- a/libexec/ld.so/hppa/ldasm.S +++ b/libexec/ld.so/hppa/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.16 2015/09/13 17:08:03 guenther Exp $ */ +/* $OpenBSD: ldasm.S,v 1.17 2015/09/19 20:56:47 guenther Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff @@ -278,26 +278,4 @@ ENTRY(_dl_sendsyslog,0) nop EXIT(_dl_sendsyslog) -ENTRY(_dl_sigprocmask,0) - stw arg2, HPPA_FRAME_ARG(2)(sp) - - comb,<>,n r0, arg1, _dl_sigprocmask$nblock - - b _dl_sigprocmask$call - ldi 1, arg0 - -_dl_sigprocmask$nblock - ldw 0(arg1), arg1 - stw arg1, HPPA_FRAME_ARG(1)(sp) - -_dl_sigprocmask$call - SYSCALL(sigprocmask) - - ldw HPPA_FRAME_ARG(2)(sp), arg2 - add,= r0, arg2, r0 - stw ret0, 0(arg2) - bv r0(rp) - copy r0, ret0 -EXIT(_dl_sigprocmask) - .end diff --git a/libexec/ld.so/hppa/syscall.h b/libexec/ld.so/hppa/syscall.h index 60e9934a91b..cb3a657d4ff 100644 --- a/libexec/ld.so/hppa/syscall.h +++ b/libexec/ld.so/hppa/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.16 2014/09/01 05:09:53 doug Exp $ */ +/* $OpenBSD: syscall.h,v 1.17 2015/09/19 20:56:47 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -31,7 +31,6 @@ #include <sys/syscall.h> #include <sys/stat.h> -#include <sys/signal.h> #ifndef _dl_MAX_ERRNO #define _dl_MAX_ERRNO 512L @@ -50,7 +49,6 @@ int _dl_open(const char *, int); ssize_t _dl_read(int, const char *, size_t); int _dl_fstat(int, struct stat *); ssize_t _dl_getdents(int, char *, size_t); -int _dl_sigprocmask(int, const sigset_t *, sigset_t *); int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t); int _dl_gettimeofday(struct timeval *, struct timezone *); ssize_t _dl_readlink(const char *, char *, size_t); |