Skip to content

Commit 4341ce5

Browse files
committed
pclmul support was added in 19.0 too
1 parent 82b5e46 commit 4341ce5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Zend/zend_cpuinfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ static zend_always_inline int zend_cpu_supports_avx512_vbmi(void) {
272272
}
273273
#endif
274274

275-
/* __builtin_cpu_supports has pclmul from gcc9 */
276-
#if defined(PHP_HAVE_BUILTIN_CPU_SUPPORTS) && (!defined(__GNUC__) || defined(__clang__) || (ZEND_GCC_VERSION >= 9000))
275+
/* __builtin_cpu_supports has pclmul from gcc9 and clang 19 */
276+
#if defined(PHP_HAVE_BUILTIN_CPU_SUPPORTS) && (!defined(__GNUC__) || (defined(__clang__) && __clang_major__ >= 19) || (ZEND_GCC_VERSION >= 9000))
277277
ZEND_NO_SANITIZE_ADDRESS
278278
static inline int zend_cpu_supports_pclmul(void) {
279279
#ifdef PHP_HAVE_BUILTIN_CPU_INIT

Zend/zend_portability.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,8 @@ extern "C++" {
653653
#endif
654654

655655
/* Do not use for conditional declaration of API functions! */
656-
#if defined(ZEND_INTRIN_PCLMUL_RESOLVER) && defined(ZEND_INTRIN_HAVE_IFUNC_TARGET) && (!defined(__GNUC__) || defined(__clang__) || (ZEND_GCC_VERSION >= 9000))
657-
/* __builtin_cpu_supports has pclmul from gcc9 */
656+
#if defined(ZEND_INTRIN_PCLMUL_RESOLVER) && defined(ZEND_INTRIN_HAVE_IFUNC_TARGET) && (!defined(__GNUC__) || (defined(__clang__) && __clang_major__ >= 19) || (ZEND_GCC_VERSION >= 9000))
657+
/* __builtin_cpu_supports has pclmul from gcc9 and clang 19 */
658658
# define ZEND_INTRIN_PCLMUL_FUNC_PROTO 1
659659
#elif defined(ZEND_INTRIN_PCLMUL_RESOLVER)
660660
# define ZEND_INTRIN_PCLMUL_FUNC_PTR 1
@@ -679,8 +679,8 @@ extern "C++" {
679679
#endif
680680

681681
/* Do not use for conditional declaration of API functions! */
682-
#if defined(ZEND_INTRIN_SSE4_2_PCLMUL_RESOLVER) && defined(ZEND_INTRIN_HAVE_IFUNC_TARGET) && (!defined(__GNUC__) || defined(__clang__) || (ZEND_GCC_VERSION >= 9000))
683-
/* __builtin_cpu_supports has pclmul from gcc9 */
682+
#if defined(ZEND_INTRIN_SSE4_2_PCLMUL_RESOLVER) && defined(ZEND_INTRIN_HAVE_IFUNC_TARGET) && (!defined(__GNUC__) || (defined(__clang__) && __clang_major__ >= 19) || (ZEND_GCC_VERSION >= 9000))
683+
/* __builtin_cpu_supports has pclmul from gcc9 and clang 19 */
684684
# define ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PROTO 1
685685
#elif defined(ZEND_INTRIN_SSE4_2_PCLMUL_RESOLVER)
686686
# define ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PTR 1

0 commit comments

Comments
 (0)