Skip to content

Commit 11f4683

Browse files
authored
Wrap __cpuid_count check into ZEND_CHECK_CPUID_COUNT M4 macro (#14692)
Instead of checking this when including the Zend.m4 file in configure.ac check is executed with the ZEND_INIT macro.
1 parent c7c02f2 commit 11f4683

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

Zend/Zend.m4

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ AS_VAR_IF([php_cv_have_stack_limit], [yes],
197197
ZEND_CHECK_FLOAT_PRECISION
198198
ZEND_DLSYM_CHECK
199199
ZEND_CHECK_GLOBAL_REGISTER_VARIABLES
200+
ZEND_CHECK_CPUID_COUNT
200201
201202
AC_MSG_CHECKING(whether to enable thread-safety)
202203
AC_MSG_RESULT($ZEND_ZTS)
@@ -391,18 +392,21 @@ AC_MSG_CHECKING([whether to enable global register variables support])
391392
AC_MSG_RESULT([$ZEND_GCC_GLOBAL_REGS])
392393
])
393394

395+
dnl
396+
dnl ZEND_CHECK_CPUID_COUNT
397+
dnl
394398
dnl Check whether __cpuid_count is available.
395-
AC_CACHE_CHECK(whether __cpuid_count is available, ac_cv_cpuid_count_available, [
396-
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
397-
#include <cpuid.h>
398-
]], [[
399-
unsigned eax, ebx, ecx, edx;
400-
__cpuid_count(0, 0, eax, ebx, ecx, edx);
401-
]])], [
402-
ac_cv_cpuid_count_available=yes
403-
], [
404-
ac_cv_cpuid_count_available=no
405-
])])
406-
if test "$ac_cv_cpuid_count_available" = "yes"; then
407-
AC_DEFINE([HAVE_CPUID_COUNT], 1, [whether __cpuid_count is available])
408-
fi
399+
dnl
400+
AC_DEFUN([ZEND_CHECK_CPUID_COUNT],
401+
[AC_CACHE_CHECK([whether __cpuid_count is available],
402+
[php_cv_have___cpuid_count],
403+
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cpuid.h>], [dnl
404+
unsigned eax, ebx, ecx, edx;
405+
__cpuid_count(0, 0, eax, ebx, ecx, edx);
406+
])],
407+
[php_cv_have___cpuid_count=yes],
408+
[php_cv_have___cpuid_count=no])])
409+
AS_VAR_IF([php_cv_have___cpuid_count], [yes],
410+
[AC_DEFINE([HAVE_CPUID_COUNT], [1],
411+
[Define to 1 if '__cpuid_count' is available.])])
412+
])

0 commit comments

Comments
 (0)