archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix build on Apple Clang 17+ (#18629)

Browse source 
Fixing "invalid cpu feature string for builtin" errors that started to appear on Apple Clang 17.0.0
This commit is contained in:
Máté Kocsis 2025-05-24 22:26:06 +02:00 • committed by GitHub
parent a44e3f442f
commit 772479ea2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Zend/zend_cpuinfo.h
View file

@ -126,58 +126,86 @@ ZEND_API int zend_cpu_supports(zend_cpu_feature feature);
* functions */ * functions */
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_sse2(void) { static inline int zend_cpu_supports_sse2(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT #if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init(); __builtin_cpu_init();
#endif #endif
return __builtin_cpu_supports("sse2"); return __builtin_cpu_supports("sse2");
#endif
} }
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_sse3(void) { static inline int zend_cpu_supports_sse3(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT #if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init(); __builtin_cpu_init();
#endif #endif
return __builtin_cpu_supports("sse3"); return __builtin_cpu_supports("sse3");
#endif
} }
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_ssse3(void) { static inline int zend_cpu_supports_ssse3(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT #if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init(); __builtin_cpu_init();
#endif #endif
return __builtin_cpu_supports("ssse3"); return __builtin_cpu_supports("ssse3");
#endif
} }
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_sse41(void) { static inline int zend_cpu_supports_sse41(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT #if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init(); __builtin_cpu_init();
#endif #endif
return __builtin_cpu_supports("sse4.1"); return __builtin_cpu_supports("sse4.1");
#endif
} }
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_sse42(void) { static inline int zend_cpu_supports_sse42(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT #if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init(); __builtin_cpu_init();
#endif #endif
return __builtin_cpu_supports("sse4.2"); return __builtin_cpu_supports("sse4.2");
#endif
} }
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_avx(void) { static inline int zend_cpu_supports_avx(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT #if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init(); __builtin_cpu_init();
#endif #endif
return __builtin_cpu_supports("avx"); return __builtin_cpu_supports("avx");
#endif
} }
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_avx2(void) { static inline int zend_cpu_supports_avx2(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT #if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init(); __builtin_cpu_init();
#endif #endif
return __builtin_cpu_supports("avx2"); return __builtin_cpu_supports("avx2");
#endif
} }
#if PHP_HAVE_AVX512_SUPPORTS #if PHP_HAVE_AVX512_SUPPORTS