summaryrefslogtreecommitdiff
path: root/lib/count-trailing-zeros.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-01-06 09:05:22 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-01-06 09:05:47 -0800
commit987cb086f36e1f39644589c19b88d306b9476c82 (patch)
tree1f0422cec47920fd80fc154c86e353d074f78ac2 /lib/count-trailing-zeros.h
parentba8e4c8d984cfd05991647b14caee495be36febe (diff)
downloadgnulib-987cb086f36e1f39644589c19b88d306b9476c82.tar.gz
count-leading-zeros: use 64-bit intrinsics on 32-bit Windows
This reverts the last patch but one, as it shouldn't be needed now that the typo is fixed. * lib/count-leading-zeros.h (count_leading_zeros_ll): * lib/count-trailing-zeros.h: * lib/count-one-bits.h: Go back to using 64-bit intrinsics.
Diffstat (limited to 'lib/count-trailing-zeros.h')
-rw-r--r--lib/count-trailing-zeros.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/count-trailing-zeros.h b/lib/count-trailing-zeros.h
index 1e71977fab..83ce2fbe26 100644
--- a/lib/count-trailing-zeros.h
+++ b/lib/count-trailing-zeros.h
@@ -96,13 +96,8 @@ count_trailing_zeros_l (unsigned long int x)
COUNT_TRAILING_ZEROS_INLINE int
count_trailing_zeros_ll (unsigned long long int x)
{
-# if _MSC_VER && ! defined _M_X64
- int count = count_trailing_zeros (x);
- return count < 32 ? count : 32 + count_trailing_zeros (x >> 31 >> 1);
-# else
COUNT_TRAILING_ZEROS (__builtin_ctzll, _BitScanForward64,
unsigned long long int);
-# endif
}
#endif