From: Ondřej Surý <ondrej@sury.org>
Date: Sat, 2 Dec 2023 21:09:36 +0000 (+0100)
Subject: Disable avx detection with gcc < 6
X-Git-Tag: archive/raspbian/8.4.11-1+rpi1~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ff10dc87b67e0cd41714e33aa1daf68a64b4027f;p=php8.4.git

Disable avx detection with gcc < 6


Gbp-Pq: Name 0043-Disable-avx-detection-with-gcc-6.patch
---

diff --git a/Zend/zend_cpuinfo.h b/Zend/zend_cpuinfo.h
index 7e53ba65..7e4a0764 100644
--- a/Zend/zend_cpuinfo.h
+++ b/Zend/zend_cpuinfo.h
@@ -215,9 +215,14 @@ static inline int zend_cpu_supports_avx512(void) {
 #ifdef PHP_HAVE_BUILTIN_CPU_INIT
 	__builtin_cpu_init();
 #endif
-	return __builtin_cpu_supports("avx512f") && __builtin_cpu_supports("avx512dq")
-		&& __builtin_cpu_supports("avx512cd") && __builtin_cpu_supports("avx512bw")
-		&& __builtin_cpu_supports("avx512vl");
+	return __builtin_cpu_supports("avx512f")
+#if (__GNUC__ > 5)
+		&& __builtin_cpu_supports("avx512dq")
+		&& __builtin_cpu_supports("avx512cd")
+		&& __builtin_cpu_supports("avx512bw")
+		&& __builtin_cpu_supports("avx512vl")
+#endif
+		;
 }
 #endif
 
@@ -227,7 +232,11 @@ static inline int zend_cpu_supports_avx512_vbmi(void) {
 #ifdef PHP_HAVE_BUILTIN_CPU_INIT
 	__builtin_cpu_init();
 #endif
-	return zend_cpu_supports_avx512() && __builtin_cpu_supports("avx512vbmi");
+	return zend_cpu_supports_avx512()
+#if (__GNUC__ > 5)
+		&& __builtin_cpu_supports("avx512vbmi")
+#endif
+		;
 }
 #endif