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 7e53ba654dd41545fab4f1b0d3e1ca8af4a985ec..7e4a0764e6c2936cec0399ee75a6428d61246b4f 100644 (file)
--- 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