Incorporate review comments

Author: kleisauke

system/lib/libc/musl/src/thread/pthread_detach.c

@@ -3,11 +3,10 @@
 
 static int __pthread_detach(pthread_t t)
 {
-#ifdef __EMSCRIPTEN__
 	// XXX EMSCRIPTEN: Add check for invalid (already joined) thread.  Again
 	// for the benefit of the conformance tests.
-	if (t->self != t) return ESRCH;
-#endif
+	if (t->self != t)
+		return ESRCH;
 	/* 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)
@@ -17,6 +16,5 @@ static int __pthread_detach(pthread_t t)
 
 weak_alias(__pthread_detach, pthread_detach);
 weak_alias(__pthread_detach, thrd_detach);
-#ifdef __EMSCRIPTEN__ // XXX Emscripten add an extra alias for ASan/LSan.
+// XXX EMSCRIPTEN: add extra alias for asan.
 weak_alias(__pthread_detach, emscripten_builtin_pthread_detach);
-#endif

system/lib/libc/musl/src/thread/pthread_join.c

@@ -19,6 +19,7 @@ static int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec
 	if (t->self != t) return ESRCH;
 	// Thread is attempting to join to itself.  Already detached threads are
 	// handled below by returning EINVAL instead.
+	// TODO: The detached check here is just to satisfy the `other.test_{proxy,main}_pthread_join_detach` tests.
 	if (t->detach_state != DT_DETACHED && __pthread_self() == t) return EDEADLK;
 #endif
 	int state, cs, r = 0;

tests/pthread/main_thread_join.cpp

@@ -33,7 +33,7 @@ void *ThreadMain(void *arg) {
   // succeeding.
   while (tries.load() < EXPECTED_TRIES) {}
 #endif
-  pthread_exit((void*)0);
+	pthread_exit((void*)0);
 }
 
 pthread_t CreateThread() {