From 47c3d4a9752b61b9e590f6928b3a36153f7ccd6a Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Tue, 3 Dec 2024 08:09:58 -0800 Subject: [PATCH] Remove unnecessary forced exports. NFC --- src/library_pthread.js | 2 +- test/other/codesize/test_codesize_minimal_pthreads.funcs | 1 - test/other/codesize/test_codesize_minimal_pthreads.size | 2 +- tools/link.py | 5 +---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/library_pthread.js b/src/library_pthread.js index 1daa32022aad1..64d276410d3fa 100644 --- a/src/library_pthread.js +++ b/src/library_pthread.js @@ -1000,7 +1000,7 @@ var LibraryPThread = { }, $establishStackSpace__internal: true, - $establishStackSpace__deps: ['$stackRestore'], + $establishStackSpace__deps: ['$stackRestore', 'emscripten_stack_set_limits'], $establishStackSpace: (pthread_ptr) => { #if ALLOW_MEMORY_GROWTH // If memory growth is enabled, the memory views may have gotten out of date, diff --git a/test/other/codesize/test_codesize_minimal_pthreads.funcs b/test/other/codesize/test_codesize_minimal_pthreads.funcs index e33d074b756b5..c6b56fc361d82 100644 --- a/test/other/codesize/test_codesize_minimal_pthreads.funcs +++ b/test/other/codesize/test_codesize_minimal_pthreads.funcs @@ -67,7 +67,6 @@ $em_task_queue_free $em_task_queue_is_empty $emscripten_builtin_free $emscripten_builtin_malloc -$emscripten_current_thread_process_queued_calls $emscripten_futex_wait $emscripten_futex_wake $emscripten_stack_get_current diff --git a/test/other/codesize/test_codesize_minimal_pthreads.size b/test/other/codesize/test_codesize_minimal_pthreads.size index 10b2d7f643c17..a02c1cabcd235 100644 --- a/test/other/codesize/test_codesize_minimal_pthreads.size +++ b/test/other/codesize/test_codesize_minimal_pthreads.size @@ -1 +1 @@ -19501 +19495 diff --git a/tools/link.py b/tools/link.py index 5af54b01380d9..2b5b7141e887d 100644 --- a/tools/link.py +++ b/tools/link.py @@ -499,10 +499,6 @@ def setup_pthreads(): settings.REQUIRED_EXPORTS += [ '_emscripten_thread_free_data', '_emscripten_thread_crashed', - 'emscripten_main_runtime_thread_id', - 'emscripten_main_thread_process_queued_calls', - '_emscripten_run_on_main_thread_js', - 'emscripten_stack_set_limits', ] if settings.EMBIND: @@ -687,6 +683,7 @@ def phase_linker_setup(options, state, newargs): if not settings.ASSERTIONS: exit_with_error('PTHREADS_PROFILING only works with ASSERTIONS enabled') options.post_js.append(utils.path_from_root('src/threadprofiler.js')) + settings.REQUIRED_EXPORTS.append('emscripten_main_runtime_thread_id') options.extern_pre_js = read_js_files(options.extern_pre_js) options.extern_post_js = read_js_files(options.extern_post_js)