[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6

From: Date: Wed, 14 Oct 2026 12:39:43 +0000
Subject: [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-142264@lists.php.net to get a copy of this message
Author: Shivam Mathur (shivammathur) Date: 2026-10-14T18:08:55+05:30 Commit: https://github.com/php/php-src/commit/fa077a2c00dfd69678192b4be33e7c9dd2919d0c Raw diff: https://github.com/php/php-src/commit/fa077a2c00dfd69678192b4be33e7c9dd2919d0c.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: Fix v142 ARM64 hash and floating point results (#24317) Changed paths: M ext/hash/murmur/PMurHash.c M win32/build/config.w32.h.in Diff: diff --git a/ext/hash/murmur/PMurHash.c b/ext/hash/murmur/PMurHash.c index 0716ca13c88f..83c7d721fbe3 100644 --- a/ext/hash/murmur/PMurHash.c +++ b/ext/hash/murmur/PMurHash.c @@ -67,6 +67,11 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown. #define UNALIGNED_SAFE #endif +/* Avoid miscompiled aligned reads with the v142 ARM64 optimizer. */ +#if defined(_MSC_VER) && _MSC_VER < 1930 && defined(_M_ARM64) && !defined(__clang__) + #define UNALIGNED_SAFE +#endif + /* Find best way to ROTL */ #if defined(_MSC_VER) #define FORCE_INLINE static __forceinline diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 7b1bb4d932d3..a57b7e7784f5 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -25,6 +25,11 @@ #define DEFAULT_SHORT_OPEN_TAG "1" /* Platform-Specific Configuration. Should not be changed. */ +/* Match -ffp-contract=off on toolsets that enable ARM64 contractions by default. */ +#if defined(_MSC_VER) && _MSC_VER < 1930 && defined(_M_ARM64) && !defined(__clang__) +# pragma fp_contract(off) +#endif + /* Alignment for Zend memory allocator */ #define ZEND_MM_ALIGNMENT (size_t)8 #define ZEND_MM_ALIGNMENT_LOG2 (size_t)3

« previous php.cvs (#142264) next »