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-03-23 17:48:13 -0700
commit9fb6cf1ebb5f763ace710705fdc54213aaabcb1b (patch)
tree329d66145b849e2befa93716ff10cf34b8d2c138
parent88744453120fa55b0f1634efc084a5e4c42b0927 (diff)
downloadnode-new-9fb6cf1ebb5f763ace710705fdc54213aaabcb1b.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>
-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 f937d07c87..6b33b146f0 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