#if defined(__INTEL_COMPILER) && defined(USE_POPCNT) // Intel compiler
-#include <nmmintrin.h>
-
inline bool cpu_has_popcnt() {
int CPUInfo[4] = {-1};
#elif defined(_MSC_VER) && defined(USE_POPCNT) // Microsoft compiler
-#include <intrin.h>
-
inline bool cpu_has_popcnt() {
int CPUInfo[4] = {-1};
return (CPUInfo[2] >> 23) & 1;
}
-#define POPCNT_INTRINSIC(x) __popcnt64(x)
+#define POPCNT_INTRINSIC(x) (int)__popcnt64(x)
+
+#elif defined(__GNUC__) && defined(USE_POPCNT) // Gcc compiler
+
+inline bool cpu_has_popcnt() {
+
+ unsigned int eax, ebx, ecx, edx;
+ __cpuid(1, &eax, &ebx, &ecx, &edx);
+ return (ecx >> 23) & 1;
+}
+
+#define POPCNT_INTRINSIC(x) ({ \
+ unsigned long __ret; \
+ __asm__("popcnt %1, %0" : "=r" (__ret) : "r" (x)); \
+ __ret; })
#else // Safe fallback for unsupported compilers or when USE_POPCNT is disabled