summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl
diff options
context:
space:
mode:
authorFedor Indutny <fedor.indutny@gmail.com>2014-01-08 23:05:01 +0400
committerShigeki Ohtsu <ohtsu@ohtsu.org>2017-01-27 01:59:46 +0900
commit0af423cb04135ddf7a52830618ec43044818336d (patch)
treea85a8114f4b16c05832add50e577b14a6e12d441 /deps/openssl/openssl
parentc0eefcb4610577641f33c13a7369023cba1cbce8 (diff)
downloadandroid-node-v8-0af423cb04135ddf7a52830618ec43044818336d.tar.gz
android-node-v8-0af423cb04135ddf7a52830618ec43044818336d.tar.bz2
android-node-v8-0af423cb04135ddf7a52830618ec43044818336d.zip
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 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>
Diffstat (limited to 'deps/openssl/openssl')
-rw-r--r--deps/openssl/openssl/crypto/perlasm/x86masm.pl2
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