[php-src] master: Merge branch 'PHP-8.5' into PHP-8.6
| From: | Shivam Mathur | Date: | Wed, 14 Oct 2026 11:54:54 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142258@lists.php.net to get a copy of this message | ||
Author: Shivam Mathur (shivammathur)
Date: 2026-10-14T17:24:17+05:30
Commit: https://github.com/php/php-src/commit/6b8948fcfebc2ba0509aadcd50a7dfb51d6a5a31
Raw diff: https://github.com/php/php-src/commit/6b8948fcfebc2ba0509aadcd50a7dfb51d6a5a31.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Use the default archive names for Windows ARM64 builds (#24313)
Changed paths:
M win32/build/Makefile
Diff:
diff --git a/win32/build/Makefile b/win32/build/Makefile
index e9308bc43cdb..3b873cc0301f 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -23,7 +23,7 @@ PHP_BUILD=$(PHP_BUILD)
!if "$(PHP_SIMD_SCALE)" == ""
SIMD_SUFFIX=
!else
-!if "$(PHP_SIMD_SCALE)" == "SSE2"
+!if "$(PHP_SIMD_SCALE)" == "SSE2" || "$(PHP_SIMD_SCALE)" ==
"NEON"
SIMD_SUFFIX=
!else
SIMD_SUFFIX=-$(PHP_SIMD_SCALE)