Skip to content

Commit

Permalink
deps: fix openssl assembly error on ia32 win32
Browse files Browse the repository at this point in the history 
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .

Fixes: #589
PR-URL: #1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
  • Loading branch information
@indutny @rvagg
indutny authored and rvagg committed Aug 15, 2018
1 parent 1b93677 commit 46e4917
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion deps/openssl/openssl/crypto/perlasm/x86masm.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ sub ::file
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
Expand Down

2 comments on commit 46e4917

@sam-github
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@indutny @rvagg @shigeki Is there any reason not to upstream this to OpenSSL?

@shigeki
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sam-github This is because masm is not officially supported by OpenSSL. We switched to use nasm in Node-v10.

Please sign in to comment.