X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitcount.h;h=7a05970d2abcb45a96333a34a070504941ac3b20;hp=aa27c049415bcc3ce98750d48a9194152f8d8486;hb=c3b3dcc31ac2c935cdb279b3ff52d3ca0b3cfe7a;hpb=7c0cb8e73d78c95c27b34389cef2c0f7e6ea8382

diff --git a/src/bitcount.h b/src/bitcount.h
index aa27c049..7a05970d 100644
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -51,7 +51,31 @@ inline bool cpu_has_popcnt() {
   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 void __cpuid(unsigned int op,
+                    unsigned int *eax, unsigned int *ebx,
+                    unsigned int *ecx, unsigned int *edx)
+{
+  *eax = op;
+  *ecx = 0;
+  __asm__("cpuid" : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
+                  : "0" (*eax), "2" (*ecx));
+}
+
+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