Fix __errno_location under wasm workers. NFC
#22744
Merged
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
sbc100
changed the title
__EMSCRIPTEN_PTHREADS__ in __errno_location.c
sbc100
force-pushed
the
errno_location
branch
from
a55f4a2
to
d68d47f
Compare
|
@eyebrowsoffire I'm running into the fact the |
kripken
approved these changes
Oct 15, 2024
sbc100
force-pushed
the
errno_location
branch
2 times, most recently
from
8180dba
to
2559ddc
Compare
kripken
reviewed
Oct 15, 2024
sbc100
force-pushed
the
errno_location
branch
from
2559ddc
to
975a5f4
Compare
sbc100
changed the title
__EMSCRIPTEN_PTHREADS__ in __errno_location.c__errno_location under wasm workers. NFC
|
Updated PR description and title to better reflect the purpose of this change. |
kripken
reviewed
Oct 15, 2024
tools/system_libs.py
Outdated
| @@ -742,7 +742,7 @@ def vary_on(cls): | |||
|
|
|||
| @classmethod | |||
| def get_default_variation(cls, **kwargs): | |||
| return super().get_default_variation(is_mt=settings.PTHREADS, is_ww=settings.WASM_WORKERS and not settings.PTHREADS, **kwargs) | |||
| return super().get_default_variation(is_mt=settings.PTHREADS, is_ww=settings.SHARED_MEMORY and not settings.PTHREADS, **kwargs) | |||
There was a problem hiding this comment.
@eyebrowsoffire, is this maybe enough to resolve #22683
There was a problem hiding this comment.
The reason this is needed for this PR is because it makes __errno_location into a function that, in non-threads build, has TLS erased, making it incompatible with -sSHARED_MEMORY, which triggers the problem found in #22683. Basically it make the problem found in #22683 happen is way more cases, including simple hello world programs.
sbc100
force-pushed
the
errno_location
branch
4 times, most recently
from
5e6053c
to
3ec754a
Compare
Previously the wasm workers build of `__errno_location` was using the single threaded code path which doesn't use a thead local location. In addition this change avoids the use of `__EMSCRIPTEN_PTHREADS__` in `__errno_location.c` which is helpful for unifying the shared memory libc build. See emscripten-core#22735.
sbc100
force-pushed
the
errno_location
branch
from
3ec754a
to
d260235
Compare
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.
Previously the wasm workers build of
__errno_locationwas using thesingle threaded code path which doesn't use a thead local location.
In addition this change avoids the use of
__EMSCRIPTEN_PTHREADS__in__errno_location.cwhich is helpful for unifying the shared memorylibc build. See #22735.