summaryrefslogtreecommitdiff
path: root/Zend/zend_cpuinfo.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-01-16 11:55:19 +0100
committerAnatol Belski <ab@php.net>2018-01-16 11:55:19 +0100
commit74de5461eb97536ef774fb61ce373d2edbe8d82a (patch)
tree8c10707142c0b0f2d3fc489b6c3fe5d6bb60b168 /Zend/zend_cpuinfo.c
parent1fd651650fb4821054decac5a0664f88fe4e55c3 (diff)
downloadphp-git-74de5461eb97536ef774fb61ce373d2edbe8d82a.tar.gz
The cpu setup is still needed when ifunc is supported
Diffstat (limited to 'Zend/zend_cpuinfo.c')
-rw-r--r--Zend/zend_cpuinfo.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_cpuinfo.c b/Zend/zend_cpuinfo.c
index ce92460fb4..2b087afaef 100644
--- a/Zend/zend_cpuinfo.c
+++ b/Zend/zend_cpuinfo.c
@@ -68,6 +68,10 @@ void zend_cpu_startup(void)
}
ZEND_API int zend_cpu_supports(zend_cpu_feature feature) {
+#ifdef HAVE_FUNC_ATTRIBUTE_IFUNC
+ /* The resolver is invoked before zend_startup(). */
+ zend_cpu_startup();
+#endif
if (feature & ZEND_CPU_EDX_MASK) {
return (cpuinfo.edx & (feature & ~ZEND_CPU_EDX_MASK));
} else {