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

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

diff --git a/ChangeLog b/ChangeLog
index 3e772e4..e68cfa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2019-12-22  Bruno Haible  <address@hidden>
 
+	count-trailing-zeros: Assume that the compiler supports 'long long'.
+	* lib/count-trailing-zeros.h (count_trailing_zeros_ll): Define
+	unconditionally.
+	* m4/count-trailing-zeros.m4: Remove file.
+	* modules/count-trailing-zeros (Files): Remove it.
+	(configure.ac): Don't invoke gl_COUNT_TRAILING_ZEROS.
+	* tests/test-count-trailing-zeros.c (main): Test count_trailing_zeros_ll
+	unconditionally.
+
 	count-leading-zeros: Assume that the compiler supports 'long long'.
 	* lib/count-leading-zeros.h (count_leading_zeros_ll): Define
 	unconditionally.
diff --git a/lib/count-trailing-zeros.h b/lib/count-trailing-zeros.h
index 7988e4b..d481aca 100644
--- a/lib/count-trailing-zeros.h
+++ b/lib/count-trailing-zeros.h
@@ -92,7 +92,6 @@ count_trailing_zeros_l (unsigned long int x)
   COUNT_TRAILING_ZEROS (__builtin_ctzl, _BitScanForward, unsigned long int);
 }
 
-#if HAVE_UNSIGNED_LONG_LONG_INT
 /* Compute and return the number of trailing zeros in X. */
 COUNT_TRAILING_ZEROS_INLINE int
 count_trailing_zeros_ll (unsigned long long int x)
@@ -100,7 +99,6 @@ count_trailing_zeros_ll (unsigned long long int x)
   COUNT_TRAILING_ZEROS (__builtin_ctzll, _BitScanForward64,
                         unsigned long long int);
 }
-#endif
 
 _GL_INLINE_HEADER_END
 
diff --git a/m4/count-trailing-zeros.m4 b/m4/count-trailing-zeros.m4
deleted file mode 100644
index 94a8f7f..0000000
--- a/m4/count-trailing-zeros.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# count-trailing-zeros.m4
-dnl Copyright (C) 2013-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_TRAILING_ZEROS],
-[
-  dnl We don't need (and can't compile) count_trailing_zeros_ll
-  dnl unless the type 'unsigned long long int' exists.
-  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-])
diff --git a/modules/count-trailing-zeros b/modules/count-trailing-zeros
index 841cfda..daf24a0 100644
--- a/modules/count-trailing-zeros
+++ b/modules/count-trailing-zeros
@@ -4,13 +4,11 @@ Counts the number of trailing 0-bits in a word.
 Files:
 lib/count-trailing-zeros.c
 lib/count-trailing-zeros.h
-m4/count-trailing-zeros.m4
 
 Depends-on:
 extern-inline
 
 configure.ac:
-gl_COUNT_TRAILING_ZEROS
 
 Makefile.am:
 lib_SOURCES += count-trailing-zeros.c
diff --git a/tests/test-count-trailing-zeros.c b/tests/test-count-trailing-zeros.c
index 04d9ddc..adb795a 100644
--- a/tests/test-count-trailing-zeros.c
+++ b/tests/test-count-trailing-zeros.c
@@ -68,10 +68,8 @@ main (int argc, char *argv[])
                              UINT_BIT, UINT_MAX, 1U);
   TEST_COUNT_TRAILING_ZEROS (count_trailing_zeros_l, unsigned long int,
                              ULONG_BIT, ULONG_MAX, 1UL);
-#ifdef HAVE_UNSIGNED_LONG_LONG_INT
   TEST_COUNT_TRAILING_ZEROS (count_trailing_zeros_ll, unsigned long long int,
                              ULLONG_BIT, ULLONG_MAX, 1ULL);
-#endif
 
   return 0;
 }
-- 
2.7.4