Blame patches/php-8.1.2_pre.local.patch

ada487
diff -Nru php-8.1.0.orig/build/libtool.m4 php-8.1.0/build/libtool.m4
ada487
--- php-8.1.0.orig/build/libtool.m4	2021-11-23 19:56:11.000000000 +0100
ada487
+++ php-8.1.0/build/libtool.m4	2021-11-26 11:59:47.795396689 +0100
673e24
@@ -56,10 +56,6 @@
673e24
 # This can be used to rebuild libtool when needed
673e24
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
013bf2
 
673e24
-# Always use our own libtool.
673e24
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
673e24
-AC_SUBST(LIBTOOL)dnl
673e24
-
673e24
 # Prevent multiple expansion
673e24
 define([AC_PROG_LIBTOOL], [])
673e24
 ])# _AC_PROG_LIBTOOL
ada487
diff -Nru php-8.1.0.orig/build/Makefile.global php-8.1.0/build/Makefile.global
ada487
--- php-8.1.0.orig/build/Makefile.global	2021-11-23 19:56:11.000000000 +0100
ada487
+++ php-8.1.0/build/Makefile.global	2021-11-26 11:59:25.139396233 +0100
ada487
@@ -11,9 +11,9 @@
ada487
 	@echo "Don't forget to run 'make test'."
ada487
 	@echo
ada487
 
ada487
-build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
ada487
+build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp.la
ada487
 
ada487
-build-binaries: $(PHP_BINARIES)
ada487
+build-binaries: $(PHP_BINARIES) libphp.la
ada487
 
ada487
 libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
ada487
 	$(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 $@
ada487
diff -Nru php-8.1.0.orig/configure php-8.1.0/configure
ada487
--- php-8.1.0.orig/configure	2021-11-23 19:56:11.000000000 +0100
ada487
+++ php-8.1.0/configure	2021-11-28 11:23:38.328485103 +0100
ada487
@@ -7771,6 +7771,9 @@
f4e59e
   *darwin*)
f4e59e
     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)"
f4e59e
     ;;
f4e59e
+  *midipix*)
013bf2
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH) \$(top_builddir)/libs/libphp.so"
f4e59e
+    ;;
f4e59e
   *)
f4e59e
     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)"
f4e59e
     ;;
ada487
@@ -11403,14 +11406,12 @@
013bf2
 
f4e59e
   BUILD_PHPDBG="\$(LIBTOOL) --mode=link \
f4e59e
         \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
f4e59e
-                \$(PHP_GLOBAL_OBJS:.lo=.o) \
f4e59e
-                \$(PHP_BINARY_OBJS:.lo=.o) \
f4e59e
                 \$(PHP_PHPDBG_OBJS:.lo=.o) \
f4e59e
                 \$(EXTRA_LIBS) \
f4e59e
                 \$(PHPDBG_EXTRA_LIBS) \
f4e59e
                 \$(ZEND_EXTRA_LIBS) \
f4e59e
                 \$(PHP_FRAMEWORKS) \
f4e59e
-         -o \$(BUILD_BINARY)"
013bf2
+         -o \$(BUILD_BINARY) \$(top_builddir)/libs/libphp.so"
013bf2
 
f4e59e
   BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \
f4e59e
         \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
ada487
@@ -11636,6 +11637,9 @@
f4e59e
       *darwin*)
f4e59e
         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)"
f4e59e
       ;;
f4e59e
+      *midipix*)
013bf2
+        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH) \$(top_builddir)/libs/libphp.so"
f4e59e
+      ;;
f4e59e
       *)
f4e59e
         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)"
f4e59e
       ;;
