From: Jia Tan Date: Thu, 1 Feb 2024 08:06:29 +0000 (+0800) Subject: liblzma: Check HAVE_USABLE_CLMUL before omitting CRC64 table. X-Git-Tag: v5.5.2beta~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca9015f4dead2c97b48f5a6933631b0a448b65b9;p=thirdparty%2Fxz.git liblzma: Check HAVE_USABLE_CLMUL before omitting CRC64 table. If liblzma is configured with --disable-clmul-crc CFLAGS="-msse4.1 -mpclmul", then it will fail to compile because the generic version must be used but the CRC tables were not included. --- diff --git a/src/liblzma/check/crc64_table.c b/src/liblzma/check/crc64_table.c index 0ae9dda8..806a9ce3 100644 --- a/src/liblzma/check/crc64_table.c +++ b/src/liblzma/check/crc64_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 crc64_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