Fixes

Author: Larhzu

CMakeLists.txt

@@ -1379,6 +1379,13 @@ if(XZ_ARM64_CRC32)
         check_symbol_exists(getauxval sys/auxv.h HAVE_GETAUXVAL)
         tuklib_add_definition_if(liblzma HAVE_GETAUXVAL)
 
+        # With getauxval() we also need HWCAP_CRC32 which was
+        # added in glibc 2.24.
+        if(HAVE_GETAUXVAL)
+            check_symbol_exists(HWCAP_CRC32 sys/auxv.h HAVE_HWCAP_CRC32)
+            tuklib_add_definition_if(liblzma HAVE_HWCAP_CRC32)
+        endif()
+
         # elf_aux_info() is supported on FreeBSD and OpenBSD >= 7.6.
         check_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO)
         tuklib_add_definition_if(liblzma HAVE_ELF_AUX_INFO)

configure.ac

@@ -1180,6 +1180,9 @@ int main(void)
 #
 AS_IF([test "x$enable_arm64_crc32" = xyes], [
 	AC_CHECK_FUNCS([getauxval elf_aux_info sysctlbyname], [break])
+	AC_CHECK_DECL([HWCAP_CRC32], [AC_DEFINE([HAVE_HWCAP_CRC32], [1],
+		[Define to 1 if 'HWCAP_CRC32' is declared in <sys/auxv.h>.])],
+		[], [[#include <sys/auxv.h>]])
 ])
 
 

src/liblzma/check/crc32_arm64.h

@@ -23,7 +23,7 @@
 // If both versions are going to be built, we need runtime detection
 // to check if the instructions are supported.
 #if defined(CRC32_GENERIC) && defined(CRC32_ARCH_OPTIMIZED)
-#	if (defined(HAVE_GETAUXVAL) && defined(HWCAP_CRC32)) \
+#	if (defined(HAVE_GETAUXVAL) && defined(HAVE_HWCAP_CRC32)) \
 			|| defined(HAVE_ELF_AUX_INFO)
 #		include <sys/auxv.h>
 #	elif defined(_WIN32)
@@ -104,7 +104,7 @@ crc32_arch_optimized(const uint8_t *buf, size_t size, uint32_t crc)
 static inline bool
 is_arch_extension_supported(void)
 {
-#if defined(HAVE_GETAUXVAL) && defined(HWCAP_CRC32)
+#if defined(HAVE_GETAUXVAL) && defined(HAVE_HWCAP_CRC32)
 #error "test"
 	return (getauxval(AT_HWCAP) & HWCAP_CRC32) != 0;
 

src/liblzma/check/crc_common.h

@@ -90,7 +90,7 @@ extern const uint64_t lzma_crc64_table[4][256];
 //
 // Keep this in sync with changes to crc32_arm64.h
 #if defined(_WIN32) \
-		|| (defined(HAVE_GETAUXVAL) && defined(HWCAP_CRC32)) \
+		|| (defined(HAVE_GETAUXVAL) && defined(HAVE_HWCAP_CRC32)) \
 		|| defined(HAVE_ELF_AUX_INFO) \
 		|| (defined(__APPLE__) && defined(HAVE_SYSCTLBYNAME))
 #	define CRC_ARM64_RUNTIME_DETECTION 1