From 14bc4013941d38740d10681e7d54711f95cb38c4 Mon Sep 17 00:00:00 2001
From: Sergey Kandaurov <pluknet@nginx.com>
Date: Wed, 20 Jun 2018 19:34:06 +0300
Subject: Using own popcount where the compiler builtin is not available.

---
 src/nxt_clang.h           | 21 +++++++++++++++++++++
 src/nxt_conf_validation.c |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nxt_clang.h b/src/nxt_clang.h
index 60d12fb2..0622aad3 100644
--- a/src/nxt_clang.h
+++ b/src/nxt_clang.h
@@ -132,6 +132,27 @@ nxt_prefetch(a)
 #endif
 
 
+#if (NXT_HAVE_BUILTIN_POPCOUNT)
+
+#define nxt_popcount       __builtin_popcount
+
+#else
+
+nxt_inline int
+nxt_popcount(unsigned int x)
+{
+    int  count;
+
+    for (count = 0; x != 0; x >>= 1) {
+        count += (x & 1);
+    }
+
+    return count;
+}
+
+#endif
+
+
 #ifndef NXT_ALIGNMENT
 
 #if (NXT_SOLARIS)
diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c
index 7d9c9631..4fb4720f 100644
--- a/src/nxt_conf_validation.c
+++ b/src/nxt_conf_validation.c
@@ -331,7 +331,7 @@ nxt_conf_vldt_type(nxt_conf_validation_t *vldt, nxt_str_t *name,
 
     p = buf;
 
-    n = __builtin_popcount(type);
+    n = nxt_popcount(type);
 
     if (n > 1) {
         p = nxt_cpymem(p, "either ", 7);
-- 
cgit