Skip to content

Commit 180557d

Browse files
dixyescmb69
authored andcommitted
Do not assert SSE/AVX resolvers at windows arm64
NEWS/UPGRADING are already handled by 745cf34. Closes GH-7704.
1 parent 745cf34 commit 180557d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Zend/zend_portability.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ extern "C++" {
522522
#ifdef __SSSE3__
523523
/* Instructions compiled directly. */
524524
# define ZEND_INTRIN_SSSE3_NATIVE 1
525-
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_SSSE3)) || defined(ZEND_WIN32)
525+
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_SSSE3)) || (defined(ZEND_WIN32) && (!defined(_M_ARM64)))
526526
/* Function resolved by ifunc or MINIT. */
527527
# define ZEND_INTRIN_SSSE3_RESOLVER 1
528528
#endif
@@ -547,7 +547,7 @@ extern "C++" {
547547
#ifdef __SSE4_2__
548548
/* Instructions compiled directly. */
549549
# define ZEND_INTRIN_SSE4_2_NATIVE 1
550-
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_SSE4_2)) || defined(ZEND_WIN32)
550+
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_SSE4_2)) || (defined(ZEND_WIN32) && (!defined(_M_ARM64)))
551551
/* Function resolved by ifunc or MINIT. */
552552
# define ZEND_INTRIN_SSE4_2_RESOLVER 1
553553
#endif
@@ -572,7 +572,7 @@ extern "C++" {
572572
#ifdef __PCLMUL__
573573
/* Instructions compiled directly. */
574574
# define ZEND_INTRIN_PCLMUL_NATIVE 1
575-
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_PCLMUL)) || defined(ZEND_WIN32)
575+
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_PCLMUL)) || (defined(ZEND_WIN32) && (!defined(_M_ARM64)))
576576
/* Function resolved by ifunc or MINIT. */
577577
# define ZEND_INTRIN_PCLMUL_RESOLVER 1
578578
#endif
@@ -598,7 +598,7 @@ extern "C++" {
598598
#if defined(ZEND_INTRIN_SSE4_2_NATIVE) && defined(ZEND_INTRIN_PCLMUL_NATIVE)
599599
/* Instructions compiled directly. */
600600
# define ZEND_INTRIN_SSE4_2_PCLMUL_NATIVE 1
601-
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_SSE4_2) && defined(PHP_HAVE_PCLMUL)) || defined(ZEND_WIN32)
601+
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_SSE4_2) && defined(PHP_HAVE_PCLMUL)) || (defined(ZEND_WIN32) && (!defined(_M_ARM64)))
602602
/* Function resolved by ifunc or MINIT. */
603603
# define ZEND_INTRIN_SSE4_2_PCLMUL_RESOLVER 1
604604
#endif
@@ -623,7 +623,7 @@ extern "C++" {
623623

624624
#ifdef __AVX2__
625625
# define ZEND_INTRIN_AVX2_NATIVE 1
626-
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_AVX2)) || defined(ZEND_WIN32)
626+
#elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_AVX2)) || (defined(ZEND_WIN32) && (!defined(_M_ARM64)))
627627
# define ZEND_INTRIN_AVX2_RESOLVER 1
628628
#endif
629629

0 commit comments

Comments
 (0)