From 8f668f06ca033e8b4292b4ceeb87f3078a996742 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Wed, 17 Feb 2021 10:49:19 -0800
Subject: [PATCH] Use Bits library for bit instrisics.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 common/exclusive_state_groups.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/exclusive_state_groups.h b/common/exclusive_state_groups.h
index 548dfe4b..c9b0df66 100644
--- a/common/exclusive_state_groups.h
+++ b/common/exclusive_state_groups.h
@@ -24,6 +24,8 @@
 #error Include after "nextpnr.h" only.
 #endif
 
+#include "bits.h"
+
 NEXTPNR_NAMESPACE_BEGIN
 
 // Implementation for exclusive state groups, used to implement generic
@@ -103,10 +105,10 @@ template <size_t StateCount, typename StateType = int8_t, typename CountType = u
 
             // Check whether the state group is now unselected or satified.
             auto value = selected_states.to_ulong();
-            auto number_selected = __builtin_popcount(value);
+            auto number_selected = nextpnr::Bits::popcount(value);
             if (number_selected == 1) {
                 // Group is no longer overconstrained.
-                state = __builtin_ctz(value);
+                state = nextpnr::Bits::ctz(value);
                 NPNR_ASSERT(selected_states[state]);
             } else if (number_selected == 0) {
                 // Group is unselected.