com php-src: Fixed bug #76825 (Undefined symbols ___cpuid _count): NEWS Zend/Zend.m4 Zend/zend_cpuinfo .c
| From: | Xinchen Hui | Date: | Tue, 04 Sep 2018 09:26:46 +0000 |
| Subject: | com php-src: Fixed bug #76825 (Undefined symbols ___cpuid _count): NEWS Zend/Zend.m4 Zend/zend_cpuinfo .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102997@lists.php.net to get a copy of this message | ||
Commit: 3497b75b732723b2f8d0745336d9fcaccb2e3dd7
Author: Xinchen Hui <laruence@gmail.com> Tue, 4 Sep 2018 17:26:46 +0800
Parents: 7d8e6e6394725a0c00ddfb0bc1a14ded4d94b962
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3497b75b732723b2f8d0745336d9fcaccb2e3dd7
Log:
Fixed bug #76825 (Undefined symbols ___cpuid_count)
Bugs:
https://bugs.php.net/76825
Changed paths:
M NEWS
M Zend/Zend.m4
M Zend/zend_cpuinfo.c
Diff:
diff --git a/NEWS b/NEWS
index 10bfe1e..f9dfe55 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP NEWS
?? ??? ????, PHP 7.3.0RC1
- Core:
+ . Fixed bug #76825 (Undefined symbols ___cpuid_count). (Laruence)
. Fixed bug #76820 (Z_COPYABLE invalid definition). (mvdwerve, cmb)
- intl:
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 8d5cfe5...20dd0f9 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -58,6 +58,7 @@ sys/time.h \
signal.h \
unix.h \
stdlib.h \
+cpuid.h \
dlfcn.h)
AC_TYPE_SIZE_T
diff --git a/Zend/zend_cpuinfo.c b/Zend/zend_cpuinfo.c
index 39519c4..ffa3704 100644
--- a/Zend/zend_cpuinfo.c
+++ b/Zend/zend_cpuinfo.c
@@ -29,10 +29,20 @@ typedef struct _zend_cpu_info {
static zend_cpu_info cpuinfo = {0};
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-#include <cpuid.h>
+# ifdef HAVE_CPUID_H
+# include <cpuid.h>
static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {
__cpuid_count(func, subfunc, cpuinfo->eax, cpuinfo->ebx, cpuinfo->ecx, cpuinfo->edx);
}
+# else
+static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {
+ __asm__ __volatile__ (
+ "cpuid"
+ : "=a"(cpuinfo->eax), "=b"(cpuinfo->ebx),
"=c"(cpuinfo->ecx), "=d"(cpuinfo->edx)
+ : "a"(func), "c"(subfunc)
+ );
+}
+# endif
#elif defined(ZEND_WIN32) && !defined(__clang__)
# include <intrin.h>
static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {