diff options
| -rw-r--r-- | Zend/zend_portability.h | 8 | ||||
| -rw-r--r-- | ext/standard/base64.c | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index ed8f07389b..02286da37b 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -551,7 +551,7 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */ # define ZEND_INTRIN_SSSE3_RESOLVER 1 #endif -#if ZEND_INTRIN_HAVE_IFUNC_TARGET && (ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER) +#if ZEND_INTRIN_SSSE3_RESOLVER && ZEND_INTRIN_HAVE_IFUNC_TARGET # define ZEND_INTRIN_SSSE3_FUNC_PROTO 1 #elif ZEND_INTRIN_SSSE3_RESOLVER # define ZEND_INTRIN_SSSE3_FUNC_PTR 1 @@ -575,7 +575,7 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */ # define ZEND_INTRIN_SSE4_2_RESOLVER 1 #endif -#if ZEND_INTRIN_HAVE_IFUNC_TARGET && (ZEND_INTRIN_SSE4_2_NATIVE || ZEND_INTRIN_SSE4_2_RESOLVER) +#if ZEND_INTRIN_SSE4_2_RESOLVER && ZEND_INTRIN_HAVE_IFUNC_TARGET # define ZEND_INTRIN_SSE4_2_FUNC_PROTO 1 #elif ZEND_INTRIN_SSE4_2_RESOLVER # define ZEND_INTRIN_SSE4_2_FUNC_PTR 1 @@ -592,14 +592,12 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */ #endif #ifdef __AVX2__ -/* Instructions compiled directly. */ # define ZEND_INTRIN_AVX2_NATIVE 1 #elif (defined(HAVE_FUNC_ATTRIBUTE_TARGET) && defined(PHP_HAVE_AVX2)) || defined(ZEND_WIN32) -/* Function resolved by ifunc or MINIT. */ # define ZEND_INTRIN_AVX2_RESOLVER 1 #endif -#if ZEND_INTRIN_HAVE_IFUNC_TARGET && (ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER) +#if ZEND_INTRIN_AVX2_RESOLVER && ZEND_INTRIN_HAVE_IFUNC_TARGET # define ZEND_INTRIN_AVX2_FUNC_PROTO 1 #elif ZEND_INTRIN_AVX2_RESOLVER # define ZEND_INTRIN_AVX2_FUNC_PTR 1 diff --git a/ext/standard/base64.c b/ext/standard/base64.c index 29268c6766..50134f1875 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -164,8 +164,9 @@ fail: # undef ZEND_INTRIN_SSSE3_RESOLVER # undef ZEND_INTRIN_SSSE3_FUNC_PROTO # undef ZEND_INTRIN_SSSE3_FUNC_PTR -#elif ZEND_INTRIN_AVX2_FUNC_PROTO && ZEND_INTRIN_SSSE3_NATIVE +#elif ZEND_INTRIN_AVX2_FUNC_PROTO && (ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER) # undef ZEND_INTRIN_SSSE3_NATIVE +# undef ZEND_INTRIN_SSSE3_RESOLVER # define ZEND_INTRIN_SSSE3_RESOLVER 1 # define ZEND_INTRIN_SSSE3_FUNC_PROTO 1 # undef ZEND_INTRIN_SSSE3_FUNC_DECL @@ -174,7 +175,7 @@ fail: # else # define ZEND_INTRIN_SSSE3_FUNC_DECL(func) ZEND_API func # endif -#elif ZEND_INTRIN_AVX2_FUNC_PTR && ZEND_INTRIN_SSSE3_NATIVE +#elif ZEND_INTRIN_AVX2_FUNC_PTR && (ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER) # undef ZEND_INTRIN_SSSE3_NATIVE # undef ZEND_INTRIN_SSSE3_RESOLVER # define ZEND_INTRIN_SSSE3_RESOLVER 1 |