Skip to content

Autotools: Refactor phpdbg POSIX Threads checks #14865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2024
Merged

Autotools: Refactor phpdbg POSIX Threads checks #14865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions sapi/phpdbg/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,26 @@ if test "$PHP_PHPDBG" != "no"; then
AC_MSG_RESULT([disabled])
fi

AC_CHECK_DECL([UFFDIO_WRITEPROTECT_MODE_WP], [
if test "$enable_zts" != "yes"; then
CFLAGS_SAVE="$CFLAGS"
LIBS_SAVE="$LIBS"

PTHREADS_CHECK
AC_MSG_CHECKING([working pthreads]);

if test "$pthreads_working" = "yes"; then
AC_MSG_RESULT([$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib]);
PHP_PHPDBG_CFLAGS="$PHP_PHPDBG_CFLAGS $ac_cv_pthreads_cflags"
PHPDBG_EXTRA_LIBS="$PHPDBG_EXTRA_LIBS -l$ac_cv_pthreads_lib"
AC_DEFINE(HAVE_USERFAULTFD_WRITEFAULT, 1, [Whether faulting on write-protected memory support can be compiled for userfaultfd])
else
AC_MSG_WARN([pthreads not available])
fi

CFLAGS="$CFLAGS_SAVE"
LIBS="$LIBS_SAVE"
else
AC_DEFINE(HAVE_USERFAULTFD_WRITEFAULT, 1, [Whether faulting on write-protected memory support can be compiled for userfaultfd])
fi
],,[#include <linux/userfaultfd.h>])
AH_TEMPLATE([HAVE_USERFAULTFD_WRITEFAULT],
[Define to 1 if faulting on write-protected memory support can be compiled
for userfaultfd.])

AC_CHECK_DECL([UFFDIO_WRITEPROTECT_MODE_WP],
[AS_VAR_IF([enable_zts], [yes],
[AC_DEFINE([HAVE_USERFAULTFD_WRITEFAULT], [1])],
[AC_MSG_CHECKING([working pthreads])
AS_VAR_IF([pthreads_working], [yes], [
AC_MSG_RESULT([$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib])
AS_VAR_APPEND([PHP_PHPDBG_CFLAGS], [" $ac_cv_pthreads_cflags"])
AS_VAR_APPEND([PHPDBG_EXTRA_LIBS], [" -l$ac_cv_pthreads_lib"])
AC_DEFINE([HAVE_USERFAULTFD_WRITEFAULT], [1])
], [
AC_MSG_RESULT([no])
AC_MSG_WARN([pthreads not available])
])
])
],,
[#include <linux/userfaultfd.h>])

PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/phpdbg/Makefile.frag],
[$abs_srcdir/sapi/phpdbg],
Expand Down