From 2b0fb522ad819179cf8690e6b342d832eed160fe Mon Sep 17 00:00:00 2001
From: "Diego F. Aranha" <dfaranha@gmail.com>
Date: Thu, 4 Jul 2024 22:11:12 +0200
Subject: [PATCH] Another attempt to fix.

---
 src/arch/relic_arch_none.c | 4 ++--
 src/arch/relic_arch_x86.c  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/arch/relic_arch_none.c b/src/arch/relic_arch_none.c
index 394022a42..98f57e744 100644
--- a/src/arch/relic_arch_none.c
+++ b/src/arch/relic_arch_none.c
@@ -83,7 +83,7 @@ uint_t arch_lzcnt(dig_t a) {
 #ifdef _MSC_VER
     return __lzcnt64(a);
 #else
-	return __builtin_clzll(a);
+	return __builtin_clzl(a);
 #endif
 #endif
 }
@@ -126,7 +126,7 @@ uint_t arch_tzcnt(dig_t a) {
 #ifdef _MSC_VER
     return __tzcnt64(a);
 #else
-	return __builtin_ctzll(a);
+	return __builtin_ctzl(a);
 #endif
 #endif
 }
diff --git a/src/arch/relic_arch_x86.c b/src/arch/relic_arch_x86.c
index a97388a70..2f0bbac2f 100644
--- a/src/arch/relic_arch_x86.c
+++ b/src/arch/relic_arch_x86.c
@@ -49,6 +49,7 @@ void arch_init(void) {
 
 void arch_clean(void) {
 	core_get()->lzcnt_ptr = NULL;
+	core_get()->tzcnt_ptr = NULL;
 }
 
 ull_t arch_cycles(void) {