diff options
author | Yann Collet <Cyan4973@users.noreply.github.com> | 2021-08-09 19:58:58 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-09 19:58:58 (GMT) |
commit | e78eeec86e696f318a0ad1e71d6ad50555d1c0a9 (patch) | |
tree | cb5e7e6c965cad6d89a154d729d8168833a35ba0 /lib | |
parent | 57ed27f46ef2870c2d692d82ec7d4fcb759bfba9 (diff) | |
parent | 1a2e8f4e3077cdafbaf15278bfe393c64263215c (diff) | |
download | lz4-e78eeec86e696f318a0ad1e71d6ad50555d1c0a9.zip lz4-e78eeec86e696f318a0ad1e71d6ad50555d1c0a9.tar.gz lz4-e78eeec86e696f318a0ad1e71d6ad50555d1c0a9.tar.bz2 |
Merge pull request #1017 from fanzeyi/fix-clang-cl-msvc
fix clang-cl _tzcnt_u64 not defined issue
Diffstat (limited to 'lib')
-rw-r--r-- | lib/lz4.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -516,8 +516,14 @@ static unsigned LZ4_NbCommonBytes (reg_t val) if (LZ4_isLittleEndian()) { if (sizeof(val) == 8) { # if defined(_MSC_VER) && (_MSC_VER >= 1800) && defined(_M_AMD64) && !defined(LZ4_FORCE_SW_BITCOUNT) +# if defined(__clang__) && (__clang_major__ < 10) + /* Avoid undefined clang-cl intrinics issue. + * See https://github.com/lz4/lz4/pull/1017 for details. */ + return (unsigned)__builtin_ia32_tzcnt_u64(val) >> 3; +# else /* x64 CPUS without BMI support interpret `TZCNT` as `REP BSF` */ return (unsigned)_tzcnt_u64(val) >> 3; +# endif # elif defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT) unsigned long r = 0; _BitScanForward64(&r, (U64)val); |