diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2023-11-30 10:20:59 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-12-07 06:16:23 +0100 |
| commit | d677a454b208dfccc16c845d114575a414ca284f (patch) | |
| tree | a3cf5e8741ab717db97c53d7bbc7ebc0321db3d9 | |
| parent | 43d3d037605bac4e13a1282c4eb363cdee98eb74 (diff) | |
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 6.6
Change-Id: Ia930b1a2ed1e465a826ffffd179c5c21b4f4e288
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
| -rw-r--r-- | src/corelib/global/qsimd_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h index 2136b390d6..3b74ff6d3c 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."); |