summaryrefslogtreecommitdiff
path: root/Zend/Zend.m4
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2018-11-05 18:25:22 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2018-11-05 18:25:22 +0100
commit34e65f73bca6df93646ea34e6b9385812f3097db (patch)
treef47b7ea057a65853eee1bde9648585f1de7be281 /Zend/Zend.m4
parentdbef28ea8f02b65f8679d4bf4e014a0a959b9a72 (diff)
parent7625f972db10fe1a69757b97c6dec57ea049129b (diff)
downloadphp-git-34e65f73bca6df93646ea34e6b9385812f3097db.tar.gz
Merge branch 'PHP-7.3'
* PHP-7.3: Fix #76825: Undefined symbols ___cpuid_count
Diffstat (limited to 'Zend/Zend.m4')
-rw-r--r--Zend/Zend.m418
1 files changed, 18 insertions, 0 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 06563c7b77..b0d7923e65 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -491,3 +491,21 @@ dnl This is the most probable fallback so we assume yes in case of cross compile
if test "$ac_cv_huge_val_nan" = "yes"; then
AC_DEFINE([HAVE_HUGE_VAL_NAN], 1, [whether HUGE_VAL + -HUGEVAL == NAN])
fi
+
+dnl
+dnl Check whether __cpuid_count is available
+dnl
+AC_CACHE_CHECK(whether __cpuid_count is available, ac_cv_cpuid_count_available, [
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <cpuid.h>
+]], [[
+ unsigned eax, ebx, ecx, edx;
+ __cpuid_count(0, 0, eax, ebx, ecx, edx);
+]])], [
+ ac_cv_cpuid_count_available=yes
+], [
+ ac_cv_cpuid_count_available=no
+])])
+if test "$ac_cv_cpuid_count_available" = "yes"; then
+ AC_DEFINE([HAVE_CPUID_COUNT], 1, [whether __cpuid_count is available])
+fi