From c66408cd0ce2c993d2cacaf175992e2edd80502f Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Wed, 8 Jan 2014 23:05:01 +0400 Subject: [PATCH] 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 PR: #25523 PR-URL: https://github.com/joyent/node/pull/25523 Reviewed-By: Julien Gilli PR: #25654 PR-URL: https://github.com/joyent/node/pull/25654 Reviewed-By: Julien Gilli --- deps/openssl/openssl/crypto/perlasm/x86masm.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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