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-06-17 12:55:20 -0700
commit81e30a11ba79fc5b7d77041956439e760669f9c4 (patch)
tree8a9f31306bfb29f391fac1fe8a1c52f7ad37e6d1
parent3937563d9aa7bddd18645679d486c5d9fdb0a155 (diff)
downloadnode-81e30a11ba79fc5b7d77041956439e760669f9c4.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>
-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