summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2021-11-28 13:30:12 +0100
committerØrjan Malde <red@foxi.me>2021-11-28 13:30:12 +0100
commitada48763a18c6c60deee0f30ce38b892eb794445 (patch)
tree8904d7ba055dc588662edb8f90fec3c936acb946
parentad3f0b8c4e093aa00c9ee107a29e946774a13d4e (diff)
downloadmidipix_build-ada48763a18c6c60deee0f30ce38b892eb794445.tar.bz2
midipix_build-ada48763a18c6c60deee0f30ce38b892eb794445.tar.xz
groups/231.native_packages_etc.group: php: bump to v8.1.0
Signed-off-by: Ørjan Malde <red@foxi.me>
Diffstat
-rw-r--r--groups/231.native_packages_etc.group9
-rw-r--r--patches/php-8.0.11.local.patch10
-rw-r--r--patches/php-8.1.0_pre.local.patch (renamed from patches/php-8.0.11_pre.local.patch)657
3 files changed, 534 insertions, 142 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index b2164e83..0afa43f3 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -377,13 +377,14 @@ gl_cv_func_getopt_gnu=yes"};
: ${PKG_PCRE2_URL:=https://ftp.pcre.org/pub/pcre/pcre2-${PKG_PCRE2_VERSION}.tar.bz2};
: ${PKG_PCRE2_CONFIGURE_ARGS_EXTRA:="--enable-pcre2grep-libz --enable-pcre2grep-libbz2 --enable-pcre2-16 --enable-pcre2-32 --enable-jit"};
: ${PKG_PHP_DEPENDS:="bzip2 curl libz libzip libxml2 sqlite3 pcre2 readline libressl onig"};
-: ${PKG_PHP_SHA256SUM:=e3e5f764ae57b31eb65244a45512f0b22d7bef05f2052b23989c053901552e16};
-: ${PKG_PHP_VERSION:=8.0.11};
+: ${PKG_PHP_SHA256SUM:=a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc};
+: ${PKG_PHP_VERSION:=8.1.0};
: ${PKG_PHP_URL:=https://www.php.net/distributions/php-${PKG_PHP_VERSION}.tar.xz};
: ${PKG_PHP_CONFIG_CACHE_EXTRA:="
ac_cv_c_bigendian_php=no
-ac_cv_write_stdout=yes"};
-: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-external-pcre --with-gmp --disable-gd --disable-phar --enable-pdo=static --enable-dom=static --enable-embed=shared --enable-all=shared --without-enchant --without-imap --disable-intl --without-ldap --without-oci8 --without-adabas --disable-pcntl --without-pdo-dblib --without-pdo-firebird --without-pdo-mysql --without-pdo-oci --without-pdo-odbc --without-pdo-pgsql --without-pdo-sqlite --without-pgsql --without-pspell --without-libedit --without-sapdb --without-snmp --without-sodium --without-password-argon2 --without-tidy --without-ffi --without-mysqli --without-unixODBC --without-dbmaker --without-solid --with-pdo-odbc=no --without-ibm-db2 --without-empress --without-empress-bcs --without-iodbc --without-esoob --without-custom-odbc --without-pear --with-bzip2=${PREFIX_NATIVE}"};
+ac_cv_write_stdout=yes
+have_shm_mmap_posix=yes"};
+: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-external-pcre --with-gmp --disable-gd --disable-phar --enable-pdo=static --enable-dom=static --enable-embed=shared --enable-all=shared --without-enchant --without-imap --disable-intl --without-ldap --without-oci8 --without-adabas --disable-pcntl --without-pdo-dblib --without-pdo-firebird --without-pdo-mysql --without-pdo-oci --without-pdo-odbc --without-pdo-pgsql --without-pdo-sqlite --without-pgsql --without-pspell --without-libedit --without-sapdb --without-snmp --without-sodium --without-password-argon2 --without-tidy --without-ffi --without-mysqli --without-unixODBC --without-dbmaker --without-solid --with-pdo-odbc=no --without-ibm-db2 --without-empress --without-empress-bcs --without-iodbc --without-esoob --without-custom-odbc --without-pear --with-bzip2=${PREFIX_NATIVE} --disable-opcache-jit"};
: ${PKG_PHP_ENV_VARS_EXTRA:="HOST_CC=gcc:READLINE_DIR=${PREFIX_NATIVE}/include/readline"};
: ${PKG_PHP_LIBTOOL:=rdlibtool};
: ${PKG_PHP_MAKEFLAGS_BUILD:=-j1};
diff --git a/patches/php-8.0.11.local.patch b/patches/php-8.0.11.local.patch
deleted file mode 100644
index 2c681f1b..00000000
--- a/patches/php-8.0.11.local.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- php-8.0.9/ext/opcache/jit/Makefile.frag.orig 2021-07-29 14:53:58.000000000 +0200
-+++ php-8.0.9/ext/opcache/jit/Makefile.frag 2021-10-04 16:03:01.168550564 +0200
-@@ -1,6 +1,6 @@
-
- $(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c
-- $(CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@
-+ $(HOST_CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@
-
- $(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua
- $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc
diff --git a/patches/php-8.0.11_pre.local.patch b/patches/php-8.1.0_pre.local.patch
index 46a72091..76b7f170 100644
--- a/patches/php-8.0.11_pre.local.patch
+++ b/patches/php-8.1.0_pre.local.patch
@@ -1,20 +1,6 @@
---- php-8.0.11.orig/build/Makefile.global 2021-09-21 19:07:44.000000000 +0200
-+++ php-8.0.11/build/Makefile.global 2021-10-05 16:14:49.660147381 +0200
-@@ -11,9 +11,9 @@
- @echo "Don't forget to run 'make test'."
- @echo
-
--build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
-+build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp.la
-
--build-binaries: $(PHP_BINARIES)
-+build-binaries: $(PHP_BINARIES) libphp.la
-
- libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
- $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-diff -ru php-8.0.11.orig/build/libtool.m4 php-8.0.11/build/libtool.m4
---- php-8.0.11.orig/build/libtool.m4 2021-09-21 19:07:44.000000000 +0200
-+++ php-8.0.11/build/libtool.m4 2021-10-04 18:05:38.598149611 +0200
+diff -Nru php-8.1.0.orig/build/libtool.m4 php-8.1.0/build/libtool.m4
+--- php-8.1.0.orig/build/libtool.m4 2021-11-23 19:56:11.000000000 +0100
++++ php-8.1.0/build/libtool.m4 2021-11-26 11:59:47.795396689 +0100
@@ -56,10 +56,6 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -26,10 +12,25 @@ diff -ru php-8.0.11.orig/build/libtool.m4 php-8.0.11/build/libtool.m4
# Prevent multiple expansion
define([AC_PROG_LIBTOOL], [])
])# _AC_PROG_LIBTOOL
-diff -ru php-8.0.11.orig/configure php-8.0.11/configure
---- php-8.0.11.orig/configure 2021-09-21 19:07:44.000000000 +0200
-+++ php-8.0.11/configure 2021-10-04 17:53:19.523564176 +0200
-@@ -7130,6 +7130,9 @@
+diff -Nru php-8.1.0.orig/build/Makefile.global php-8.1.0/build/Makefile.global
+--- php-8.1.0.orig/build/Makefile.global 2021-11-23 19:56:11.000000000 +0100
++++ php-8.1.0/build/Makefile.global 2021-11-26 11:59:25.139396233 +0100
+@@ -11,9 +11,9 @@
+ @echo "Don't forget to run 'make test'."
+ @echo
+
+-build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
++build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp.la
+
+-build-binaries: $(PHP_BINARIES)
++build-binaries: $(PHP_BINARIES) libphp.la
+
+ libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+ $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+diff -Nru php-8.1.0.orig/configure php-8.1.0/configure
+--- php-8.1.0.orig/configure 2021-11-23 19:56:11.000000000 +0100
++++ php-8.1.0/configure 2021-11-28 11:23:38.328485103 +0100
+@@ -7771,6 +7771,9 @@
*darwin*)
BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
@@ -39,7 +40,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
*)
BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
-@@ -10622,14 +10625,12 @@
+@@ -11403,14 +11406,12 @@
BUILD_PHPDBG="\$(LIBTOOL) --mode=link \
\$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
@@ -55,7 +56,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \
\$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
-@@ -11098,6 +11099,9 @@
+@@ -11636,6 +11637,9 @@
*darwin*)
BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
@@ -65,7 +66,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
*)
BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
-@@ -19089,7 +19093,7 @@
+@@ -21247,7 +21251,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/libxml.$suffix \$(phplibdir)
$ext_builddir/libxml.$suffix: \$(shared_objects_libxml) \$(LIBXML_SHARED_DEPENDENCIES)
@@ -74,7 +75,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -19453,7 +19457,7 @@
+@@ -21624,7 +21628,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/openssl.$suffix \$(phplibdir)
$ext_builddir/openssl.$suffix: \$(shared_objects_openssl) \$(OPENSSL_SHARED_DEPENDENCIES)
@@ -83,7 +84,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -20522,7 +20526,7 @@
+@@ -22705,7 +22709,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/pcre.$suffix \$(phplibdir)
$ext_builddir/pcre.$suffix: \$(shared_objects_pcre) \$(PCRE_SHARED_DEPENDENCIES)
@@ -92,7 +93,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -21900,7 +21904,7 @@
+@@ -24106,7 +24110,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/sqlite3.$suffix \$(phplibdir)
$ext_builddir/sqlite3.$suffix: \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_DEPENDENCIES)
@@ -101,7 +102,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -22435,7 +22439,7 @@
+@@ -24652,7 +24656,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/zlib.$suffix \$(phplibdir)
$ext_builddir/zlib.$suffix: \$(shared_objects_zlib) \$(ZLIB_SHARED_DEPENDENCIES)
@@ -110,7 +111,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -22741,7 +22745,7 @@
+@@ -24969,7 +24973,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
$ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
@@ -119,7 +120,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -23367,7 +23371,7 @@
+@@ -25606,7 +25610,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir)
$ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES)
@@ -128,7 +129,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -23668,7 +23672,7 @@
+@@ -25918,7 +25922,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir)
$ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES)
@@ -137,7 +138,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -23966,7 +23970,7 @@
+@@ -26227,7 +26231,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir)
$ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES)
@@ -146,7 +147,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -25007,7 +25011,7 @@
+@@ -27277,7 +27281,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/curl.$suffix \$(phplibdir)
$ext_builddir/curl.$suffix: \$(shared_objects_curl) \$(CURL_SHARED_DEPENDENCIES)
@@ -155,7 +156,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -29353,7 +29357,7 @@
+@@ -31630,7 +31634,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/dba.$suffix \$(phplibdir)
$ext_builddir/dba.$suffix: \$(shared_objects_dba) \$(DBA_SHARED_DEPENDENCIES)
@@ -164,7 +165,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -29933,7 +29937,7 @@
+@@ -32221,7 +32225,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/dom.$suffix \$(phplibdir)
$ext_builddir/dom.$suffix: \$(shared_objects_dom) \$(DOM_SHARED_DEPENDENCIES)
@@ -173,7 +174,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -31374,7 +31378,7 @@
+@@ -33684,7 +33688,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/exif.$suffix \$(phplibdir)
$ext_builddir/exif.$suffix: \$(shared_objects_exif) \$(EXIF_SHARED_DEPENDENCIES)
@@ -182,7 +183,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -32523,7 +32527,7 @@
+@@ -34870,7 +34874,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/fileinfo.$suffix \$(phplibdir)
$ext_builddir/fileinfo.$suffix: \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_DEPENDENCIES)
@@ -191,7 +192,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -32843,7 +32847,7 @@
+@@ -35202,7 +35206,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/filter.$suffix \$(phplibdir)
$ext_builddir/filter.$suffix: \$(shared_objects_filter) \$(FILTER_SHARED_DEPENDENCIES)
@@ -200,7 +201,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -33206,7 +33210,7 @@
+@@ -35577,7 +35581,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/ftp.$suffix \$(phplibdir)
$ext_builddir/ftp.$suffix: \$(shared_objects_ftp) \$(FTP_SHARED_DEPENDENCIES)
@@ -209,7 +210,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -37934,7 +37938,7 @@
+@@ -40772,7 +40776,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/gettext.$suffix \$(phplibdir)
$ext_builddir/gettext.$suffix: \$(shared_objects_gettext) \$(GETTEXT_SHARED_DEPENDENCIES)
@@ -218,7 +219,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -40548,7 +40552,7 @@
+@@ -43440,7 +43444,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/iconv.$suffix \$(phplibdir)
$ext_builddir/iconv.$suffix: \$(shared_objects_iconv) \$(ICONV_SHARED_DEPENDENCIES)
@@ -227,7 +228,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -46682,7 +46686,7 @@
+@@ -49790,7 +49794,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/mbstring.$suffix \$(phplibdir)
$ext_builddir/mbstring.$suffix: \$(shared_objects_mbstring) \$(MBSTRING_SHARED_DEPENDENCIES)
@@ -236,21 +237,25 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -52043,8 +52047,11 @@
- $as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; }
- if test "$cross_compiling" = yes; then :
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-+$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
+@@ -54970,7 +54974,16 @@
+ printf %s "checking for sysvipc shared memory support... " >&6; }
+ if test "$cross_compiling" = yes
+ then :
+- have_shm_ipc=no
+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: cross-compiling, assuming yes" >&5
-+$as_echo "cross-compiling, assuming yes" >&6; }
-+ have_shm_mmap_posix=yes
-
- else
++ case $host_alias in
++ *midipix*)
++ have_shm_ipc=yes
++ ;;
++ *)
++ have_shm_ipc=no
++ ;;
++ esac
++
+ else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -52502,7 +52509,7 @@
+ /* end confdefs.h. */
+@@ -55846,7 +55859,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/opcache.$suffix \$(phplibdir)
$ext_builddir/opcache.$suffix: \$(shared_objects_opcache) \$(OPCACHE_SHARED_DEPENDENCIES)
@@ -259,7 +264,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -61453,7 +61460,7 @@
+@@ -65092,7 +65105,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir)
$ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES)
@@ -268,7 +273,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -64896,7 +64903,7 @@
+@@ -68635,7 +68648,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir)
$ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES)
@@ -277,7 +282,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -65693,7 +65700,7 @@
+@@ -69464,7 +69477,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir)
$ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES)
@@ -286,7 +291,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -66219,7 +66226,7 @@
+@@ -70001,7 +70014,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir)
$ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES)
@@ -295,7 +300,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -66760,7 +66767,7 @@
+@@ -70553,7 +70566,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir)
$ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES)
@@ -304,7 +309,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -68193,7 +68200,7 @@
+@@ -72343,7 +72356,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir)
$ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES)
@@ -313,7 +318,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -68672,7 +68679,7 @@
+@@ -72854,7 +72867,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir)
$ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES)
@@ -322,7 +327,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -74180,7 +74187,7 @@
+@@ -78714,7 +78727,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir)
$ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES)
@@ -331,7 +336,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -74475,7 +74482,7 @@
+@@ -79020,7 +79033,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir)
$ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES)
@@ -340,7 +345,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -74819,7 +74826,7 @@
+@@ -79377,7 +79390,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir)
$ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES)
@@ -349,7 +354,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -76079,7 +76086,7 @@
+@@ -80659,7 +80672,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir)
$ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES)
@@ -358,7 +363,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -76911,7 +76918,7 @@
+@@ -81503,7 +81516,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir)
$ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES)
@@ -367,7 +372,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -77476,7 +77483,7 @@
+@@ -82079,7 +82092,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir)
$ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES)
@@ -376,7 +381,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -78041,7 +78048,7 @@
+@@ -82655,7 +82668,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir)
$ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES)
@@ -385,7 +390,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -78801,7 +78808,7 @@
+@@ -83426,7 +83439,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir)
$ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES)
@@ -394,7 +399,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -79118,7 +79125,7 @@
+@@ -83754,7 +83767,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/zend_test.$suffix \$(phplibdir)
$ext_builddir/zend_test.$suffix: \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_DEPENDENCIES)
@@ -403,7 +408,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -80639,7 +80646,7 @@
+@@ -85286,7 +85299,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir)
$ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES)
@@ -412,7 +417,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -81463,7 +81470,7 @@
+@@ -86122,7 +86135,7 @@
\$(LIBTOOL) --mode=install cp $ext_builddir/mysqlnd.$suffix \$(phplibdir)
$ext_builddir/mysqlnd.$suffix: \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_DEPENDENCIES)
@@ -421,7 +426,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
EOF
-@@ -81688,7 +81695,7 @@
+@@ -86355,7 +86368,7 @@
enable_static=yes
case $php_sapi_module in
@@ -430,7 +435,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
if test "$PHP_CGI" = "no" && test "$PHP_CLI" = "no" && test "$PHP_FPM" = "no" && test "$PHP_LITESPEED" = "no" && test "$PHP_PHPDBG" = "no"; then
enable_static=no
fi
-@@ -81702,12 +81709,6 @@
+@@ -86369,12 +86382,6 @@
esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
@@ -443,7 +448,42 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
esac
EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
-@@ -85405,7 +85406,7 @@
+@@ -86541,6 +86548,8 @@
+ fiber_os="mac" ;; #(
+ aix*|os400*) :
+ fiber_os="aix" ;; #(
++ midipix*) :
++ fiber_os="midipix" ;; #(
+ *) :
+ fiber_os="other"
+ ;;
+@@ -86572,6 +86581,8 @@
+
+ if test "$fiber_os" = 'mac'; then
+ fiber_asm_file="combined_sysv_macho_gas"
++elif test "$fiber_os" = 'midipix'; then
++ fiber_asm_file="x86_64_ms_pe_gas"
+ elif test "$fiber_os" = 'aix'; then
+ # AIX uses a different calling convention (shared with non-_CALL_ELF Linux).
+ # The AIX assembler isn't GNU, but the file is compatible.
+@@ -86646,8 +86657,14 @@
+ if test "x$ac_cv_header_ucontext_h" = xyes
+ then :
+
+-
+-printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
++ case $host_alias in
++ *midipix*)
++ # not supported
++ ;;
++ *)
++ printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
++ ;;
++ esac
+
+
+ else $as_nop
+@@ -90670,7 +90687,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -452,7 +492,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -87111,6 +87112,17 @@
+@@ -92390,6 +92407,17 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -470,7 +510,7 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -89172,7 +89184,7 @@
+@@ -94461,7 +94489,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -479,47 +519,9 @@ diff -ru php-8.0.11.orig/configure php-8.0.11/configure
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -91441,37 +91453,6 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--
--# Prevent multiple expansion
--
--
--
--
--
--
--
--
--
--
--
--
-- if test -z "$LIBTOOL"; then
-- LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-- else
-- LIBTOOL="$LIBTOOL --silent"
-- fi
--
--
--
-- if test -z "$LIBTOOL"; then
-- LIBTOOL='$(SHELL) $(top_builddir)/libtool --preserve-dup-deps'
-- else
-- LIBTOOL="$LIBTOOL --preserve-dup-deps"
-- fi
--
--
- test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
- test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
- SHARED_LIBTOOL='$(LIBTOOL)'
-diff -ru php-8.0.11.orig/sapi/cgi/Makefile.frag php-8.0.11/sapi/cgi/Makefile.frag
---- php-8.0.11.orig/sapi/cgi/Makefile.frag 2021-09-21 19:07:44.000000000 +0200
-+++ php-8.0.11/sapi/cgi/Makefile.frag 2021-10-04 18:08:26.432047821 +0200
+diff -Nru php-8.1.0.orig/sapi/cgi/Makefile.frag php-8.1.0/sapi/cgi/Makefile.frag
+--- php-8.1.0.orig/sapi/cgi/Makefile.frag 2021-11-23 19:56:11.000000000 +0100
++++ php-8.1.0/sapi/cgi/Makefile.frag 2021-11-26 12:00:32.631397589 +0100
@@ -6,7 +6,7 @@
install-cgi: $(SAPI_CGI_PATH)
@echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
@@ -529,9 +531,9 @@ diff -ru php-8.0.11.orig/sapi/cgi/Makefile.frag php-8.0.11/sapi/cgi/Makefile.fra
@echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
-diff -ru php-8.0.11.orig/sapi/cli/Makefile.frag php-8.0.11/sapi/cli/Makefile.frag
---- php-8.0.11.orig/sapi/cli/Makefile.frag 2021-09-21 19:07:44.000000000 +0200
-+++ php-8.0.11/sapi/cli/Makefile.frag 2021-10-04 18:08:48.275241503 +0200
+diff -Nru php-8.1.0.orig/sapi/cli/Makefile.frag php-8.1.0/sapi/cli/Makefile.frag
+--- php-8.1.0.orig/sapi/cli/Makefile.frag 2021-11-23 19:56:11.000000000 +0100
++++ php-8.1.0/sapi/cli/Makefile.frag 2021-11-26 12:01:05.943398259 +0100
@@ -6,7 +6,7 @@
install-cli: $(SAPI_CLI_PATH)
@echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/"
@@ -541,9 +543,9 @@ diff -ru php-8.0.11.orig/sapi/cli/Makefile.frag php-8.0.11/sapi/cli/Makefile.fra
@echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
-diff -ru php-8.0.11.orig/sapi/phpdbg/Makefile.frag php-8.0.11/sapi/phpdbg/Makefile.frag
---- php-8.0.11.orig/sapi/phpdbg/Makefile.frag 2021-09-21 19:07:44.000000000 +0200
-+++ php-8.0.11/sapi/phpdbg/Makefile.frag 2021-10-04 18:09:12.451241678 +0200
+diff -Nru php-8.1.0.orig/sapi/phpdbg/Makefile.frag php-8.1.0/sapi/phpdbg/Makefile.frag
+--- php-8.1.0.orig/sapi/phpdbg/Makefile.frag 2021-11-23 19:56:11.000000000 +0100
++++ php-8.1.0/sapi/phpdbg/Makefile.frag 2021-11-26 12:01:32.975398802 +0100
@@ -25,7 +25,7 @@
@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
@@ -553,9 +555,9 @@ diff -ru php-8.0.11.orig/sapi/phpdbg/Makefile.frag php-8.0.11/sapi/phpdbg/Makefi
@echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
-diff -ru php-8.0.11.orig/TSRM/TSRM.h php-8.0.11/TSRM/TSRM.h
---- php-8.0.11.orig/TSRM/TSRM.h 2021-09-21 19:07:44.000000000 +0200
-+++ php-8.0.11/TSRM/TSRM.h 2021-10-04 18:06:05.174149803 +0200
+diff -Nru php-8.1.0.orig/TSRM/TSRM.h php-8.1.0/TSRM/TSRM.h
+--- php-8.1.0.orig/TSRM/TSRM.h 2021-11-23 19:56:11.000000000 +0100
++++ php-8.1.0/TSRM/TSRM.h 2021-11-26 12:02:01.263399370 +0100
@@ -147,7 +147,7 @@
# define __has_attribute(x) 0
#endif
@@ -565,3 +567,402 @@ diff -ru php-8.0.11.orig/TSRM/TSRM.h php-8.0.11/TSRM/TSRM.h
# define TSRM_TLS_MODEL_ATTR
#elif __PIC__
# define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))
+diff -Nru php-8.1.0.orig/Zend/asm/jump_x86_64_ms_pe_gas.S php-8.1.0/Zend/asm/jump_x86_64_ms_pe_gas.S
+--- php-8.1.0.orig/Zend/asm/jump_x86_64_ms_pe_gas.S 1970-01-01 01:00:00.000000000 +0100
++++ php-8.1.0/Zend/asm/jump_x86_64_ms_pe_gas.S 2021-11-28 11:43:11.689492139 +0100
+@@ -0,0 +1,213 @@
++/*
++ Copyright Oliver Kowalke 2009.
++ Copyright Thomas Sailer 2013.
++ Distributed under the Boost Software License, Version 1.0.
++ (See accompanying file LICENSE_1_0.txt or copy at
++ http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/*************************************************************************************
++* ---------------------------------------------------------------------------------- *
++* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
++* ---------------------------------------------------------------------------------- *
++* | 0xe40 | 0x44 | 0x48 | 0x4c | 0x50 | 0x54 | 0x58 | 0x5c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x60 | 0x64 | 0x68 | 0x6c | 0x70 | 0x74 | 0x78 | 0x7c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 32 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x80 | 0x84 | 0x88 | 0x8c | 0x90 | 0x94 | 0x98 | 0x9c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | *
++* ---------------------------------------------------------------------------------- *
++* | 0xa0 | 0xa4 | 0xa8 | 0xac | 0xb0 | 0xb4 | 0xb8 | 0xbc | *
++* ---------------------------------------------------------------------------------- *
++* | fc_mxcsr|fc_x87_cw| <alignment> | fbr_strg | fc_dealloc | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | *
++* ---------------------------------------------------------------------------------- *
++* | 0xc0 | 0xc4 | 0xc8 | 0xcc | 0xd0 | 0xd4 | 0xd8 | 0xdc | *
++* ---------------------------------------------------------------------------------- *
++* | limit | base | R12 | R13 | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | *
++* ---------------------------------------------------------------------------------- *
++* | 0xe0 | 0xe4 | 0xe8 | 0xec | 0xf0 | 0xf4 | 0xf8 | 0xfc | *
++* ---------------------------------------------------------------------------------- *
++* | R14 | R15 | RDI | RSI | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x100 | 0x104 | 0x108 | 0x10c | 0x110 | 0x114 | 0x118 | 0x11c | *
++* ---------------------------------------------------------------------------------- *
++* | RBX | RBP | hidden | RIP | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x120 | 0x124 | 0x128 | 0x12c | 0x130 | 0x134 | 0x138 | 0x13c | *
++* ---------------------------------------------------------------------------------- *
++* | parameter area | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x140 | 0x144 | 0x148 | 0x14c | 0x150 | 0x154 | 0x158 | 0x15c | *
++* ---------------------------------------------------------------------------------- *
++* | FCTX | DATA | | *
++* ---------------------------------------------------------------------------------- *
++**************************************************************************************/
++
++.file "jump_x86_64_ms_pe_gas.asm"
++.text
++.p2align 4,,15
++.def jump_fcontext; .scl 2; .type 32; .endef
++.seh_proc jump_fcontext
++jump_fcontext:
++.seh_endprologue
++
++ leaq -0x118(%rsp), %rsp /* prepare stack */
++
++#if !defined(BOOST_USE_TSX)
++ /* save XMM storage */
++ movaps %xmm6, 0x0(%rsp)
++ movaps %xmm7, 0x10(%rsp)
++ movaps %xmm8, 0x20(%rsp)
++ movaps %xmm9, 0x30(%rsp)
++ movaps %xmm10, 0x40(%rsp)
++ movaps %xmm11, 0x50(%rsp)
++ movaps %xmm12, 0x60(%rsp)
++ movaps %xmm13, 0x70(%rsp)
++ movaps %xmm14, 0x80(%rsp)
++ movaps %xmm15, 0x90(%rsp)
++ stmxcsr 0xa0(%rsp) /* save MMX control- and status-word */
++ fnstcw 0xa4(%rsp) /* save x87 control-word */
++#endif
++
++ /* load NT_TIB */
++ movq %gs:(0x30), %r10
++ /* save fiber local storage */
++ movq 0x20(%r10), %rax
++ movq %rax, 0xb0(%rsp)
++ /* save current deallocation stack */
++ movq 0x1478(%r10), %rax
++ movq %rax, 0xb8(%rsp)
++ /* save current stack limit */
++ movq 0x10(%r10), %rax
++ movq %rax, 0xc0(%rsp)
++ /* save current stack base */
++ movq 0x08(%r10), %rax
++ movq %rax, 0xc8(%rsp)
++
++ movq %r12, 0xd0(%rsp) /* save R12 */
++ movq %r13, 0xd8(%rsp) /* save R13 */
++ movq %r14, 0xe0(%rsp) /* save R14 */
++ movq %r15, 0xe8(%rsp) /* save R15 */
++ movq %rdi, 0xf0(%rsp) /* save RDI */
++ movq %rsi, 0xf8(%rsp) /* save RSI */
++ movq %rbx, 0x100(%rsp) /* save RBX */
++ movq %rbp, 0x108(%rsp) /* save RBP */
++
++ movq %rcx, 0x110(%rsp) /* save hidden address of transport_t */
++
++ /* preserve RSP (pointing to context-data) in R9 */
++ movq %rsp, %r9
++
++ /* restore RSP (pointing to context-data) from RDX */
++ movq %rdx, %rsp
++
++#if !defined(BOOST_USE_TSX)
++ /* restore XMM storage */
++ movaps 0x0(%rsp), %xmm6
++ movaps 0x10(%rsp), %xmm7
++ movaps 0x20(%rsp), %xmm8
++ movaps 0x30(%rsp), %xmm9
++ movaps 0x40(%rsp), %xmm10
++ movaps 0x50(%rsp), %xmm11
++ movaps 0x60(%rsp), %xmm12
++ movaps 0x70(%rsp), %xmm13
++ movaps 0x80(%rsp), %xmm14
++ movaps 0x90(%rsp), %xmm15
++ ldmxcsr 0xa0(%rsp) /* restore MMX control- and status-word */
++ fldcw 0xa4(%rsp) /* restore x87 control-word */
++#endif
++
++ /* load NT_TIB */
++ movq %gs:(0x30), %r10
++ /* restore fiber local storage */
++ movq 0xb0(%rsp), %rax
++ movq %rax, 0x20(%r10)
++ /* restore current deallocation stack */
++ movq 0xb8(%rsp), %rax
++ movq %rax, 0x1478(%r10)
++ /* restore current stack limit */
++ movq 0xc0(%rsp), %rax
++ movq %rax, 0x10(%r10)
++ /* restore current stack base */
++ movq 0xc8(%rsp), %rax
++ movq %rax, 0x08(%r10)
++
++ movq 0xd0(%rsp), %r12 /* restore R12 */
++ movq 0xd8(%rsp), %r13 /* restore R13 */
++ movq 0xe0(%rsp), %r14 /* restore R14 */
++ movq 0xe8(%rsp), %r15 /* restore R15 */
++ movq 0xf0(%rsp), %rdi /* restore RDI */
++ movq 0xf8(%rsp), %rsi /* restore RSI */
++ movq 0x100(%rsp), %rbx /* restore RBX */
++ movq 0x108(%rsp), %rbp /* restore RBP */
++
++ movq 0x110(%rsp), %rax /* restore hidden address of transport_t */
++
++ leaq 0x118(%rsp), %rsp /* prepare stack */
++
++ /* restore return-address */
++ popq %r10
++
++ /* transport_t returned in RAX */
++ /* return parent fcontext_t */
++ movq %r9, 0x0(%rax)
++ /* return data */
++ movq %r8, 0x8(%rax)
++
++ /* transport_t as 1.arg of context-function */
++ movq %rax, %rcx
++
++ /* indirect jump to context */
++ jmp *%r10
++.seh_endproc
++
++#ifdef __midipix__
++ .section .got$jump_fcontext,"r"
++ .global __imp_jump_fcontext
++__imp_jump_fcontext:
++ .quad jump_fcontext
++ .linkonce discard
++#endif
+diff -Nru php-8.1.0.orig/Zend/asm/make_x86_64_ms_pe_gas.S php-8.1.0/Zend/asm/make_x86_64_ms_pe_gas.S
+--- php-8.1.0.orig/Zend/asm/make_x86_64_ms_pe_gas.S 1970-01-01 01:00:00.000000000 +0100
++++ php-8.1.0/Zend/asm/make_x86_64_ms_pe_gas.S 2021-11-28 11:44:29.385178672 +0100
+@@ -0,0 +1,178 @@
++/*
++ Copyright Oliver Kowalke 2009.
++ Copyright Thomas Sailer 2013.
++ Distributed under the Boost Software License, Version 1.0.
++ (See accompanying file LICENSE_1_0.txt or copy at
++ http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/*************************************************************************************
++* ---------------------------------------------------------------------------------- *
++* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
++* ---------------------------------------------------------------------------------- *
++* | 0xe40 | 0x44 | 0x48 | 0x4c | 0x50 | 0x54 | 0x58 | 0x5c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x60 | 0x64 | 0x68 | 0x6c | 0x70 | 0x74 | 0x78 | 0x7c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 32 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x80 | 0x84 | 0x88 | 0x8c | 0x90 | 0x94 | 0x98 | 0x9c | *
++* ---------------------------------------------------------------------------------- *
++* | SEE registers (XMM6-XMM15) | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | *
++* ---------------------------------------------------------------------------------- *
++* | 0xa0 | 0xa4 | 0xa8 | 0xac | 0xb0 | 0xb4 | 0xb8 | 0xbc | *
++* ---------------------------------------------------------------------------------- *
++* | fc_mxcsr|fc_x87_cw| <alignment> | fbr_strg | fc_dealloc | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | *
++* ---------------------------------------------------------------------------------- *
++* | 0xc0 | 0xc4 | 0xc8 | 0xcc | 0xd0 | 0xd4 | 0xd8 | 0xdc | *
++* ---------------------------------------------------------------------------------- *
++* | limit | base | R12 | R13 | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | *
++* ---------------------------------------------------------------------------------- *
++* | 0xe0 | 0xe4 | 0xe8 | 0xec | 0xf0 | 0xf4 | 0xf8 | 0xfc | *
++* ---------------------------------------------------------------------------------- *
++* | R14 | R15 | RDI | RSI | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x100 | 0x104 | 0x108 | 0x10c | 0x110 | 0x114 | 0x118 | 0x11c | *
++* ---------------------------------------------------------------------------------- *
++* | RBX | RBP | hidden | RIP | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x120 | 0x124 | 0x128 | 0x12c | 0x130 | 0x134 | 0x138 | 0x13c | *
++* ---------------------------------------------------------------------------------- *
++* | parameter area | *
++* ---------------------------------------------------------------------------------- *
++* ---------------------------------------------------------------------------------- *
++* | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | *
++* ---------------------------------------------------------------------------------- *
++* | 0x140 | 0x144 | 0x148 | 0x14c | 0x150 | 0x154 | 0x158 | 0x15c | *
++* ---------------------------------------------------------------------------------- *
++* | FCTX | DATA | | *
++* ---------------------------------------------------------------------------------- *
++**************************************************************************************/
++
++.file "make_x86_64_ms_pe_gas.asm"
++.text
++.p2align 4,,15
++.def make_fcontext; .scl 2; .type 32; .endef
++.seh_proc make_fcontext
++make_fcontext:
++.seh_endprologue
++
++ /* first arg of make_fcontext() == top of context-stack */
++ movq %rcx, %rax
++
++ /* shift address in RAX to lower 16 byte boundary */
++ /* == pointer to fcontext_t and address of context stack */
++ andq $-16, %rax
++
++ /* reserve space for context-data on context-stack */
++ /* on context-function entry: (RSP -0x8) % 16 == 0 */
++ leaq -0x150(%rax), %rax
++
++ /* third arg of make_fcontext() == address of context-function */
++ movq %r8, 0x100(%rax)
++
++ /* first arg of make_fcontext() == top of context-stack */
++ /* save top address of context stack as 'base' */
++ movq %rcx, 0xc8(%rax)
++ /* second arg of make_fcontext() == size of context-stack */
++ /* negate stack size for LEA instruction (== substraction) */
++ negq %rdx
++ /* compute bottom address of context stack (limit) */
++ leaq (%rcx,%rdx), %rcx
++ /* save bottom address of context stack as 'limit' */
++ movq %rcx, 0xc0(%rax)
++ /* save address of context stack limit as 'dealloction stack' */
++ movq %rcx, 0xb8(%rax)
++ /* set fiber-storage to zero */
++ xorq %rcx, %rcx
++ movq %rcx, 0xb0(%rax)
++
++ /* save MMX control- and status-word */
++ stmxcsr 0xa0(%rax)
++ /* save x87 control-word */
++ fnstcw 0xa4(%rax)
++
++ /* compute address of transport_t */
++ leaq 0x140(%rax), %rcx
++ /* store address of transport_t in hidden field */
++ movq %rcx, 0x110(%rax)
++
++ /* compute abs address of label trampoline */
++ leaq trampoline(%rip), %rcx
++ /* save address of finish as return-address for context-function */
++ /* will be entered after jump_fcontext() first time */
++ movq %rcx, 0x118(%rax)
++
++ /* compute abs address of label finish */
++ leaq finish(%rip), %rcx
++ /* save address of finish as return-address for context-function */
++ /* will be entered after context-function returns */
++ movq %rcx, 0x108(%rax)
++
++ ret /* return pointer to context-data */
++
++trampoline:
++ /* store return address on stack */
++ /* fix stack alignment */
++ pushq %rbp
++ /* jump to context-function */
++ jmp *%rbx
++
++finish:
++ /* 32byte shadow-space for _exit() */
++ andq $-32, %rsp
++ /* 32byte shadow-space for _exit() are */
++ /* already reserved by make_fcontext() */
++ /* exit code is zero */
++ xorq %rcx, %rcx
++ /* exit application */
++ call _exit
++ hlt
++.seh_endproc
++
++.def _exit; .scl 2; .type 32; .endef /* standard C library function */
++
++#ifdef __midipix__
++ .section .got$make_fcontext,"r"
++ .global __imp_make_fcontext
++__imp_make_fcontext:
++ .quad make_fcontext
++ .linkonce discard
++#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 21:44:05 +0000