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

diff --git a/src/bitcount.h b/src/bitcount.h
index aa27c049..43895180 100644
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -29,8 +29,6 @@
 
 #if defined(__INTEL_COMPILER) && defined(USE_POPCNT) // Intel compiler
 
-#include <nmmintrin.h>
-
 inline bool cpu_has_popcnt() {
 
   int CPUInfo[4] = {-1};
@@ -42,8 +40,6 @@ inline bool cpu_has_popcnt() {
 
 #elif defined(_MSC_VER) && defined(USE_POPCNT) // Microsoft compiler
 
-#include <intrin.h>
-
 inline bool cpu_has_popcnt() {
 
   int CPUInfo[4] = {-1};
@@ -51,7 +47,21 @@ 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 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