3 files changed, 3 insertions, 3 deletions

diff --git a/lib/libc/string/fls.c b/lib/libc/string/fls.c
index ac5fb7738722..dfc8397056cb 100644
--- a/lib/libc/string/fls.c
+++ b/lib/libc/string/fls.c
@@ -42,5 +42,5 @@
 int
 fls(int mask)
 {
-	return (mask == 0 ? 0 : CHAR_BIT * sizeof(mask) - __builtin_clz(mask));
+	return (mask == 0 ? 0 : INT_WIDTH - __builtin_clz(mask));
 }
diff --git a/lib/libc/string/flsl.c b/lib/libc/string/flsl.c
index d88c8dfcdc63..c6457c1382bb 100644
--- a/lib/libc/string/flsl.c
+++ b/lib/libc/string/flsl.c
@@ -43,5 +43,5 @@
 int
 flsl(long mask)
 {
-	return (mask == 0 ? 0 : CHAR_BIT * sizeof(mask) - __builtin_clzl(mask));
+	return (mask == 0 ? 0 : LONG_WIDTH - __builtin_clzl(mask));
 }
diff --git a/lib/libc/string/flsll.c b/lib/libc/string/flsll.c
index 635ebacddf18..bf11f7c338f1 100644
--- a/lib/libc/string/flsll.c
+++ b/lib/libc/string/flsll.c
@@ -42,5 +42,5 @@
 int
 flsll(long long mask)
 {
-	return (mask == 0 ? 0 : CHAR_BIT * sizeof(mask) - __builtin_clzll(mask));
+	return (mask == 0 ? 0 : LLONG_WIDTH - __builtin_clzll(mask));
 }