ada487
@@ -21247,7 +21251,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/libxml.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/libxml.$suffix: \$(shared_objects_libxml) \$(LIBXML_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_libxml) \$(LIBXML_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_libxml) \$(LIBXML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -21624,7 +21628,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/openssl.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/openssl.$suffix: \$(shared_objects_openssl) \$(OPENSSL_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_openssl) \$(OPENSSL_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_openssl) \$(OPENSSL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -22705,7 +22709,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/pcre.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/pcre.$suffix: \$(shared_objects_pcre) \$(PCRE_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_pcre) \$(PCRE_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_pcre) \$(PCRE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -24106,7 +24110,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sqlite3.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sqlite3.$suffix: \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -24652,7 +24656,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/zlib.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/zlib.$suffix: \$(shared_objects_zlib) \$(ZLIB_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zlib) \$(ZLIB_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zlib) \$(ZLIB_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -24969,7 +24973,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bcmath) \$(BCMATH_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bcmath) \$(BCMATH_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -25606,7 +25610,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bz2) \$(BZ2_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bz2) \$(BZ2_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -25918,7 +25922,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_calendar) \$(CALENDAR_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_calendar) \$(CALENDAR_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -26227,7 +26231,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ctype) \$(CTYPE_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ctype) \$(CTYPE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -27277,7 +27281,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/curl.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/curl.$suffix: \$(shared_objects_curl) \$(CURL_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_curl) \$(CURL_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_curl) \$(CURL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -31630,7 +31634,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/dba.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/dba.$suffix: \$(shared_objects_dba) \$(DBA_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dba) \$(DBA_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dba) \$(DBA_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -32221,7 +32225,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/dom.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/dom.$suffix: \$(shared_objects_dom) \$(DOM_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dom) \$(DOM_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dom) \$(DOM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -33684,7 +33688,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/exif.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/exif.$suffix: \$(shared_objects_exif) \$(EXIF_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_exif) \$(EXIF_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_exif) \$(EXIF_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -34870,7 +34874,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/fileinfo.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/fileinfo.$suffix: \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -35202,7 +35206,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/filter.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/filter.$suffix: \$(shared_objects_filter) \$(FILTER_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_filter) \$(FILTER_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_filter) \$(FILTER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -35577,7 +35581,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/ftp.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/ftp.$suffix: \$(shared_objects_ftp) \$(FTP_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ftp) \$(FTP_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ftp) \$(FTP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -40772,7 +40776,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/gettext.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/gettext.$suffix: \$(shared_objects_gettext) \$(GETTEXT_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_gettext) \$(GETTEXT_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_gettext) \$(GETTEXT_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -43440,7 +43444,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/iconv.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/iconv.$suffix: \$(shared_objects_iconv) \$(ICONV_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD)
dd9100
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-liconv
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -49790,7 +49794,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/mbstring.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/mbstring.$suffix: \$(shared_objects_mbstring) \$(MBSTRING_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mbstring) \$(MBSTRING_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mbstring) \$(MBSTRING_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -54970,7 +54974,16 @@
ada487
 printf %s "checking for sysvipc shared memory support... " >&6; }
ada487
   if test "$cross_compiling" = yes
ada487
 then :
ada487
-  have_shm_ipc=no
673e24
+
ada487
+  case $host_alias in
ada487
+    *midipix*)
ada487
+      have_shm_ipc=yes
ada487
+      ;;
ada487
+    *)
ada487
+      have_shm_ipc=no
ada487
+      ;;
ada487
+  esac
ada487
+
ada487
 else $as_nop
673e24
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ada487
 /* end confdefs.h.  */
ada487
@@ -55846,7 +55859,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/opcache.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/opcache.$suffix: \$(shared_objects_opcache) \$(OPCACHE_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_opcache) \$(OPCACHE_SHARED_LIBADD)
1fbede
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_opcache) \$(OPCACHE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -65092,7 +65105,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_posix) \$(POSIX_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_posix) \$(POSIX_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -68635,7 +68648,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_readline) \$(READLINE_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_readline) \$(READLINE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -69464,7 +69477,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_session) \$(SESSION_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_session) \$(SESSION_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -70001,7 +70014,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_shmop) \$(SHMOP_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_shmop) \$(SHMOP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -70553,7 +70566,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -72343,7 +72356,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_soap) \$(SOAP_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_soap) \$(SOAP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -72854,7 +72867,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sockets) \$(SOCKETS_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sockets) \$(SOCKETS_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -78714,7 +78727,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -79020,7 +79033,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -79377,7 +79390,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -80659,7 +80672,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -81503,7 +81516,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xml) \$(XML_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xml) \$(XML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -82079,7 +82092,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -82655,7 +82668,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -83426,7 +83439,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -83754,7 +83767,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/zend_test.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/zend_test.$suffix: \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -85286,7 +85299,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zip) \$(ZIP_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zip) \$(ZIP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -86122,7 +86135,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/mysqlnd.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/mysqlnd.$suffix: \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lcrypto \-lz
013bf2
 
013bf2
 EOF
013bf2
 
ada487
@@ -86355,7 +86368,7 @@
673e24
 enable_static=yes
013bf2
 
673e24
 case $php_sapi_module in
673e24
-  shared)
673e24
+  *)
673e24
     if test "$PHP_CGI" = "no" && test "$PHP_CLI" = "no" && test "$PHP_FPM" = "no" && test "$PHP_LITESPEED" = "no" && test "$PHP_PHPDBG" = "no"; then
673e24
       enable_static=no
673e24
     fi
ada487
@@ -86369,12 +86382,6 @@
673e24
     esac
673e24
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
673e24
     ;;
673e24
-  *)
673e24
-    standard_libtool_flag='-prefer-non-pic -static'
673e24
-    if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
673e24
-      enable_shared=no
673e24
-    fi
673e24
-    ;;
673e24
 esac
013bf2
 
673e24
 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
ada487
@@ -86541,6 +86548,8 @@
ada487
     fiber_os="mac" ;; #(
ada487
   aix*|os400*) :
ada487
     fiber_os="aix" ;; #(
ada487
+  midipix*) :
ada487
+    fiber_os="midipix" ;; #(
ada487
   *) :
ada487
     fiber_os="other"
ada487
  ;;
ada487
@@ -86572,6 +86581,8 @@
ada487
 
ada487
 if test "$fiber_os" = 'mac'; then
ada487
   fiber_asm_file="combined_sysv_macho_gas"
ada487
+elif test "$fiber_os" = 'midipix'; then
ada487
+  fiber_asm_file="x86_64_ms_pe_gas"
ada487
 elif test "$fiber_os" = 'aix'; then
ada487
   # AIX uses a different calling convention (shared with non-_CALL_ELF Linux).
ada487
   # The AIX assembler isn't GNU, but the file is compatible.
ada487
@@ -86646,8 +86657,14 @@
ada487
 if test "x$ac_cv_header_ucontext_h" = xyes
ada487
 then :
ada487
 
ada487
-
ada487
-printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
ada487
+  case $host_alias in
ada487
+    *midipix*)
ada487
+      # not supported
ada487
+      ;;
ada487
+    *)
ada487
+      printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
ada487
+      ;;
ada487
+  esac
ada487
 
ada487
 
ada487
 else $as_nop
ada487
@@ -90670,7 +90687,7 @@
673e24
       lt_prog_compiler_static='-Bstatic'
673e24
       ;;
013bf2
 
673e24
-    linux* | k*bsd*-gnu)
673e24
+    linux* | k*bsd*-gnu | midipix*)
673e24
       case $cc_basename in
