mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 15:31:47 +08:00
b64343a250
Fixes https://github.com/microsoft/vcpkg/issues/39207 Call upstream PR [366](https://github.com/ebiggers/libdeflate/pull/366) to complete the fix.
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
diff --git a/lib/x86/adler32_impl.h b/lib/x86/adler32_impl.h
|
|
index ba559e6..00967e8 100644
|
|
--- a/lib/x86/adler32_impl.h
|
|
+++ b/lib/x86/adler32_impl.h
|
|
@@ -52,8 +52,15 @@
|
|
/*
|
|
* AVX-VNNI implementation. This is used on CPUs that have AVX2 and AVX-VNNI
|
|
* but don't have AVX-512, for example Intel Alder Lake.
|
|
+ *
|
|
+ * Unusually for a new CPU feature, gcc added support for the AVX-VNNI
|
|
+ * intrinsics (in gcc 11.1) slightly before binutils added support for
|
|
+ * assembling AVX-VNNI instructions (in binutils 2.36). Distros can reasonably
|
|
+ * have gcc 11 with binutils 2.35. Because of this issue, we check for gcc 12
|
|
+ * instead of gcc 11. (libdeflate supports direct compilation without a
|
|
+ * configure step, so checking the binutils version is not always an option.)
|
|
*/
|
|
-#if GCC_PREREQ(11, 1) || CLANG_PREREQ(12, 0, 13000000) || MSVC_PREREQ(1930)
|
|
+#if GCC_PREREQ(12, 1) || CLANG_PREREQ(12, 0, 13000000) || MSVC_PREREQ(1930)
|
|
# define adler32_x86_avx2_vnni adler32_x86_avx2_vnni
|
|
# define SUFFIX _avx2_vnni
|
|
# define ATTRIBUTES _target_attribute("avx2,avxvnni")
|