WASIX has thread exit

Author: yamt

expected/wasm32-wasi-pthread/defined-symbols.txt

@@ -229,7 +229,6 @@ __progname
 __progname_full
 __pthread_cond_timedwait
 __pthread_create
-__pthread_exit
 __pthread_join
 __pthread_key_create
 __pthread_key_delete

libc-top-half/musl/src/include/pthread.h

@@ -7,7 +7,7 @@ hidden int __pthread_once(pthread_once_t *, void (*)(void));
 hidden void __pthread_testcancel(void);
 hidden int __pthread_setcancelstate(int, int *);
 hidden int __pthread_create(pthread_t *restrict, const pthread_attr_t *restrict, void *(*)(void *), void *restrict);
-hidden _Noreturn void __pthread_exit(void *);
+hidden void __pthread_exit(void *);
 hidden int __pthread_join(pthread_t, void **);
 hidden int __pthread_mutex_lock(pthread_mutex_t *);
 hidden int __pthread_mutex_trylock(pthread_mutex_t *);

libc-top-half/musl/src/thread/pthread_create.c

@@ -192,8 +192,7 @@ _Noreturn void __pthread_exit(void *result)
 		// do it manually here
 		__tl_unlock();
 		free(self->map_base);
-		// Can't use `exit()` here, because it is too high level
-		for (;;) __wasi_proc_exit(0);
+		for (;;) __wasi_thread_exit(0);
 	}
 #endif
 
@@ -213,7 +212,6 @@ _Noreturn void __pthread_exit(void *result)
 	// __syscall(SYS_exit) would unlock the thread, list
 	// do it manually here
 	__tl_unlock();
-	// Can't use `exit()` here, because it is too high level
 	for (;;) __wasi_thread_exit(0);
 #endif
 }
@@ -274,7 +272,7 @@ static int start_c11(void *p)
 }
 #else
 __attribute__((export_name("wasi_thread_start")))
-_Noreturn void wasi_thread_start(int tid, void *p)
+void wasi_thread_start(int tid, void *p)
 {
 	struct start_args *args = p;
   	__asm__(".globaltype __tls_base, i32\n"

libc-top-half/musl/src/thread/thrd_exit.c

@@ -4,5 +4,5 @@
 
 _Noreturn void thrd_exit(int result)
 {
-	__pthread_exit((void*)(intptr_t)result);
+	for (;;) __pthread_exit((void*)(intptr_t)result);
 }