summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-17 16:33:08 -0300
committerRenato Botelho <renato@netgate.com>2015-08-17 16:33:08 -0300
commitfa20d96d557409f7be9d8cf59cdd6d18285b76b1 (patch)
tree1beb5c97df17b0f25b537f039b675f7b4c47899c /lib
parent6ee75bdd7bf7c20359dd6e38c243586cb062edea (diff)
parent47eb9e91e4cef40c34486f99c1fe7584fc41e91c (diff)
downloadFreeBSD-src-fa20d96d557409f7be9d8cf59cdd6d18285b76b1.zip
FreeBSD-src-fa20d96d557409f7be9d8cf59cdd6d18285b76b1.tar.gz
Merge branch 'stable/10' into devel
Diffstat (limited to 'lib')
-rw-r--r--lib/libthr/thread/thr_rtld.c7
-rw-r--r--lib/libthr/thread/thr_sig.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c
index 5d89988..cb20098 100644
--- a/lib/libthr/thread/thr_rtld.c
+++ b/lib/libthr/thread/thr_rtld.c
@@ -185,7 +185,9 @@ _thr_rtld_init(void)
{
struct RtldLockInfo li;
struct pthread *curthread;
+ ucontext_t *uc;
long dummy = -1;
+ int uc_len;
curthread = _get_curthread();
@@ -231,4 +233,9 @@ _thr_rtld_init(void)
_thr_signal_block(curthread);
_rtld_thread_init(&li);
_thr_signal_unblock(curthread);
+
+ uc_len = __getcontextx_size();
+ uc = alloca(uc_len);
+ getcontext(uc);
+ __fillcontextx2((char *)uc);
}
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index a6d021f..ebb6c58 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.c
@@ -30,6 +30,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/signalvar.h>
+#include <sys/syscall.h>
#include <signal.h>
#include <errno.h>
#include <stdlib.h>
@@ -257,7 +258,7 @@ handle_signal(struct sigaction *actp, int sig, siginfo_t *info, ucontext_t *ucp)
/* reschedule cancellation */
check_cancel(curthread, &uc2);
errno = err;
- __sys_sigreturn(&uc2);
+ syscall(SYS_sigreturn, &uc2);
}
void
OpenPOWER on IntegriCloud