summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedor Indutny <fedor.indutny@gmail.com>2014-01-08 23:05:01 +0400
committerJulien Gilli <julien.gilli@joyent.com>2015-07-09 14:09:03 -0700
commit7ad593877e4b3fae04652037cc6d7106dc87109a (patch)
tree63f876e905db13f5a371d646b5c0db327f5059ba
parent984e7f9e405b7b427d6bd1ee1e89d224521a8da5 (diff)
downloadnode-7ad593877e4b3fae04652037cc6d7106dc87109a.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 . PR: #9451 PR-URL: https://github.com/joyent/node/pull/9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: https://github.com/joyent/node/pull/25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: https://github.com/joyent/node/pull/25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
-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 f937d07c8..6b33b146f 100644
--- a/deps/openssl/openssl/crypto/perlasm/x86masm.pl
+++ b/deps/openssl/openssl/crypto/perlasm/x86masm.pl
@@ -80,7 +80,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