>From 0dfa3015c0cf4bb2fb21a06781dc4b5b326a855d Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sun, 22 Dec 2019 09:32:07 +0100
Subject: [PATCH 01/15] count-leading-zeros: Assume that the compiler supports
 'long long'.

* lib/count-leading-zeros.h (count_leading_zeros_ll): Define
unconditionally.
* m4/count-leading-zeros.m4: Remove file.
* modules/count-leading-zeros (Files): Remove it.
(configure.ac): Don't invoke gl_COUNT_LEADING_ZEROS.
* tests/test-count-leading-zeros.c (main): Test count_leading_zeros_ll
unconditionally.
---
 ChangeLog                        | 11 +++++++++++
 lib/count-leading-zeros.h        |  2 --
 m4/count-leading-zeros.m4        | 12 ------------
 modules/count-leading-zeros      |  2 --
 tests/test-count-leading-zeros.c |  2 --
 5 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 m4/count-leading-zeros.m4

diff --git a/ChangeLog b/ChangeLog
index 5ac5ee6..3e772e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2019-12-22  Bruno Haible  <address@hidden>
 
+	count-leading-zeros: Assume that the compiler supports 'long long'.
+	* lib/count-leading-zeros.h (count_leading_zeros_ll): Define
+	unconditionally.
+	* m4/count-leading-zeros.m4: Remove file.
+	* modules/count-leading-zeros (Files): Remove it.
+	(configure.ac): Don't invoke gl_COUNT_LEADING_ZEROS.
+	* tests/test-count-leading-zeros.c (main): Test count_leading_zeros_ll
+	unconditionally.
+
+2019-12-22  Bruno Haible  <address@hidden>
+
 	localcharset: Update support for OpenBSD.
 	* lib/localcharset.c (alias_table): Map "US-ASCII" to "ASCII".
 
diff --git a/lib/count-leading-zeros.h b/lib/count-leading-zeros.h
index cf867ac..ba573ca 100644
--- a/lib/count-leading-zeros.h
+++ b/lib/count-leading-zeros.h
@@ -100,7 +100,6 @@ count_leading_zeros_l (unsigned long int x)
   COUNT_LEADING_ZEROS (__builtin_clzl, _BitScanReverse, unsigned long int);
 }
 
-#if HAVE_UNSIGNED_LONG_LONG_INT
 /* Compute and return the number of leading zeros in X. */
 COUNT_LEADING_ZEROS_INLINE int
 count_leading_zeros_ll (unsigned long long int x)
@@ -108,7 +107,6 @@ count_leading_zeros_ll (unsigned long long int x)
   COUNT_LEADING_ZEROS (__builtin_clzll, _BitScanReverse64,
                        unsigned long long int);
 }
-#endif
 
 _GL_INLINE_HEADER_END
 
diff --git a/m4/count-leading-zeros.m4 b/m4/count-leading-zeros.m4
deleted file mode 100644
index efe31f9..0000000
--- a/m4/count-leading-zeros.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# count-leading-zeros.m4 serial 2
-dnl Copyright (C) 2012-2019 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_COUNT_LEADING_ZEROS],
-[
-  dnl We don't need (and can't compile) count_leading_zeros_ll
-  dnl unless the type 'unsigned long long int' exists.
-  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-])
diff --git a/modules/count-leading-zeros b/modules/count-leading-zeros
index f6ec283..09a910d 100644
--- a/modules/count-leading-zeros
+++ b/modules/count-leading-zeros
@@ -4,14 +4,12 @@ Counts the number of leading 0-bits in a word.
 Files:
 lib/count-leading-zeros.c
 lib/count-leading-zeros.h
-m4/count-leading-zeros.m4
 
 Depends-on:
 extern-inline
 verify
 
 configure.ac:
-gl_COUNT_LEADING_ZEROS
 
 Makefile.am:
 lib_SOURCES += count-leading-zeros.c
diff --git a/tests/test-count-leading-zeros.c b/tests/test-count-leading-zeros.c
index e94e37e..76f6f96 100644
--- a/tests/test-count-leading-zeros.c
+++ b/tests/test-count-leading-zeros.c
@@ -68,10 +68,8 @@ main (int argc, char *argv[])
                             UINT_BIT, UINT_MAX, 1U);
   TEST_COUNT_LEADING_ZEROS (count_leading_zeros_l, unsigned long int,
                             ULONG_BIT, ULONG_MAX, 1UL);
-#ifdef HAVE_UNSIGNED_LONG_LONG_INT
   TEST_COUNT_LEADING_ZEROS (count_leading_zeros_ll, unsigned long long int,
                             ULLONG_BIT, ULLONG_MAX, 1ULL);
-#endif
 
   return 0;
 }
-- 
2.7.4