head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.12
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.10
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.8
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.6
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.4
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.2
	pkgsrc-2024Q4-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2024.11.10.22.09.50;	author prlw1;	state Exp;
branches;
next	;
commitid	inKInzK1sZOci9xF;


desc
@@


1.1
log
@php83

Backport of

https://github.com/php/php-src/commit/2d6bd1644d104fe934a5117d232d3f50ffe9ff28

to fix

Cannot load lib/httpd/mod_php8.so into server: /usr/pkg/lib/httpd/mod_php8.so:
No space available for static Thread Local Storage

PR pkg/56717
@
text
@$NetBSD$

Backport of

https://github.com/php/php-src/commit/2d6bd1644d104fe934a5117d232d3f50ffe9ff28

to fix

Cannot load lib/httpd/mod_php8.so into server: /usr/pkg/lib/httpd/mod_php8.so:
No space available for static Thread Local Storage

PR pkg/56717

--- ext/opcache/jit/zend_jit_x86.dasc.orig	2024-10-22 18:39:14.000000000 +0000
+++ ext/opcache/jit/zend_jit_x86.dasc
@@@@ -2896,7 +2896,7 @@@@ static int zend_jit_setup(void)
 # elif defined(__GNUC__) && defined(__x86_64__)
 	tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
 	if (tsrm_ls_cache_tcb_offset == 0) {
-#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
+#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
 		size_t ret;
 
 		asm ("movq _tsrm_ls_cache@@gottpoff(%%rip),%0"
@@@@ -2932,7 +2932,7 @@@@ static int zend_jit_setup(void)
 # elif defined(__GNUC__) && defined(__i386__)
 	tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
 	if (tsrm_ls_cache_tcb_offset == 0) {
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
 		size_t ret;
 
 		asm ("leal _tsrm_ls_cache@@ntpoff,%0\n"
@