about summary refs log tree commit diff
path: root/src/thread
diff options
context:
space:
mode:
Diffstat (limited to 'src/thread')
-rw-r--r--src/thread/pthread_self.c1
-rw-r--r--src/thread/pthread_setcancelstate.c11
-rw-r--r--src/thread/pthread_setcanceltype.c2
3 files changed, 10 insertions, 4 deletions
diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 83efa9e8..e26476ce 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -14,6 +14,7 @@ static int *errno_location()
 
 static int init_main_thread()
 {
+	main_thread.canceldisable = libc.canceldisable;
 	main_thread.tsd = (void **)__pthread_tsd_main;
 	main_thread.self = &main_thread;
 	if (__set_thread_area(&main_thread) < 0)
diff --git a/src/thread/pthread_setcancelstate.c b/src/thread/pthread_setcancelstate.c
index aa0ddcdd..6722541a 100644
--- a/src/thread/pthread_setcancelstate.c
+++ b/src/thread/pthread_setcancelstate.c
@@ -2,9 +2,14 @@
 
 int pthread_setcancelstate(int new, int *old)
 {
-	struct pthread *self = pthread_self();
-	if (old) *old = self->canceldisable;
 	if (new > 1U) return EINVAL;
-	self->canceldisable = new;
+	if (libc.lock) {
+		struct pthread *self = __pthread_self();
+		if (old) *old = self->canceldisable;
+		self->canceldisable = new;
+	} else {
+		if (old) *old = libc.canceldisable;
+		libc.canceldisable = new;
+	}
 	return 0;
 }
diff --git a/src/thread/pthread_setcanceltype.c b/src/thread/pthread_setcanceltype.c
index c73db22f..7eb543a8 100644
--- a/src/thread/pthread_setcanceltype.c
+++ b/src/thread/pthread_setcanceltype.c
@@ -3,8 +3,8 @@
 int pthread_setcanceltype(int new, int *old)
 {
 	struct pthread *self = pthread_self();
+	if (new > 1U) return EINVAL;
 	if (old) *old = self->cancelasync;
-	if ((unsigned)new > 1) return EINVAL;
 	self->cancelasync = new;
 	return 0;
 }