673e24
       # old Intel for x86_64 which still supported -KPIC.
673e24
       ecc*)
ada487
@@ -92390,6 +92407,17 @@
673e24
   dynamic_linker='GNU/Linux ld.so'
673e24
   ;;
673e24
 
673e24
+midipix*)
673e24
+  version_type=linux # correct to gnu/linux during the next big refactor
673e24
+  need_lib_prefix=no
673e24
+  need_version=no
673e24
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
673e24
+  soname_spec='$libname$release$shared_ext$major'
673e24
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
673e24
+  shlibpath_var=LD_LIBRARY_PATH
673e24
+  dynamic_linker='GNU/Linux ld.so'
673e24
+  ;;
673e24
+
673e24
 netbsd*)
673e24
   version_type=sunos
673e24
   need_lib_prefix=no
ada487
@@ -94461,7 +94489,7 @@
673e24
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
673e24
     hardcode_libdir_separator_CXX=:
673e24
     ;;
673e24
-  linux* | k*bsd*-gnu)
673e24
+  linux* | k*bsd*-gnu | midipix*)
673e24
     case $cc_basename in
673e24
       KCC*)
013bf2
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
ada487
diff -Nru php-8.1.0.orig/sapi/cgi/Makefile.frag php-8.1.0/sapi/cgi/Makefile.frag
ada487
--- php-8.1.0.orig/sapi/cgi/Makefile.frag	2021-11-23 19:56:11.000000000 +0100
ada487
+++ php-8.1.0/sapi/cgi/Makefile.frag	2021-11-26 12:00:32.631397589 +0100
673e24
@@ -6,7 +6,7 @@
673e24
 install-cgi: $(SAPI_CGI_PATH)
673e24
 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
673e24
-	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
673e24
+	@$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
673e24
 	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
673e24
 	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
ada487
diff -Nru php-8.1.0.orig/sapi/cli/Makefile.frag php-8.1.0/sapi/cli/Makefile.frag
ada487
--- php-8.1.0.orig/sapi/cli/Makefile.frag	2021-11-23 19:56:11.000000000 +0100
ada487
+++ php-8.1.0/sapi/cli/Makefile.frag	2021-11-26 12:01:05.943398259 +0100
673e24
@@ -6,7 +6,7 @@
673e24
 install-cli: $(SAPI_CLI_PATH)
673e24
 	@echo "Installing PHP CLI binary:        $(INSTALL_ROOT)$(bindir)/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
673e24
-	@$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
673e24
+	@$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
673e24
 	@echo "Installing PHP CLI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
673e24
 	@$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
ada487
diff -Nru php-8.1.0.orig/sapi/phpdbg/Makefile.frag php-8.1.0/sapi/phpdbg/Makefile.frag
ada487
--- php-8.1.0.orig/sapi/phpdbg/Makefile.frag	2021-11-23 19:56:11.000000000 +0100
ada487
+++ php-8.1.0/sapi/phpdbg/Makefile.frag	2021-11-26 12:01:32.975398802 +0100
673e24
@@ -25,7 +25,7 @@
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
673e24
-	@$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
673e24
+	@$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
673e24
 	@echo "Installing phpdbg man page:       $(INSTALL_ROOT)$(mandir)/man1/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
673e24
 	@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
ada487
diff -Nru php-8.1.0.orig/TSRM/TSRM.h php-8.1.0/TSRM/TSRM.h
ada487
--- php-8.1.0.orig/TSRM/TSRM.h	2021-11-23 19:56:11.000000000 +0100
ada487
+++ php-8.1.0/TSRM/TSRM.h	2021-11-26 12:02:01.263399370 +0100
013bf2
@@ -147,7 +147,7 @@
013bf2
 # define __has_attribute(x) 0
013bf2
 #endif
013bf2
 
013bf2
-#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__)
013bf2
+#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__midipix__)
013bf2
 # define TSRM_TLS_MODEL_ATTR
013bf2
 #elif __PIC__
013bf2
 # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))
ada487
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
ada487
--- php-8.1.0.orig/Zend/asm/jump_x86_64_ms_pe_gas.S	1970-01-01 01:00:00.000000000 +0100
ada487
+++ php-8.1.0/Zend/asm/jump_x86_64_ms_pe_gas.S	2021-11-28 11:43:11.689492139 +0100
ada487
@@ -0,0 +1,213 @@
ada487
+/*
ada487
+            Copyright Oliver Kowalke 2009.
ada487
+            Copyright Thomas Sailer 2013.
ada487
+   Distributed under the Boost Software License, Version 1.0.
ada487
+      (See accompanying file LICENSE_1_0.txt or copy at
ada487
+            http://www.boost.org/LICENSE_1_0.txt)
ada487
+*/
ada487
+
ada487
+/*************************************************************************************
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |     0   |     1   |     2    |     3   |     4   |     5   |     6   |     7   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    0x0  |    0x4  |    0x8   |    0xc  |   0x10  |   0x14  |   0x18  |   0x1c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |     8   |    9    |    10    |    11   |    12   |    13   |    14   |    15   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0x20  |  0x24   |   0x28   |   0x2c  |   0x30  |   0x34  |   0x38  |   0x3c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    16   |    17   |    18   |    19    |    20   |    21   |    22   |    23   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0xe40  |   0x44 |   0x48  |   0x4c   |   0x50  |   0x54  |   0x58  |   0x5c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    24   |   25    |    26    |   27    |    28   |    29   |    30   |    31   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0x60  |   0x64  |   0x68   |   0x6c  |   0x70  |   0x74  |   0x78  |   0x7c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    32   |   32    |    33    |   34    |    35   |    36   |    37   |    38   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0x80  |   0x84  |   0x88   |   0x8c  |   0x90  |   0x94  |   0x98  |   0x9c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    39   |   40    |    41    |   42    |    43   |    44   |    45   |    46   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0xa0  |   0xa4  |   0xa8   |   0xac  |   0xb0  |   0xb4  |   0xb8  |   0xbc  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* | fc_mxcsr|fc_x87_cw|     <alignment>    |       fbr_strg    |      fc_dealloc   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    47   |   48    |    49    |   50    |    51   |    52   |    53   |    54   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0xc0  |   0xc4  |   0xc8   |   0xcc  |   0xd0  |   0xd4  |   0xd8  |   0xdc  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |        limit      |         base       |         R12       |         R13       | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    55   |   56    |    57    |   58    |    59   |    60   |    61   |    62   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0xe0  |   0xe4  |   0xe8   |   0xec  |   0xf0  |   0xf4  |   0xf8  |   0xfc  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |        R14        |         R15        |         RDI       |        RSI        | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    63   |   64    |    65    |   66    |    67   |    68   |    69   |    70   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |  0x100  |  0x104  |  0x108   |  0x10c  |  0x110  |  0x114  |  0x118  |  0x11c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |        RBX        |         RBP        |       hidden      |        RIP        | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    71   |   72    |    73    |   74    |    75   |    76   |    77   |    78   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |  0x120  |  0x124  |  0x128   |  0x12c  |  0x130  |  0x134  |  0x138  |  0x13c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                                   parameter area                               | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    79   |   80    |    81    |   82    |    83   |    84   |    85   |    86   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |  0x140  |  0x144  |  0x148   |  0x14c  |  0x150  |  0x154  |  0x158  |  0x15c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |       FCTX        |        DATA        |                                       | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+**************************************************************************************/
ada487
+
ada487
+.file	"jump_x86_64_ms_pe_gas.asm"
ada487
+.text
ada487
+.p2align 4,,15
ada487
+.def	jump_fcontext;	.scl	2;	.type	32;	.endef
ada487
+.seh_proc	jump_fcontext
ada487
+jump_fcontext:
ada487
+.seh_endprologue
ada487
+
ada487
+    leaq  -0x118(%rsp), %rsp /* prepare stack */
ada487
+
ada487
+#if !defined(BOOST_USE_TSX)
ada487
+    /* save XMM storage */
ada487
+    movaps  %xmm6, 0x0(%rsp)
ada487
+    movaps  %xmm7, 0x10(%rsp)
ada487
+    movaps  %xmm8, 0x20(%rsp)
ada487
+    movaps  %xmm9, 0x30(%rsp)
ada487
+    movaps  %xmm10, 0x40(%rsp)
ada487
+    movaps  %xmm11, 0x50(%rsp)
ada487
+    movaps  %xmm12, 0x60(%rsp)
ada487
+    movaps  %xmm13, 0x70(%rsp)
ada487
+    movaps  %xmm14, 0x80(%rsp)
ada487
+    movaps  %xmm15, 0x90(%rsp)
ada487
+    stmxcsr  0xa0(%rsp)  /* save MMX control- and status-word */
ada487
+    fnstcw   0xa4(%rsp)  /* save x87 control-word */
ada487
+#endif
ada487
+
ada487
+    /* load NT_TIB */
ada487
+    movq  %gs:(0x30), %r10
ada487
+    /* save fiber local storage */
ada487
+    movq  0x20(%r10), %rax
ada487
+    movq  %rax, 0xb0(%rsp)
ada487
+    /* save current deallocation stack */
ada487
+    movq  0x1478(%r10), %rax
ada487
+    movq  %rax, 0xb8(%rsp)
ada487
+    /* save current stack limit */
ada487
+    movq  0x10(%r10), %rax
ada487
+    movq  %rax, 0xc0(%rsp)
ada487
+    /* save current stack base */
ada487
+    movq  0x08(%r10), %rax
ada487
+    movq  %rax, 0xc8(%rsp)
ada487
+
ada487
+    movq  %r12, 0xd0(%rsp)  /* save R12 */
ada487
+    movq  %r13, 0xd8(%rsp)  /* save R13 */
ada487
+    movq  %r14, 0xe0(%rsp)  /* save R14 */
ada487
+    movq  %r15, 0xe8(%rsp)  /* save R15 */
ada487
+    movq  %rdi, 0xf0(%rsp)  /* save RDI */
ada487
+    movq  %rsi, 0xf8(%rsp)  /* save RSI */
ada487
+    movq  %rbx, 0x100(%rsp)  /* save RBX */
ada487
+    movq  %rbp, 0x108(%rsp)  /* save RBP */
ada487
+
ada487
+    movq  %rcx, 0x110(%rsp)  /* save hidden address of transport_t */
ada487
+
ada487
+    /* preserve RSP (pointing to context-data) in R9 */
ada487
+    movq  %rsp, %r9
ada487
+
ada487
+    /* restore RSP (pointing to context-data) from RDX */
ada487
+    movq  %rdx, %rsp
ada487
+
ada487
+#if !defined(BOOST_USE_TSX)
ada487
+    /* restore XMM storage */
ada487
+    movaps  0x0(%rsp), %xmm6
ada487
+    movaps  0x10(%rsp), %xmm7
ada487
+    movaps  0x20(%rsp), %xmm8
ada487
+    movaps  0x30(%rsp), %xmm9
ada487
+    movaps  0x40(%rsp), %xmm10
ada487
+    movaps  0x50(%rsp), %xmm11
ada487
+    movaps  0x60(%rsp), %xmm12
ada487
+    movaps  0x70(%rsp), %xmm13
ada487
+    movaps  0x80(%rsp), %xmm14
ada487
+    movaps  0x90(%rsp), %xmm15
ada487
+ 	ldmxcsr 0xa0(%rsp) /* restore MMX control- and status-word */
ada487
+ 	fldcw   0xa4(%rsp) /* restore x87 control-word */
ada487
+#endif
ada487
+
ada487
+    /* load NT_TIB */
ada487
+    movq  %gs:(0x30), %r10
ada487
+    /* restore fiber local storage */
ada487
+    movq  0xb0(%rsp), %rax
ada487
+    movq  %rax, 0x20(%r10)
ada487
+    /* restore current deallocation stack */
ada487
+    movq  0xb8(%rsp), %rax
ada487
+    movq  %rax, 0x1478(%r10)
ada487
+    /* restore current stack limit */
ada487
+    movq  0xc0(%rsp), %rax
ada487
+    movq  %rax, 0x10(%r10)
ada487
+    /* restore current stack base */
ada487
+    movq  0xc8(%rsp), %rax
ada487
+    movq  %rax, 0x08(%r10)
ada487
+
ada487
+    movq  0xd0(%rsp),  %r12  /* restore R12 */
ada487
+    movq  0xd8(%rsp),  %r13  /* restore R13 */
ada487
+    movq  0xe0(%rsp),  %r14  /* restore R14 */
ada487
+    movq  0xe8(%rsp),  %r15  /* restore R15 */
ada487
+    movq  0xf0(%rsp),  %rdi  /* restore RDI */
ada487
+    movq  0xf8(%rsp),  %rsi  /* restore RSI */
ada487
+    movq  0x100(%rsp), %rbx  /* restore RBX */
ada487
+    movq  0x108(%rsp), %rbp  /* restore RBP */
ada487
+
ada487
+    movq  0x110(%rsp), %rax  /* restore hidden address of transport_t */
ada487
+
ada487
+    leaq  0x118(%rsp), %rsp /* prepare stack */
ada487
+
ada487
+    /* restore return-address */
ada487
+    popq  %r10
ada487
+
ada487
+    /* transport_t returned in RAX */
ada487
+    /* return parent fcontext_t */
ada487
+    movq  %r9, 0x0(%rax)
ada487
+    /* return data */
ada487
+    movq  %r8, 0x8(%rax)
ada487
+
ada487
+    /* transport_t as 1.arg of context-function */
ada487
+    movq  %rax, %rcx
ada487
+
ada487
+    /* indirect jump to context */
ada487
+    jmp  *%r10
ada487
+.seh_endproc
ada487
+
ada487
+#ifdef __midipix__
ada487
+        .section .got$jump_fcontext,"r"
ada487
+        .global __imp_jump_fcontext
ada487
+__imp_jump_fcontext:
ada487
+        .quad   jump_fcontext
ada487
+        .linkonce discard
ada487
+#endif
ada487
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
ada487
--- php-8.1.0.orig/Zend/asm/make_x86_64_ms_pe_gas.S	1970-01-01 01:00:00.000000000 +0100
ada487
+++ php-8.1.0/Zend/asm/make_x86_64_ms_pe_gas.S	2021-11-28 11:44:29.385178672 +0100
ada487
@@ -0,0 +1,178 @@
ada487
+/*
ada487
+            Copyright Oliver Kowalke 2009.
ada487
+            Copyright Thomas Sailer 2013.
ada487
+   Distributed under the Boost Software License, Version 1.0.
ada487
+      (See accompanying file LICENSE_1_0.txt or copy at
ada487
+            http://www.boost.org/LICENSE_1_0.txt)
ada487
+*/
ada487
+
ada487
+/*************************************************************************************
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |     0   |     1   |     2    |     3   |     4   |     5   |     6   |     7   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    0x0  |    0x4  |    0x8   |    0xc  |   0x10  |   0x14  |   0x18  |   0x1c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |     8   |    9    |    10    |    11   |    12   |    13   |    14   |    15   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0x20  |  0x24   |   0x28   |   0x2c  |   0x30  |   0x34  |   0x38  |   0x3c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    16   |    17   |    18   |    19    |    20   |    21   |    22   |    23   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0xe40  |   0x44 |   0x48  |   0x4c   |   0x50  |   0x54  |   0x58  |   0x5c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    24   |   25    |    26    |   27    |    28   |    29   |    30   |    31   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0x60  |   0x64  |   0x68   |   0x6c  |   0x70  |   0x74  |   0x78  |   0x7c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    32   |   32    |    33    |   34    |    35   |    36   |    37   |    38   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0x80  |   0x84  |   0x88   |   0x8c  |   0x90  |   0x94  |   0x98  |   0x9c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                          SEE registers (XMM6-XMM15)                            | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    39   |   40    |    41    |   42    |    43   |    44   |    45   |    46   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0xa0  |   0xa4  |   0xa8   |   0xac  |   0xb0  |   0xb4  |   0xb8  |   0xbc  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* | fc_mxcsr|fc_x87_cw|     <alignment>    |       fbr_strg    |      fc_dealloc   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    47   |   48    |    49    |   50    |    51   |    52   |    53   |    54   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0xc0  |   0xc4  |   0xc8   |   0xcc  |   0xd0  |   0xd4  |   0xd8  |   0xdc  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |        limit      |         base       |         R12       |         R13       | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    55   |   56    |    57    |   58    |    59   |    60   |    61   |    62   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |   0xe0  |   0xe4  |   0xe8   |   0xec  |   0xf0  |   0xf4  |   0xf8  |   0xfc  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |        R14        |         R15        |         RDI       |        RSI        | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    63   |   64    |    65    |   66    |    67   |    68   |    69   |    70   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |  0x100  |  0x104  |  0x108   |  0x10c  |  0x110  |  0x114  |  0x118  |  0x11c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |        RBX        |         RBP        |       hidden      |        RIP        | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    71   |   72    |    73    |   74    |    75   |    76   |    77   |    78   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |  0x120  |  0x124  |  0x128   |  0x12c  |  0x130  |  0x134  |  0x138  |  0x13c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |                                   parameter area                               | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |    79   |   80    |    81    |   82    |    83   |    84   |    85   |    86   | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |  0x140  |  0x144  |  0x148   |  0x14c  |  0x150  |  0x154  |  0x158  |  0x15c  | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+* |       FCTX        |        DATA        |                                       | *
ada487
+* ---------------------------------------------------------------------------------- *
ada487
+**************************************************************************************/
ada487
+
ada487
+.file	"make_x86_64_ms_pe_gas.asm"
ada487
+.text
ada487
+.p2align 4,,15
ada487
+.def	make_fcontext;	.scl	2;	.type	32;	.endef
ada487
+.seh_proc	make_fcontext
ada487
+make_fcontext:
ada487
+.seh_endprologue
ada487
+
ada487
+    /* first arg of make_fcontext() == top of context-stack */
ada487
+    movq  %rcx, %rax
ada487
+
ada487
+    /* shift address in RAX to lower 16 byte boundary */
ada487
+    /* == pointer to fcontext_t and address of context stack */
ada487
+    andq  $-16, %rax
ada487
+
ada487
+    /* reserve space for context-data on context-stack */
ada487
+    /* on context-function entry: (RSP -0x8) % 16 == 0 */
ada487
+    leaq  -0x150(%rax), %rax
ada487
+
ada487
+    /* third arg of make_fcontext() == address of context-function */
ada487
+    movq  %r8, 0x100(%rax)
ada487
+
ada487
+    /* first arg of make_fcontext() == top of context-stack */
ada487
+    /* save top address of context stack as 'base' */
ada487
+    movq  %rcx, 0xc8(%rax)
ada487
+    /* second arg of make_fcontext() == size of context-stack */
ada487
+    /* negate stack size for LEA instruction (== substraction) */
ada487
+    negq  %rdx
ada487
+    /* compute bottom address of context stack (limit) */
ada487
+    leaq  (%rcx,%rdx), %rcx
ada487
+    /* save bottom address of context stack as 'limit' */
ada487
+    movq  %rcx, 0xc0(%rax)
ada487
+    /* save address of context stack limit as 'dealloction stack' */
ada487
+    movq  %rcx, 0xb8(%rax)
ada487
+	/* set fiber-storage to zero */
ada487
+    xorq  %rcx, %rcx
ada487
+    movq  %rcx, 0xb0(%rax)
ada487
+
ada487
+	/* save MMX control- and status-word */
ada487
+    stmxcsr  0xa0(%rax)
ada487
+    /* save x87 control-word */
ada487
+    fnstcw   0xa4(%rax)
ada487
+
ada487
+    /* compute address of transport_t */
ada487
+    leaq  0x140(%rax), %rcx
ada487
+    /* store address of transport_t in hidden field */
ada487
+    movq %rcx, 0x110(%rax)
ada487
+
ada487
+    /* compute abs address of label trampoline */
ada487
+    leaq  trampoline(%rip), %rcx
ada487
+    /* save address of finish as return-address for context-function */
ada487
+    /* will be entered after jump_fcontext() first time */
ada487
+    movq  %rcx, 0x118(%rax)
ada487
+
ada487
+    /* compute abs address of label finish */
ada487
+    leaq  finish(%rip), %rcx
ada487
+    /* save address of finish as return-address for context-function */
ada487
+    /* will be entered after context-function returns */
ada487
+    movq  %rcx, 0x108(%rax)
ada487
+
ada487
+    ret /* return pointer to context-data */
ada487
+
ada487
+trampoline:
ada487
+    /* store return address on stack */
ada487
+    /* fix stack alignment */ 
ada487
+    pushq %rbp
ada487
+    /* jump to context-function */
ada487
+    jmp *%rbx
ada487
+
ada487
+finish:
ada487
+    /* 32byte shadow-space for _exit() */
ada487
+    andq  $-32, %rsp
ada487
+    /* 32byte shadow-space for _exit() are */
ada487
+    /* already reserved by make_fcontext() */
ada487
+    /* exit code is zero */
ada487
+    xorq  %rcx, %rcx
ada487
+    /* exit application */
ada487
+    call  _exit
ada487
+    hlt
ada487
+.seh_endproc
ada487
+
ada487
+.def	_exit;	.scl	2;	.type	32;	.endef  /* standard C library function */
ada487
+
ada487
+#ifdef __midipix__
ada487
+        .section .got$make_fcontext,"r"
ada487
+        .global __imp_make_fcontext
ada487
+__imp_make_fcontext:
ada487
+        .quad   make_fcontext
ada487
+        .linkonce discard
ada487
+#endif