From 848f53c1d3c1362c86d3baab6906e1e4419d2634 Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Thu, 19 Jan 2023 04:23:44 +0100
Subject: [PATCH] Revert "Add bit manipulation functions"

Now that we optimized csrand_uniform(), we don't need these functions.

This reverts commit 7c8fe291b1260e127c10562bfd7616961013730f.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
 lib/bit.h           | 41 -----------------------------------------
 libmisc/Makefile.am |  1 -
 libmisc/bit.c       | 18 ------------------
 3 files changed, 60 deletions(-)
 delete mode 100644 lib/bit.h
 delete mode 100644 libmisc/bit.c

diff --git a/lib/bit.h b/lib/bit.h
deleted file mode 100644
index 24692557..00000000
--- a/lib/bit.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * SPDX-FileCopyrightText:  Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
-
-
-#ifndef SHADOW_INCLUDE_LIB_BIT_H_
-#define SHADOW_INCLUDE_LIB_BIT_H_
-
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include <limits.h>
-
-
-inline unsigned long bit_ceil_wrapul(unsigned long x);
-inline int leading_zerosul(unsigned long x);
-
-
-/* stdc_bit_ceilul(3), but wrap instead of having Undefined Behavior */
-inline unsigned long
-bit_ceil_wrapul(unsigned long x)
-{
-	if (x == 0)
-		return 0;
-
-	return 1 + (ULONG_MAX >> leading_zerosul(x));
-}
-
-/* stdc_leading_zerosul(3) */
-inline int
-leading_zerosul(unsigned long x)
-{
-	return (x == 0) ? ULONG_WIDTH : __builtin_clz(x);
-}
-
-
-#endif  // include guard
diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
index ab363f54..b4ca708d 100644
--- a/libmisc/Makefile.am
+++ b/libmisc/Makefile.am
@@ -12,7 +12,6 @@ libmisc_la_SOURCES = \
 	agetpass.c \
 	audit_help.c \
 	basename.c \
-	bit.c \
 	chkname.c \
 	chkname.h \
 	chowndir.c \
diff --git a/libmisc/bit.c b/libmisc/bit.c
deleted file mode 100644
index 39efd568..00000000
--- a/libmisc/bit.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText:  Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
-
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "bit.h"
-
-#include <limits.h>
-
-
-extern inline unsigned long bit_ceil_wrapul(unsigned long x);
-extern inline int leading_zerosul(unsigned long x);