Skip to content

Commit 224f95f

Browse files
committed
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
2 parents c4183fb + 2fa0e55 commit 224f95f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Zend/zend_vm_execute.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Zend/zend_vm_execute.skl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# pragma GCC optimize("no-gcse")
88
# pragma GCC optimize("no-ivopts")
99
#endif
10-
#ifdef _WIN64
10+
#if defined(_WIN64) && defined(_M_X64)
1111
/* See save_xmm_x86_64_ms_masm.asm */
1212
void {%EXECUTOR_NAME%}_ex_real(zend_execute_data *ex)
1313
#else

0 commit comments

Comments
 (0)