diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-27 12:22:03 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-27 12:22:03 +0100 |
| commit | 8e25cf26afc4472f9f1225558d582e8cf667514f (patch) | |
| tree | 1a5373734142b42ae2fb5eaa2248d333437de047 | |
| parent | bcefbf860288c591385cf6b7d908770da242ad53 (diff) | |
| download | php-git-8e25cf26afc4472f9f1225558d582e8cf667514f.tar.gz | |
Make sure zend_cpu_supports_pclmul() is always defined
If __builtin_cpu_supports() is available, but doesn't have support
for pclmul, the function would end up not being defined at all.
| -rw-r--r-- | Zend/zend_cpuinfo.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/Zend/zend_cpuinfo.h b/Zend/zend_cpuinfo.h index 8d08d0eb00..59616edf1b 100644 --- a/Zend/zend_cpuinfo.h +++ b/Zend/zend_cpuinfo.h @@ -159,17 +159,6 @@ static zend_always_inline int zend_cpu_supports_sse42() { return __builtin_cpu_supports("sse4.2"); } -/* __builtin_cpu_supports has pclmul from gcc9 */ -#if (!defined(__GNUC__) || (ZEND_GCC_VERSION >= 9000)) -ZEND_NO_SANITIZE_ADDRESS -static zend_always_inline int zend_cpu_supports_pclmul() { -#if PHP_HAVE_BUILTIN_CPU_INIT - __builtin_cpu_init(); -#endif - return __builtin_cpu_supports("pclmul"); -} -#endif - ZEND_NO_SANITIZE_ADDRESS static zend_always_inline int zend_cpu_supports_avx() { #if PHP_HAVE_BUILTIN_CPU_INIT @@ -207,10 +196,6 @@ static zend_always_inline int zend_cpu_supports_sse42() { return zend_cpu_supports(ZEND_CPU_FEATURE_SSE42); } -static zend_always_inline int zend_cpu_supports_pclmul() { - return zend_cpu_supports(ZEND_CPU_FEATURE_PCLMULQDQ); -} - static zend_always_inline int zend_cpu_supports_avx() { return zend_cpu_supports(ZEND_CPU_FEATURE_AVX); } @@ -218,7 +203,21 @@ static zend_always_inline int zend_cpu_supports_avx() { static zend_always_inline int zend_cpu_supports_avx2() { return zend_cpu_supports(ZEND_CPU_FEATURE_AVX2); } +#endif +/* __builtin_cpu_supports has pclmul from gcc9 */ +#if PHP_HAVE_BUILTIN_CPU_SUPPORTS && (!defined(__GNUC__) || (ZEND_GCC_VERSION >= 9000)) +ZEND_NO_SANITIZE_ADDRESS +static zend_always_inline int zend_cpu_supports_pclmul() { +#if PHP_HAVE_BUILTIN_CPU_INIT + __builtin_cpu_init(); +#endif + return __builtin_cpu_supports("pclmul"); +} +#else +static zend_always_inline int zend_cpu_supports_pclmul() { + return zend_cpu_supports(ZEND_CPU_FEATURE_PCLMULQDQ); +} #endif #endif |