Alternative fix for PR emscripten-core#19496

kleisauke · Oct 23, 2023 · 38a001d · 38a001d
1 parent 054bf30
commit 38a001d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/postamble.js b/src/postamble.js
@@ -154,12 +154,6 @@ function stackCheckInit() {
 }
 #endif
 
-#if MAIN_MODULE && PTHREADS
-// Map of modules to be shared with new threads.  This gets populated by the
-// main thread and shared with all new workers.
-var sharedModules = Module['sharedModules'] || [];
-#endif
-
 #if MAIN_READS_PARAMS
 function run(args = arguments_) {
 #else

diff --git a/src/preamble.js b/src/preamble.js
@@ -917,6 +917,12 @@ function instantiateAsync(binary, binaryFile, imports, callback) {
 }
 #endif // WASM_ASYNC_COMPILATION
 
+#if MAIN_MODULE && PTHREADS
+// Map of modules to be shared with new threads.  This gets populated by the
+// main thread and shared with all new workers.
+var sharedModules = Module['sharedModules'] || [];
+#endif
+
 // Create the wasm instance.
 // Receives the wasm imports, returns the exports.
 function createWasm() {
@@ -961,6 +967,11 @@ function createWasm() {
     if (metadata.neededDynlibs) {
       dynamicLibraries = metadata.neededDynlibs.concat(dynamicLibraries);
     }
+#endif
+#if PTHREADS
+    if (ENVIRONMENT_IS_PTHREAD) {
+      dynamicLibraries = Object.keys(sharedModules);
+    }
 #endif
     mergeLibSymbols(wasmExports, 'main')
 #if '$LDSO' in addedLibraryItems