From: Fedor Indutny Date: Wed, 8 Jan 2014 19:05:01 +0000 (+0400) Subject: deps: fix openssl assembly error on ia32 win32 X-Git-Tag: v1.8.1~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d293a4f09668ff7dcd0e97cd44981d502d27a01a;p=platform%2Fupstream%2Fnodejs.git 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 Reviewed-By: Ben Noordhuis Reviewed-By: Shigeki Ohtsu --- diff --git a/deps/openssl/openssl/crypto/perlasm/x86masm.pl b/deps/openssl/openssl/crypto/perlasm/x86masm.pl index 1741342..786b3c4 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