From c91951e6d6b9f370aef5494a42e606ed1d3aca26 Mon Sep 17 00:00:00 2001 From: kimwalisch Date: Mon, 10 Aug 2020 19:06:36 +0200 Subject: [PATCH] Improve CPUID detection --- libpopcnt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libpopcnt.h b/libpopcnt.h index 6394d60..bcf30ff 100644 --- a/libpopcnt.h +++ b/libpopcnt.h @@ -133,9 +133,9 @@ defined(_MSC_VER) || \ (GNUC_PREREQ(4, 2) || \ __has_builtin(__sync_val_compare_and_swap))) && \ - !(defined(HAVE_AVX512) && (defined(__AVX512__) || defined(__AVX512BW__)) && \ - defined(HAVE_AVX2) && defined(__AVX2__) && \ - defined(HAVE_POPCNT) && defined(__POPCNT__)) + ((defined(HAVE_AVX512) && !(defined(__AVX512__) || defined(__AVX512BW__))) || \ + (defined(HAVE_AVX2) && !defined(__AVX2__)) || \ + (defined(HAVE_POPCNT) && !defined(__POPCNT__))) #define HAVE_CPUID #endif