From c88e1caf3b6479241d1d7df24b760dcf24bc48d8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 30 Nov 2023 10:20:59 +0100 Subject: [PATCH] qsimd_p.h: fix build with Clang 17 & -Werror,-Wconstant-logical-operand Amends 39d3af0c29147ff319e89c0be602d99af0af0996 qsimd_p.h:235:18: error: use of logical '&&' with constant operand [-Werror,-Wconstant-logical-operand] 235 | static_assert((1 && 1 && 1 && 1 && 1 && 1 && 1), "Undeclared identifiers indicate which features are missing."); Pick-to: 6.5 Change-Id: Ia930b1a2ed1e465a826ffffd179c5c21b4f4e288 Reviewed-by: Marc Mutz (cherry picked from commit d677a454b208dfccc16c845d114575a414ca284f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qsimd_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h index 9f1833c93e1..3a5cadaf811 100644 --- a/src/corelib/global/qsimd_p.h +++ b/src/corelib/global/qsimd_p.h @@ -228,8 +228,8 @@ asm( // List of features present with -march=x86-64-v3 and not architecturally // implied by __AVX2__ # define ARCH_HASWELL_MACROS \ - (__AVX2__ && __BMI__ && __BMI2__ && __F16C__ && __FMA__ && __LZCNT__ && __POPCNT__) -# if ARCH_HASWELL_MACROS == 0 + (__AVX2__ + __BMI__ + __BMI2__ + __F16C__ + __FMA__ + __LZCNT__ + __POPCNT__) +# if ARCH_HASWELL_MACROS != 7 # error "Please enable all x86-64-v3 extensions; you probably want to use -march=haswell or -march=x86-64-v3 instead of -mavx2" # endif static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which features are missing.");