Merge branch 'PHP-8.4'

* PHP-8.4:
  Update NEWS for GH-19068
  ext/gd: Drop useless and doubtful MSVC specific code (libgd/libgd@f1480ab)
  Zend: fix undefined symbol 'execute_ex' on Windows ARM64 #19064; ext/gd: fix emmintrin.h not found on Windows ARM64
This commit is contained in:
Niels Dossche 2025-07-10 22:15:43 +02:00
commit 224f95f442
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 2 additions and 2 deletions

View file

@ -55123,7 +55123,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NULL_HANDLER(ZEND_OPCODE_HANDL
# pragma GCC optimize("no-gcse") # pragma GCC optimize("no-gcse")
# pragma GCC optimize("no-ivopts") # pragma GCC optimize("no-ivopts")
#endif #endif
#ifdef _WIN64 #if defined(_WIN64) && defined(_M_X64)
/* See save_xmm_x86_64_ms_masm.asm */ /* See save_xmm_x86_64_ms_masm.asm */
void execute_ex_real(zend_execute_data *ex) void execute_ex_real(zend_execute_data *ex)
#else #else

View file

@ -7,7 +7,7 @@
# pragma GCC optimize("no-gcse") # pragma GCC optimize("no-gcse")
# pragma GCC optimize("no-ivopts") # pragma GCC optimize("no-ivopts")
#endif #endif
#ifdef _WIN64 #if defined(_WIN64) && defined(_M_X64)
/* See save_xmm_x86_64_ms_masm.asm */ /* See save_xmm_x86_64_ms_masm.asm */
void {%EXECUTOR_NAME%}_ex_real(zend_execute_data *ex) void {%EXECUTOR_NAME%}_ex_real(zend_execute_data *ex)
#else #else