Skip to content

Commit ab80e09

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix build on Apple Clang 17+ (#18629)
2 parents ac3eb67 + bc32d80 commit ab80e09

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

Zend/zend_cpuinfo.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,58 +127,86 @@ ZEND_API int zend_cpu_supports(zend_cpu_feature feature);
127127
* functions */
128128
ZEND_NO_SANITIZE_ADDRESS
129129
static inline int zend_cpu_supports_sse2(void) {
130+
#ifdef __aarch64__
131+
return 0;
132+
#else
130133
#ifdef PHP_HAVE_BUILTIN_CPU_INIT
131134
__builtin_cpu_init();
132135
#endif
133136
return __builtin_cpu_supports("sse2");
137+
#endif
134138
}
135139

136140
ZEND_NO_SANITIZE_ADDRESS
137141
static inline int zend_cpu_supports_sse3(void) {
142+
#ifdef __aarch64__
143+
return 0;
144+
#else
138145
#ifdef PHP_HAVE_BUILTIN_CPU_INIT
139146
__builtin_cpu_init();
140147
#endif
141148
return __builtin_cpu_supports("sse3");
149+
#endif
142150
}
143151

144152
ZEND_NO_SANITIZE_ADDRESS
145153
static inline int zend_cpu_supports_ssse3(void) {
154+
#ifdef __aarch64__
155+
return 0;
156+
#else
146157
#ifdef PHP_HAVE_BUILTIN_CPU_INIT
147158
__builtin_cpu_init();
148159
#endif
149160
return __builtin_cpu_supports("ssse3");
161+
#endif
150162
}
151163

152164
ZEND_NO_SANITIZE_ADDRESS
153165
static inline int zend_cpu_supports_sse41(void) {
166+
#ifdef __aarch64__
167+
return 0;
168+
#else
154169
#ifdef PHP_HAVE_BUILTIN_CPU_INIT
155170
__builtin_cpu_init();
156171
#endif
157172
return __builtin_cpu_supports("sse4.1");
173+
#endif
158174
}
159175

160176
ZEND_NO_SANITIZE_ADDRESS
161177
static inline int zend_cpu_supports_sse42(void) {
178+
#ifdef __aarch64__
179+
return 0;
180+
#else
162181
#ifdef PHP_HAVE_BUILTIN_CPU_INIT
163182
__builtin_cpu_init();
164183
#endif
165184
return __builtin_cpu_supports("sse4.2");
185+
#endif
166186
}
167187

168188
ZEND_NO_SANITIZE_ADDRESS
169189
static inline int zend_cpu_supports_avx(void) {
190+
#ifdef __aarch64__
191+
return 0;
192+
#else
170193
#ifdef PHP_HAVE_BUILTIN_CPU_INIT
171194
__builtin_cpu_init();
172195
#endif
173196
return __builtin_cpu_supports("avx");
197+
#endif
174198
}
175199

176200
ZEND_NO_SANITIZE_ADDRESS
177201
static inline int zend_cpu_supports_avx2(void) {
202+
#ifdef __aarch64__
203+
return 0;
204+
#else
178205
#ifdef PHP_HAVE_BUILTIN_CPU_INIT
179206
__builtin_cpu_init();
180207
#endif
181208
return __builtin_cpu_supports("avx2");
209+
#endif
182210
}
183211

184212
#ifdef PHP_HAVE_AVX512_SUPPORTS

0 commit comments

Comments
 (0)