Remove remaining pthread function from WASM_WORKERS build. NFC

This includes `pthread_self`, which is not valid to call in Wasm
Workers.

Author: sbc100

ChangeLog.md

@@ -23,6 +23,8 @@ See docs/process.md for more on how version tagging works.
 - The deprecated `EMSCRIPTEN` macro is now defined in `emscripten.h` rather than
   on the command line (`__EMSCRIPTEN__`, which is built into LLVM, should be
   used instead). (#26417)
+- All pthread functions are now undefined when building with `-sWASM_WORKERS`.
+  This is an extension of #26336 which removed many of them. (#26487)
 
 5.0.3 - 03/14/26
 ----------------

system/lib/pthread/emscripten_thread_state.S

@@ -6,8 +6,10 @@
 
 .section .globals,"",@
 
+#ifndef __EMSCRIPTEN_WASM_WORKERS__
 .globaltype thread_ptr, PTR
 thread_ptr:
+#endif
 
 .globaltype is_main_thread, i32
 is_main_thread:
@@ -28,8 +30,10 @@ done_init:
 .globl __set_thread_state
 __set_thread_state:
   .functype __set_thread_state (PTR, i32, i32, i32) -> ()
+#ifndef __EMSCRIPTEN_WASM_WORKERS__
   local.get 0
   global.set thread_ptr
+#endif
   local.get 1
   global.set is_main_thread
   local.get 2
@@ -56,14 +60,13 @@ lazy_init_thread_state:
   end_function
 #endif
 
+#ifndef __EMSCRIPTEN_WASM_WORKERS__
 .globl __get_tp
 __get_tp:
   .functype __get_tp () -> (PTR)
-#if __EMSCRIPTEN_WASM_WORKERS__
-  call lazy_init_thread_state
-#endif
   global.get thread_ptr
   end_function
+#endif
 
 # Semantically the same as testing "!ENVIRONMENT_IS_PTHREAD" in JS
 .globl emscripten_is_main_runtime_thread

system/lib/pthread/threading_internal.h

@@ -69,7 +69,7 @@ void _emscripten_thread_exit_joinable(pthread_t thread);
 void _emscripten_thread_exit(void* result);
 void _emscripten_process_dlopen_queue(void);
 
-#ifdef NDEBUG
+#if defined(NDEBUG) || !defined(__EMSCRIPTEN_PTHREADS__)
 #define emscripten_set_current_thread_status(newStatus)
 #define emscripten_conditional_set_current_thread_status(expectedStatus, newStatus)
 #else

tools/system_libs.py

@@ -1211,56 +1211,10 @@ def get_files(self):
           'pthread_kill.c',
           'emscripten_thread_init.c',
           'emscripten_yield.c',
+          'thread_profiler.c',
         ])
     else:
       ignore += ['thread']
-      libc_files += files_in_path(
-        path='system/lib/libc/musl/src/thread',
-        filenames=[
-          'pthread_self.c',
-          'pthread_cleanup_push.c',
-          'pthread_attr_init.c',
-          'pthread_attr_destroy.c',
-          'pthread_attr_get.c',
-          'pthread_attr_setdetachstate.c',
-          'pthread_attr_setguardsize.c',
-          'pthread_attr_setinheritsched.c',
-          'pthread_attr_setschedparam.c',
-          'pthread_attr_setschedpolicy.c',
-          'pthread_attr_setscope.c',
-          'pthread_attr_setstack.c',
-          'pthread_attr_setstacksize.c',
-          'pthread_getattr_np.c',
-          'pthread_getconcurrency.c',
-          'pthread_getcpuclockid.c',
-          'pthread_getschedparam.c',
-          'pthread_setschedprio.c',
-          'pthread_setconcurrency.c',
-          'default_attr.c',
-          # C11 thread library functions
-          'call_once.c',
-          'tss_create.c',
-          'tss_delete.c',
-          'tss_set.c',
-          'cnd_broadcast.c',
-          'cnd_destroy.c',
-          'cnd_init.c',
-          'cnd_signal.c',
-          'cnd_timedwait.c',
-          'cnd_wait.c',
-          'mtx_destroy.c',
-          'mtx_init.c',
-          'mtx_lock.c',
-          'mtx_timedlock.c',
-          'mtx_trylock.c',
-          'mtx_unlock.c',
-          'thrd_create.c',
-          'thrd_exit.c',
-          'thrd_join.c',
-          'thrd_sleep.c',
-          'thrd_yield.c',
-        ])
-
       libc_files += files_in_path(
         path='system/lib/libc',
         filenames=['emscripten_yield_stub.c'])
@@ -1285,6 +1239,52 @@ def get_files(self):
             'pthread_self_stub.c',
             'proxying_stub.c',
           ])
+        libc_files += files_in_path(
+          path='system/lib/libc/musl/src/thread',
+          filenames=[
+            'pthread_self.c',
+            'pthread_cleanup_push.c',
+            'pthread_attr_init.c',
+            'pthread_attr_destroy.c',
+            'pthread_attr_get.c',
+            'pthread_attr_setdetachstate.c',
+            'pthread_attr_setguardsize.c',
+            'pthread_attr_setinheritsched.c',
+            'pthread_attr_setschedparam.c',
+            'pthread_attr_setschedpolicy.c',
+            'pthread_attr_setscope.c',
+            'pthread_attr_setstack.c',
+            'pthread_attr_setstacksize.c',
+            'pthread_getattr_np.c',
+            'pthread_getconcurrency.c',
+            'pthread_getcpuclockid.c',
+            'pthread_getschedparam.c',
+            'pthread_setschedprio.c',
+            'pthread_setconcurrency.c',
+            'default_attr.c',
+            # C11 thread library functions
+            'call_once.c',
+            'tss_create.c',
+            'tss_delete.c',
+            'tss_set.c',
+            'cnd_broadcast.c',
+            'cnd_destroy.c',
+            'cnd_init.c',
+            'cnd_signal.c',
+            'cnd_timedwait.c',
+            'cnd_wait.c',
+            'mtx_destroy.c',
+            'mtx_init.c',
+            'mtx_lock.c',
+            'mtx_timedlock.c',
+            'mtx_trylock.c',
+            'mtx_unlock.c',
+            'thrd_create.c',
+            'thrd_exit.c',
+            'thrd_join.c',
+            'thrd_sleep.c',
+            'thrd_yield.c',
+          ])
 
     if self.is_mt or self.is_ww:
       # Low level thread primitives available in both pthreads and wasm workers builds.
@@ -1412,10 +1412,6 @@ def get_files(self):
     if settings.MAIN_MODULE:
       libc_files += files_in_path(path='system/lib/libc', filenames=['dynlink.c'])
 
-    libc_files += files_in_path(
-        path='system/lib/pthread',
-        filenames=['thread_profiler.c'])
-
     libc_files += glob_in_path('system/lib/libc/compat', '*.c')
 
     # Check for missing file in non_lto_files list.  Do this here