ignore ENOSYS error from mprotect in pthread_create and dynamic linker

[musl] / src / thread / pthread_join.c

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index 719c91c..966b4ab 100644 (file)
--- a/src/thread/pthread_join.c
+++ b/src/thread/pthread_join.c
@@ -1,15 +1,21 @@
 #include "pthread_impl.h"
 #include <sys/mman.h>
 
-static void dummy(void *p)
-{
-}
+int __munmap(void *, size_t);
+void __pthread_testcancel(void);
+int __pthread_setcancelstate(int, int *);
 
-int pthread_join(pthread_t t, void **res)
+int __pthread_join(pthread_t t, void **res)
 {
-       int tmp;
-       while ((tmp = t->tid)) __timedwait(&t->tid, tmp, 0, 0, dummy, 0, 0);
+       int tmp, cs;
+       __pthread_testcancel();
+       __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+       if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
+       while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0);
+       __pthread_setcancelstate(cs, 0);
        if (res) *res = t->result;
-       if (t->map_base) munmap(t->map_base, t->map_size);
+       if (t->map_base) __munmap(t->map_base, t->map_size);
        return 0;
 }
+
+weak_alias(__pthread_join, pthread_join);