From: Gergely Nagy <ngg@tresorit.com>
Date: Tue, 16 Aug 2016 12:46:13 +0000 (+0200)
Subject: Fix compilation when using MASM on x86
X-Git-Tag: OpenSSL_1_1_0~172
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=1bb7310bf8d62e5a6f4f82b34f249d86b8e42377

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 a0a354c8fc..d352f47055 100644
--- 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
-.486
+.686
 .MODEL	FLAT
 OPTION	DOTNAME
 IF \@Version LT 800