From de96b43d2ad0ce7fabf983b23eabc5bc82dd8b88 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sun, 24 Nov 2024 21:02:35 +0100
Subject: [PATCH 1/2] Fix GH-16902: Set of opcache tests fail zts+aarch64
 (8.2-8.3)

Closes GH-16925.
---
 NEWS                                |  1 +
 ext/opcache/jit/zend_jit_arm64.dasc | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/NEWS b/NEWS
index 7a460ba1424..c1992507302 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@ PHP                                                                        NEWS
     (nielsdos, Dmitry)
   . Fixed bug GH-16851 (JIT_G(enabled) not set correctly on other threads).
     (dktapps)
+  . Fixed bug GH-16902 (Set of opcache tests fail zts+aarch64). (nielsdos)
 
 - OpenSSL:
   . Prevent unexpected array entry conversion when reading key. (nielsdos)
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
index f911c833116..1e31c075d6b 100644
--- a/ext/opcache/jit/zend_jit_arm64.dasc
+++ b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -504,7 +504,11 @@ static bool logical_immediate_p(uint64_t value, uint32_t reg_size)
 ||#else
 |	.long 0xd53bd051 // TODO: hard-coded: mrs TMP3, tpidr_el0
 ||	if (tsrm_ls_cache_tcb_offset == 0) {
+||#ifdef __MUSL__
+|		ldr TMP3, [TMP3, #-8]
+||#else
 |		ldr TMP3, [TMP3, #0]
+||#endif
 |		MEM_ACCESS_64_WITH_UOFFSET_64 ldr, TMP3, TMP3, tsrm_tls_index, TMP1
 |		MEM_ACCESS_64_WITH_UOFFSET_64 ldr, reg, TMP3, tsrm_tls_offset, TMP1
 ||	} else {
@@ -2790,6 +2794,20 @@ static int zend_jit_setup(void)
 		/* Index is offset by 1 on FreeBSD (https://github.com/freebsd/freebsd-src/blob/22ca6db50f4e6bd75a141f57cf953d8de6531a06/lib/libc/gen/tls.c#L88) */
 		tsrm_tls_index = (tlsdesc->index + 1) * 8;
 	}
+# elif defined(__MUSL__)
+	if (tsrm_ls_cache_tcb_offset == 0) {
+		size_t **where;
+
+		__asm__(
+			"adrp %0, :tlsdesc:_tsrm_ls_cache\n"
+			"add %0, %0, :tlsdesc_lo12:_tsrm_ls_cache\n"
+			: "=r" (where));
+		/* See https://github.com/ARM-software/abi-aa/blob/2a70c42d62e9c3eb5887fa50b71257f20daca6f9/aaelf64/aaelf64.rst */
+		size_t *tlsdesc = where[1];
+
+		tsrm_tls_offset = tlsdesc[1];
+		tsrm_tls_index = tlsdesc[0] * 8;
+	}
 # else
 	ZEND_ASSERT(tsrm_ls_cache_tcb_offset != 0);
 # endif

From f4ca6d27947917df4ef62c5ef178a1a658d2aa37 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sun, 24 Nov 2024 19:40:23 +0100
Subject: [PATCH 2/2] Fix GH-16902: Set of opcache tests fail zts+aarch64
 (8.4+)

Accompanying IR PR: https://github.com/dstogov/ir/pull/95

Closes GH-16924.
---
 ext/opcache/jit/zend_jit_ir.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
index 6245852c7b8..9a10a23b214 100644
--- a/ext/opcache/jit/zend_jit_ir.c
+++ b/ext/opcache/jit/zend_jit_ir.c
@@ -3233,6 +3233,20 @@ static void zend_jit_setup(void)
 		/* Index is offset by 1 on FreeBSD (https://github.com/freebsd/freebsd-src/blob/22ca6db50f4e6bd75a141f57cf953d8de6531a06/lib/libc/gen/tls.c#L88) */
 		tsrm_tls_index = (tlsdesc->index + 1) * 8;
 	}
+# elif defined(__MUSL__)
+	if (tsrm_ls_cache_tcb_offset == 0) {
+		size_t **where;
+
+		__asm__(
+			"adrp %0, :tlsdesc:_tsrm_ls_cache\n"
+			"add %0, %0, :tlsdesc_lo12:_tsrm_ls_cache\n"
+			: "=r" (where));
+		/* See https://github.com/ARM-software/abi-aa/blob/2a70c42d62e9c3eb5887fa50b71257f20daca6f9/aaelf64/aaelf64.rst */
+		size_t *tlsdesc = where[1];
+
+		tsrm_tls_offset = tlsdesc[1];
+		tsrm_tls_index = tlsdesc[0] * 8;
+	}
 # else
 	ZEND_ASSERT(tsrm_ls_cache_tcb_offset != 0);
 # endif