Fix TLS access in JIT with MUSL #13329
Merged
Conversation
This file contains hidden or 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
mvorisek
reviewed
Feb 5, 2024
| @@ -2901,6 +2901,14 @@ static int zend_jit_setup(void) | |||
| asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" | |||
| : "=r" (ret)); | |||
| tsrm_ls_cache_tcb_offset = ret; | |||
| #elif defined(__MUSL__) | |||
There was a problem hiding this comment.
is there any simple way this can be tested?
There was a problem hiding this comment.
No simple way, but I asked Shivam about setting up a build with Alpine/musl. He'll give it a shot.
dstogov
added a commit
that referenced
this pull request
Feb 12, 2024
* PHP-8.2: Fix TLS access in JIT with MUSL (#13329)
dstogov
added a commit
that referenced
this pull request
Feb 12, 2024
* PHP-8.3: Fix TLS access in JIT with MUSL (#13329)
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.
Fixes #12884