[Web] Fix thread+dlink builds with emscripten 3.1.61+git #93143
Merged
+48
−43
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Faless
force-pushed
the
web/fix_dlink_emcc_3.1.62
branch
from
ffded59 to
6893ac1
Compare
adamscott
reviewed
Jun 14, 2024
adamscott
reviewed
Jun 14, 2024
adamscott
approved these changes
Jun 14, 2024
SUPPORT_LONGJMP have changed since emscripten 3.1.32 to default to "wasm" mode when exceptions are enabled, and "emscripten" mode when disabled. While we generally doesn't use exception in core, linked libraries may need them, and emscripten don't plan to support WASM EH + Emscripten SjLj in the long term.
They're of little help, and just adds to the possibility of causing deadlocks.
Instead of calling loadDynamicLibraries ourselves, we add the GDExtension libraries to preload to the "dynamicLibraries" module config property. This seems to fix some threading issue with some browsers during the init phase.
Faless
force-pushed
the
web/fix_dlink_emcc_3.1.62
branch
from
6893ac1 to
27d67b5
Compare
|
Thanks! Awesome work 🎉 |
7 tasks
This was referenced Jul 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR does few things to restore and improve thread+dlink web builds:
-s OPTION=valueto-sOPTION=valueto get rid of a nasty warning (I can split this in a separate PR if you prefer, since it adds a bit of noise)SUPPORT_LONGJMPoption to'wasm'to improve gdextension interop (see emscripten 3.1.32 changelog).I'll open a godot-cpp PR to add the same flags(godot-cpp counterpart [Web] Force emcc to use "wasm" longjmp mode godot-cpp#1489).dynamicLibrariesoption to preload GDExtensions instead of manually callingloadDynamicLibrarywhich seems to avoid a deadlock on firefox (see https://bugzilla.mozilla.org/show_bug.cgi?id=1897427 ).Note, emscripten 3.1.62 is unreleased, I've taken 3.1.61 and applied emscripten-core/emscripten#19496