diff options
| author | Gergely Nagy <ngg@tresorit.com> | 2016-08-16 14:46:13 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-08-16 20:46:55 +0200 |
| commit | 1bb7310bf8d62e5a6f4f82b34f249d86b8e42377 (patch) | |
| tree | 51b1a3501a597ac797e2c4782aedacaf9e133245 /crypto/perlasm | |
| parent | Provide compat macros for SSL_CTX_set_ecdh_auto() and SSL_set_ecdh_auto() (diff) | |
| download | openssl-1bb7310bf8d62e5a6f4f82b34f249d86b8e42377.tar.xz openssl-1bb7310bf8d62e5a6f4f82b34f249d86b8e42377.zip | |
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)
Diffstat (limited to 'crypto/perlasm')
| -rw-r--r-- | crypto/perlasm/x86masm.pl | 2 |
1 files changed, 1 insertions, 1 deletions
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 |