From: anton <anton@openbsd.org>
Date: Tue, 4 Apr 2023 18:14:32 +0000 (+0000)
Subject: A refactoring back in 2016 in which magic numbers where extracted into
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d1b6b686e0466b0c096fa831be709714beb5826d;p=openbsd

A refactoring back in 2016 in which magic numbers where extracted into
named constants accidentally dropped an instruction causing detection of
eXtended operations (XOP) on AMD hardware to break.

ok miod@ tb@
---

diff --git a/lib/libcrypto/x86_64cpuid.pl b/lib/libcrypto/x86_64cpuid.pl
index 2780b0f8cec..1b67d1110f9 100644
--- a/lib/libcrypto/x86_64cpuid.pl
+++ b/lib/libcrypto/x86_64cpuid.pl
@@ -66,6 +66,7 @@ OPENSSL_ia32_cpuid:
 	mov	%eax,%r10d
 	mov	\$0x80000001,%eax
 	cpuid
+	or	%ecx,%r9d
 	and	\$IA32CAP_MASK1_AMD_XOP,%r9d	# isolate AMD XOP bit
 	or	\$1,%r9d			# make sure %r9d is not zero