X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread%2Fpthread_detach.c;h=77772af2c6349fca2cd66860c71e910c3138b101;hb=bf14ef193b4203aa9a8b173faeeea06d98397f65;hp=e80323982dd91704c47c7588896f288b47edc18b;hpb=92f8396b0c8e4f146563b87f46137484cfb36e31;p=musl

diff --git a/src/thread/pthread_detach.c b/src/thread/pthread_detach.c
index e8032398..77772af2 100644
--- a/src/thread/pthread_detach.c
+++ b/src/thread/pthread_detach.c
@@ -1,11 +1,14 @@
 #include "pthread_impl.h"
+#include <threads.h>
 
-int pthread_detach(pthread_t t)
+static int __pthread_detach(pthread_t t)
 {
-	/* Cannot detach a thread that's already exiting */
-	if (a_swap(&t->exitlock, 1))
-		return pthread_join(t, 0);
-	t->detached = 2;
-	a_store(&t->exitlock, 0);
+	/* If the cas fails, detach state is either already-detached
+	 * or exiting/exited, and pthread_join will trap or cleanup. */
+	if (a_cas(&t->detach_state, DT_JOINABLE, DT_DETACHED) != DT_JOINABLE)
+		return __pthread_join(t, 0);
 	return 0;
 }
+
+weak_alias(__pthread_detach, pthread_detach);
+weak_alias(__pthread_detach, thrd_detach);