components/web/php/php-8_3/patches/TSRM.patch

   1 --- php-8.3.13/TSRM/TSRM.h      2024-10-22 20:39:14.000000000 +0200
   2 +++ php-8.3.13/TSRM/TSRM.h.new  2024-10-30 20:44:25.776973719 +0100
   3 @@ -149,7 +149,7 @@
   4  # define __has_attribute(x) 0
   5  #endif
   6
   7 -#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__)
   8 +#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__) || defined(__solaris__)
   9  # define TSRM_TLS_MODEL_ATTR
  10  # define TSRM_TLS_MODEL_DEFAULT
  11  #elif __PIC__
  12 --- php-8.3.14/TSRM/TSRM.c      2024-11-19 16:14:23.000000000 +0100
  13 +++ php-8.3.14/TSRM/TSRM.c.orig 2024-11-24 18:09:53.875421274 +0100
  14 @@ -756,14 +756,14 @@
  15      // TODO: Implement support for fast JIT ZTS code ???
  16         return 0;
  17  #elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
  18 -       !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
  19 +       !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__) && !defined(__solaris__)
  20         size_t ret;
  21
  22         asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
  23            : "=r" (ret));
  24         return ret;
  25  #elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
  26 -       !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
  27 +       !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__) && !defined(__solaris__)
  28         size_t ret;
  29
  30         asm ("leal _tsrm_ls_cache@ntpoff,%0"
  31 --- php-8.3.14/ext/opcache/jit/zend_jit_x86.dasc        2024-11-24 19:30:55.628281141 +0100
  32 +++ php-8.3.14/ext/opcache/jit/zend_jit_x86.dasc.orig   2024-11-24 19:29:19.354837996 +0100
  33 @@ -2896,7 +2896,7 @@
  34  # elif defined(__GNUC__) && defined(__x86_64__)
  35         tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
  36         if (tsrm_ls_cache_tcb_offset == 0) {
  37 -#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
  38 +#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__solaris__)
  39                 size_t ret;
  40
  41                 asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"