Skip to content

Commit 4574c27

Browse files
committed
Move pthread_join builtin to JS
1 parent 297ff73 commit 4574c27

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/library_pthread.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,10 @@ var LibraryPThread = {
835835
#endif
836836
},
837837

838+
#if USE_LSAN
839+
emscripten_builtin_pthread_join: 'pthread_join',
840+
#endif
841+
838842
pthread_kill__deps: ['$killThread', '$cancelThread', 'emscripten_main_browser_thread_id'],
839843
pthread_kill: function(thread, signal) {
840844
if (signal < 0 || signal >= 65/*_NSIG*/) return ERRNO_CODES.EINVAL;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,3 @@ static int __pthread_tryjoin_np(pthread_t t, void **res)
6060
weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np);
6161
weak_alias(__pthread_timedjoin_np, pthread_timedjoin_np);
6262
weak_alias(__pthread_join, pthread_join);
63-
64-
#ifdef __EMSCRIPTEN__ // XXX Emscripten needed by LSan
65-
weak_alias(__pthread_join, emscripten_builtin_pthread_join);
66-
#endif

0 commit comments

Comments
 (0)