From: Jia Tan Date: Thu, 1 Feb 2024 08:07:03 +0000 (+0800) Subject: liblzma: Check HAVE_USABLE_CLMUL before omitting CRC32 table. X-Git-Tag: v5.5.2beta~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97f9ba50b84e67b3dcb5b17dd5d3e1d14f9ad1d0;p=thirdparty%2Fxz.git liblzma: Check HAVE_USABLE_CLMUL before omitting CRC32 table. This was split from the prior commit so it could be easily applied to the 5.4 branch. Closes: https://github.com/tukaani-project/xz/pull/77 --- diff --git a/src/liblzma/check/crc32_table.c b/src/liblzma/check/crc32_table.c index 41a80dcb..09b00fa3 100644 --- a/src/liblzma/check/crc32_table.c +++ b/src/liblzma/check/crc32_table.c @@ -15,9 +15,9 @@ // FIXME: Compared to crc_common.h this has to check for __x86_64__ too // so that in 32-bit builds crc32_x86.S won't break due to a missing table. -#if (defined(__x86_64__) && defined(__SSSE3__) \ +#if defined(HAVE_USABLE_CLMUL) && ((defined(__x86_64__) && defined(__SSSE3__) \ && defined(__SSE4_1__) && defined(__PCLMUL__)) \ - || (defined(__e2k__) && __iset__ >= 6) + || (defined(__e2k__) && __iset__ >= 6)) # define X86_CLMUL_NO_TABLE 1 #endif