Fix compilation when using MASM on x86

The generated asm code from x86cpuid.pl contains CMOVE instructions
which are only available on i686 and later CPUs.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1459)

diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl
index a0a354c8fc36be6af9410b4d03337eb160cab962..d352f47055ea11ba92af53cb8ca8251bd5226824 100644 (file)
--- a/crypto/perlasm/x86masm.pl
+++ b/crypto/perlasm/x86masm.pl
@@ -89,7 +89,7 @@ TITLE $_[0].asm
 IF \@Version LT 800
 ECHO MASM version 8.00 or later is strongly recommended.
 ENDIF
 IF \@Version LT 800
 ECHO MASM version 8.00 or later is strongly recommended.
 ENDIF

-.486
+.686

 .MODEL FLAT
 OPTION DOTNAME
 IF \@Version LT 800
 .MODEL FLAT
 OPTION DOTNAME
 IF \@Version LT 800