From: Adam Stylinski <kungfujesus06@gmail.com>
Date: Sun, 23 Jan 2022 01:47:45 +0000 (-0500)
Subject: Fixed inadvertent breakage of CPUID usage
X-Git-Tag: 2.1.0-beta1~431
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c805aaecc939c158f4b9773f5c7c629d42aad0e1;p=thirdparty%2Fzlib-ng.git

Fixed inadvertent breakage of CPUID usage

In removing the AVX512 "well-suited" flag, a second cpuid call that's
needed for feature detection was accidently removed.  This brings that
back.
---

diff --git a/arch/x86/x86.c b/arch/x86/x86.c
index 3398426e..945b29ef 100644
--- a/arch/x86/x86.c
+++ b/arch/x86/x86.c
@@ -62,6 +62,7 @@ void Z_INTERNAL x86_check_features(void) {
     unsigned maxbasic;
 
     cpuid(0, &maxbasic, &ebx, &ecx, &edx);
+    cpuid(1 /*CPU_PROCINFO_AND_FEATUREBITS*/, &eax, &ebx, &ecx, &edx);
 
     x86_cpu_has_sse2 = edx & 0x4000000;
     x86_cpu_has_ssse3 = ecx & 0x200;