From: Andy Polyakov <appro@openssl.org>
Date: Tue, 28 Feb 2012 14:20:34 +0000 (+0000)
Subject: x86cpuid.pl: fix processor capability detection on pre-586 [from HEAD].
X-Git-Tag: OpenSSL_1_0_1~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5c2bfad9b47d494fba7bedb7af6eef480e238726;p=oweals%2Fopenssl.git

x86cpuid.pl: fix processor capability detection on pre-586 [from HEAD].
---

diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
index 97adde383b..39fd8f2293 100644
--- a/crypto/x86cpuid.pl
+++ b/crypto/x86cpuid.pl
@@ -19,9 +19,9 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
 	&pushf	();
 	&pop	("eax");
 	&xor	("ecx","eax");
-	&bt	("ecx",21);
-	&jnc	(&label("generic"));
 	&xor	("eax","eax");
+	&bt	("ecx",21);
+	&jnc	(&label("nocpuid"));
 	&cpuid	();
 	&mov	("edi","eax");		# max value for standard query level
 
@@ -136,6 +136,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
 &set_label("done");
 	&mov	("eax","esi");
 	&mov	("edx","ebp");
+&set_label("nocpuid");
 &function_end("OPENSSL_ia32_cpuid");
 
 &external_label("OPENSSL_ia32cap_P");