diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2014-01-08 23:05:01 +0400 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2017-09-19 10:52:05 -0400 |
| commit | 0bacd2dfed0ea69b3817eab9dcc4ce87519e2de2 (patch) | |
| tree | dad0e279f4864ab8f8a288d9967b1256cb56d529 | |
| parent | 283dd7387c8e12a3366ebf37dfd060096b0b5057 (diff) | |
| download | node-new-0bacd2dfed0ea69b3817eab9dcc4ce87519e2de2.tar.gz | |
deps: fix openssl assembly error on ia32 win32
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .
Fixes: https://github.com/iojs/io.js/issues/589
Backport-PR-URL: https://github.com/nodejs/node/pull/13696
PR-URL: https://github.com/iojs/io.js/pull/1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
| -rw-r--r-- | deps/openssl/openssl/crypto/perlasm/x86masm.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/openssl/openssl/crypto/perlasm/x86masm.pl b/deps/openssl/openssl/crypto/perlasm/x86masm.pl index 1741342c3a..786b3c483b 100644 --- a/deps/openssl/openssl/crypto/perlasm/x86masm.pl +++ b/deps/openssl/openssl/crypto/perlasm/x86masm.pl @@ -82,7 +82,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 |