diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-01 10:24:02 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-01 10:24:02 +0100 |
commit | c034f200aa1bd0c54f68a44d82f9089e936cc79d (patch) | |
tree | 7cc4be98fafb79bebe0b5fbb58ce6faba43ab304 /Zend | |
parent | 3030d4aa12ba60fbae53a948a6c9e449c4c64061 (diff) | |
parent | 648cda6c9fc5964df73d65a8b227357f980edca9 (diff) | |
download | php-git-c034f200aa1bd0c54f68a44d82f9089e936cc79d.tar.gz |
Merge branch 'PHP-8.0'
* PHP-8.0:
Don't mark cpu_supports functions as always inline
Diffstat (limited to 'Zend')
-rw-r--r-- | Zend/zend_cpuinfo.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Zend/zend_cpuinfo.h b/Zend/zend_cpuinfo.h index 59616edf1b..92227ca6c0 100644 --- a/Zend/zend_cpuinfo.h +++ b/Zend/zend_cpuinfo.h @@ -120,7 +120,7 @@ ZEND_API int zend_cpu_supports(zend_cpu_feature feature); * resolver functions should not depend on any external * functions */ ZEND_NO_SANITIZE_ADDRESS -static zend_always_inline int zend_cpu_supports_sse2() { +static inline int zend_cpu_supports_sse2() { #if PHP_HAVE_BUILTIN_CPU_INIT __builtin_cpu_init(); #endif @@ -128,7 +128,7 @@ static zend_always_inline int zend_cpu_supports_sse2() { } ZEND_NO_SANITIZE_ADDRESS -static zend_always_inline int zend_cpu_supports_sse3() { +static inline int zend_cpu_supports_sse3() { #if PHP_HAVE_BUILTIN_CPU_INIT __builtin_cpu_init(); #endif @@ -136,7 +136,7 @@ static zend_always_inline int zend_cpu_supports_sse3() { } ZEND_NO_SANITIZE_ADDRESS -static zend_always_inline int zend_cpu_supports_ssse3() { +static inline int zend_cpu_supports_ssse3() { #if PHP_HAVE_BUILTIN_CPU_INIT __builtin_cpu_init(); #endif @@ -144,7 +144,7 @@ static zend_always_inline int zend_cpu_supports_ssse3() { } ZEND_NO_SANITIZE_ADDRESS -static zend_always_inline int zend_cpu_supports_sse41() { +static inline int zend_cpu_supports_sse41() { #if PHP_HAVE_BUILTIN_CPU_INIT __builtin_cpu_init(); #endif @@ -152,7 +152,7 @@ static zend_always_inline int zend_cpu_supports_sse41() { } ZEND_NO_SANITIZE_ADDRESS -static zend_always_inline int zend_cpu_supports_sse42() { +static inline int zend_cpu_supports_sse42() { #if PHP_HAVE_BUILTIN_CPU_INIT __builtin_cpu_init(); #endif @@ -160,7 +160,7 @@ static zend_always_inline int zend_cpu_supports_sse42() { } ZEND_NO_SANITIZE_ADDRESS -static zend_always_inline int zend_cpu_supports_avx() { +static inline int zend_cpu_supports_avx() { #if PHP_HAVE_BUILTIN_CPU_INIT __builtin_cpu_init(); #endif @@ -168,7 +168,7 @@ static zend_always_inline int zend_cpu_supports_avx() { } ZEND_NO_SANITIZE_ADDRESS -static zend_always_inline int zend_cpu_supports_avx2() { +static inline int zend_cpu_supports_avx2() { #if PHP_HAVE_BUILTIN_CPU_INIT __builtin_cpu_init(); #endif @@ -176,31 +176,31 @@ static zend_always_inline int zend_cpu_supports_avx2() { } #else -static zend_always_inline int zend_cpu_supports_sse2() { +static inline int zend_cpu_supports_sse2() { return zend_cpu_supports(ZEND_CPU_FEATURE_SSE2); } -static zend_always_inline int zend_cpu_supports_sse3() { +static inline int zend_cpu_supports_sse3() { return zend_cpu_supports(ZEND_CPU_FEATURE_SSE3); } -static zend_always_inline int zend_cpu_supports_ssse3() { +static inline int zend_cpu_supports_ssse3() { return zend_cpu_supports(ZEND_CPU_FEATURE_SSSE3); } -static zend_always_inline int zend_cpu_supports_sse41() { +static inline int zend_cpu_supports_sse41() { return zend_cpu_supports(ZEND_CPU_FEATURE_SSE41); } -static zend_always_inline int zend_cpu_supports_sse42() { +static inline int zend_cpu_supports_sse42() { return zend_cpu_supports(ZEND_CPU_FEATURE_SSE42); } -static zend_always_inline int zend_cpu_supports_avx() { +static inline int zend_cpu_supports_avx() { return zend_cpu_supports(ZEND_CPU_FEATURE_AVX); } -static zend_always_inline int zend_cpu_supports_avx2() { +static inline int zend_cpu_supports_avx2() { return zend_cpu_supports(ZEND_CPU_FEATURE_AVX2); } #endif @@ -208,14 +208,14 @@ static zend_always_inline int zend_cpu_supports_avx2() { /* __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() { +static 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() { +static inline int zend_cpu_supports_pclmul() { return zend_cpu_supports(ZEND_CPU_FEATURE_PCLMULQDQ); } #endif |