diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2014-01-08 23:05:01 +0400 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2018-03-27 20:18:34 -0400 |
| commit | d67d0a63d9e29bc53556cbdb7352a944db46f143 (patch) | |
| tree | ef94bc469d5d54eede4e9537a36075b3977690c4 | |
| parent | 6af057ecc8d48ad1017c352c354cc4b059400fe6 (diff) | |
| download | node-new-d67d0a63d9e29bc53556cbdb7352a944db46f143.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 .
Backport-PR-URL: https://github.com/nodejs/node/pull/19638
Fixes: https://github.com/iojs/io.js/issues/589
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 |