diff --git a/emcc.py b/emcc.py index 3d86609924a56..4352d51357bc0 100755 --- a/emcc.py +++ b/emcc.py @@ -1651,12 +1651,6 @@ def include_and_export(name): if not shared.Settings.MINIMAL_RUNTIME: shared.Settings.EXPORTED_RUNTIME_METHODS += ['ExitStatus'] - if shared.Settings.LINKABLE: - exit_with_error('-s LINKABLE=1 is not supported with -s USE_PTHREADS>0!') - if shared.Settings.SIDE_MODULE: - exit_with_error('-s SIDE_MODULE=1 is not supported with -s USE_PTHREADS>0!') - if shared.Settings.MAIN_MODULE: - exit_with_error('-s MAIN_MODULE=1 is not supported with -s USE_PTHREADS>0!') if shared.Settings.PROXY_TO_WORKER: exit_with_error('--proxy-to-worker is not supported with -s USE_PTHREADS>0! Use the option -s PROXY_TO_PTHREAD=1 if you want to run the main thread of a multithreaded application in a web worker.') else: diff --git a/tests/test_core.py b/tests/test_core.py index 24b69dbbb7ba5..c1769d0a89ddc 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -8139,6 +8139,10 @@ def test_emscripten_futexes(self): self.set_setting('USE_PTHREADS', '1') self.do_run_in_out_file_test('tests', 'core', 'pthread', 'emscripten_futexes.c') + @node_pthreads + def test_pthreads_dynamic_linking(self): + self.do_basic_dylink_test() + # Tests the emscripten_get_exported_function() API. def test_emscripten_get_exported_function(self): # Could also test with -s ALLOW_TABLE_GROWTH=1