The branch master has been updated via 1bb7310bf8d62e5a6f4f82b34f249d86b8e42377 (commit) from 2ecb9f2d18614fb7b7b42830a358b7163ed43221 (commit)
- Log ----------------------------------------------------------------- commit 1bb7310bf8d62e5a6f4f82b34f249d86b8e42377 Author: Gergely Nagy <n...@tresorit.com> Date: Tue Aug 16 14:46:13 2016 +0200 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 <ap...@openssl.org> Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1459) ----------------------------------------------------------------------- Summary of changes: crypto/perlasm/x86masm.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl index a0a354c..d352f47 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 _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits