Fix GH-15292: Dynamic AVX detection is broken for MSVC

nielsdos · nielsdos · commit 00001c4a0c85 · 2024-08-09T18:11:46.000+02:00
See https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170 For x64, either _M_X64 or _M_AMD64 would work but I'm going with what's already used in php-src. Closes GH-15301.
diff --git a/NEWS b/NEWS
@@ -10,6 +10,7 @@ PHP                                                                        NEWS
     type). (ilutov)
   . Fixed bug GH-15181 (Disabled output handler is flushed again). (cmb)
   . Passing E_USER_ERROR to trigger_error() is now deprecated. (Girgias)
+  . Fixed bug GH-15292 (Dynamic AVX detection is broken for MSVC). (nielsdos)
 
 - Date:
   . Constants SUNFUNCS_RET_TIMESTAMP, SUNFUNCS_RET_STRING, and SUNFUNCS_RET_DOUBLE
diff --git a/Zend/zend_cpuinfo.c b/Zend/zend_cpuinfo.c
@@ -73,7 +73,7 @@ static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo
 }
 #endif
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__) || defined(_M_X64) || defined(_M_IX86)
 /* Function based on compiler-rt implementation. */
 static unsigned get_xcr0_eax(void) {
 # if defined(__GNUC__) || defined(__clang__)

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo`
`73`	`73`	`}`
`74`	`74`	`#endif`
`75`	`75`
`76`		`-#if defined(__i386__) \|\| defined(__x86_64__)`
	`76`	`+#if defined(__i386__) \|\| defined(__x86_64__) \|\| defined(_M_X64) \|\| defined(_M_IX86)`
`77`	`77`	`/* Function based on compiler-rt implementation. */`
`78`	`78`	`static unsigned get_xcr0_eax(void) {`
`79`	`79`	`# if defined(__GNUC__) \|\| defined(__clang__)`