Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TLS access in JIT with MUSL #13329

Merged
merged 1 commit into from Feb 12, 2024
Merged

Fix TLS access in JIT with MUSL #13329

merged 1 commit into from Feb 12, 2024

Conversation

dstogov
Copy link
Member

@dstogov dstogov commented Feb 5, 2024

Fixes #12884

@@ -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__)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there any simple way this can be tested?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No simple way, but I asked Shivam about setting up a build with Alpine/musl. He'll give it a shot.

@dstogov dstogov merged commit 94ba883 into php:PHP-8.2 Feb 12, 2024
8 checks passed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants