| diff -ru php-8.1.10.orig/build/Makefile.global php-8.1.10/build/Makefile.global |
| |
| |
| @@ -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 $@ |
| @@ -41,10 +41,10 @@ |
| |
| install-modules: build-modules |
| @test -d modules && \ |
| - $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) |
| - @echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/" |
| + $(mkinstalldirs) $(DESTDIR)$(EXTENSION_DIR) |
| + @echo "Installing shared extensions: $(DESTDIR)$(EXTENSION_DIR)/" |
| @rm -f modules/*.la >/dev/null 2>&1 |
| - @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) |
| + @$(INSTALL) modules/* $(DESTDIR)$(EXTENSION_DIR) |
| |
| install-headers: |
| -@if test "$(INSTALL_HEADERS)"; then \ |
| diff -Nru php-8.1.0.orig/build/libtool.m4 php-8.1.0/build/libtool.m4 |
| |
| |
| @@ -56,10 +56,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' |
| -AC_SUBST(LIBTOOL)dnl |
| - |
| # Prevent multiple expansion |
| define([AC_PROG_LIBTOOL], []) |
| ])# _AC_PROG_LIBTOOL |
| diff -Nru php-8.1.0.orig/configure php-8.1.0/configure |
| |
| |
| @@ -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)" |
| ;; |
| + *midipix*) |
| + 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" |
| + ;; |
| *) |
| 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)" |
| ;; |
| @@ -7982,7 +7982,7 @@ |
| php_sapi_module=static |
| ;; |
| esac |
| - install_sapi="install-sapi" |
| + install_sapi="" |
| |
| |
| case sapi/embed in |
| @@ -11403,14 +11406,12 @@ |
| |
| BUILD_PHPDBG="\$(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_PHPDBG_OBJS:.lo=.o) \ |
| \$(EXTRA_LIBS) \ |
| \$(PHPDBG_EXTRA_LIBS) \ |
| \$(ZEND_EXTRA_LIBS) \ |
| \$(PHP_FRAMEWORKS) \ |
| - -o \$(BUILD_BINARY)" |
| + -o \$(BUILD_BINARY) \$(top_builddir)/libs/libphp.so" |
| |
| BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \ |
| \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ |
| @@ -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)" |
| ;; |
| + *midipix*) |
| + 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" |
| + ;; |
| *) |
| 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)" |
| ;; |
| @@ -21247,7 +21251,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/libxml.$suffix \$(phplibdir) |
| |
| $ext_builddir/libxml.$suffix: \$(shared_objects_libxml) \$(LIBXML_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -21624,7 +21628,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/openssl.$suffix \$(phplibdir) |
| |
| $ext_builddir/openssl.$suffix: \$(shared_objects_openssl) \$(OPENSSL_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -22705,7 +22709,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/pcre.$suffix \$(phplibdir) |
| |
| $ext_builddir/pcre.$suffix: \$(shared_objects_pcre) \$(PCRE_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -24106,7 +24110,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite3.$suffix \$(phplibdir) |
| |
| $ext_builddir/sqlite3.$suffix: \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -24652,7 +24656,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/zlib.$suffix \$(phplibdir) |
| |
| $ext_builddir/zlib.$suffix: \$(shared_objects_zlib) \$(ZLIB_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -24969,7 +24973,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir) |
| |
| $ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -25606,7 +25610,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir) |
| |
| $ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -25918,7 +25922,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir) |
| |
| $ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -26227,7 +26231,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir) |
| |
| $ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -27277,7 +27281,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/curl.$suffix \$(phplibdir) |
| |
| $ext_builddir/curl.$suffix: \$(shared_objects_curl) \$(CURL_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -31630,7 +31634,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/dba.$suffix \$(phplibdir) |
| |
| $ext_builddir/dba.$suffix: \$(shared_objects_dba) \$(DBA_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -32221,7 +32225,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/dom.$suffix \$(phplibdir) |
| |
| $ext_builddir/dom.$suffix: \$(shared_objects_dom) \$(DOM_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -33684,7 +33688,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/exif.$suffix \$(phplibdir) |
| |
| $ext_builddir/exif.$suffix: \$(shared_objects_exif) \$(EXIF_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -34870,7 +34874,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/fileinfo.$suffix \$(phplibdir) |
| |
| $ext_builddir/fileinfo.$suffix: \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -35202,7 +35206,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/filter.$suffix \$(phplibdir) |
| |
| $ext_builddir/filter.$suffix: \$(shared_objects_filter) \$(FILTER_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -35577,7 +35581,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/ftp.$suffix \$(phplibdir) |
| |
| $ext_builddir/ftp.$suffix: \$(shared_objects_ftp) \$(FTP_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -40772,7 +40776,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/gettext.$suffix \$(phplibdir) |
| |
| $ext_builddir/gettext.$suffix: \$(shared_objects_gettext) \$(GETTEXT_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -43440,7 +43444,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/iconv.$suffix \$(phplibdir) |
| |
| $ext_builddir/iconv.$suffix: \$(shared_objects_iconv) \$(ICONV_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -49790,7 +49794,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/mbstring.$suffix \$(phplibdir) |
| |
| $ext_builddir/mbstring.$suffix: \$(shared_objects_mbstring) \$(MBSTRING_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -54970,7 +54974,16 @@ |
| printf %s "checking for sysvipc shared memory support... " >&6; } |
| if test "$cross_compiling" = yes |
| then : |
| - have_shm_ipc=no |
| + |
| + case $host_alias in |
| + *midipix*) |
| + have_shm_ipc=yes |
| + ;; |
| + *) |
| + have_shm_ipc=no |
| + ;; |
| + esac |
| + |
| else $as_nop |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| /* 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) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -65092,7 +65105,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir) |
| |
| $ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -68635,7 +68648,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir) |
| |
| $ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -69464,7 +69477,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir) |
| |
| $ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -70001,7 +70014,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir) |
| |
| $ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -70553,7 +70566,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir) |
| |
| $ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -72343,7 +72356,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir) |
| |
| $ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -72854,7 +72867,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir) |
| |
| $ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -78714,7 +78727,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir) |
| |
| $ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -79020,7 +79033,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir) |
| |
| $ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -79377,7 +79390,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir) |
| |
| $ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -80659,7 +80672,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir) |
| |
| $ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -81503,7 +81516,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir) |
| |
| $ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -82079,7 +82092,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir) |
| |
| $ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -82655,7 +82668,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir) |
| |
| $ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -83426,7 +83439,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir) |
| |
| $ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -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) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -85286,7 +85299,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir) |
| |
| $ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -86122,7 +86135,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/mysqlnd.$suffix \$(phplibdir) |
| |
| $ext_builddir/mysqlnd.$suffix: \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_DEPENDENCIES) |
| - \$(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) |
| + \$(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 |
| |
| EOF |
| |
| @@ -86355,7 +86368,7 @@ |
| enable_static=yes |
| |
| case $php_sapi_module in |
| - shared) |
| + *) |
| 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 |
| @@ -86369,12 +86382,6 @@ |
| esac |
| EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" |
| ;; |
| - *) |
| - standard_libtool_flag='-prefer-non-pic -static' |
| - if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then |
| - enable_shared=no |
| - fi |
| - ;; |
| esac |
| |
| EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" |
| @@ -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' |
| ;; |
| |
| - linux* | k*bsd*-gnu) |
| + linux* | k*bsd*-gnu | midipix*) |
| case $cc_basename in |
| # old Intel for x86_64 which still supported -KPIC. |
| ecc*) |
| @@ -92390,6 +92407,17 @@ |
| dynamic_linker='GNU/Linux ld.so' |
| ;; |
| |
| +midipix*) |
| + version_type=linux # correct to gnu/linux during the next big refactor |
| + need_lib_prefix=no |
| + need_version=no |
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
| + soname_spec='$libname$release$shared_ext$major' |
| + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
| + shlibpath_var=LD_LIBRARY_PATH |
| + dynamic_linker='GNU/Linux ld.so' |
| + ;; |
| + |
| netbsd*) |
| version_type=sunos |
| need_lib_prefix=no |
| @@ -94461,7 +94489,7 @@ |
| hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' |
| hardcode_libdir_separator_CXX=: |
| ;; |
| - linux* | k*bsd*-gnu) |
| + linux* | k*bsd*-gnu | midipix*) |
| case $cc_basename in |
| KCC*) |
| # Kuck and Associates, Inc. (KAI) C++ Compiler |
| diff -Nru php-8.1.0.orig/sapi/cgi/Makefile.frag php-8.1.0/sapi/cgi/Makefile.frag |
| |
| |
| @@ -6,7 +6,7 @@ |
| install-cgi: $(SAPI_CGI_PATH) |
| @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" |
| @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| - @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) |
| + @$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) |
| @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 -Nru php-8.1.0.orig/sapi/cli/Makefile.frag php-8.1.0/sapi/cli/Makefile.frag |
| |
| |
| @@ -6,7 +6,7 @@ |
| install-cli: $(SAPI_CLI_PATH) |
| @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" |
| @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| - @$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) |
| + @$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) |
| @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 -Nru php-8.1.0.orig/sapi/phpdbg/Makefile.frag php-8.1.0/sapi/phpdbg/Makefile.frag |
| |
| |
| @@ -25,7 +25,7 @@ |
| @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log |
| @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run |
| - @$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT) |
| + @$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT) |
| @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 -Nru php-8.1.0.orig/TSRM/TSRM.h php-8.1.0/TSRM/TSRM.h |
| |
| |
| @@ -147,7 +147,7 @@ |
| # define __has_attribute(x) 0 |
| #endif |
| |
| -#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__) |
| +#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__) || defined(__midipix__) |
| # 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 |
| |
| |
| @@ -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 |
| |
| |
| @@ -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 |