From 9b22944b68a91dc41015022679779472c75d4e9b Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 8 Nov 2012 23:54:53 +0100 Subject: [PATCH] windows: fix the x64 debug build --- deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm | 2 +- deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm b/deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm index db26276770c925..cdf7f90ca0a701 100644 --- a/deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm +++ b/deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm @@ -1,6 +1,6 @@ OPTION DOTNAME EXTERN OPENSSL_cpuid_setup:NEAR -.CRT$XCU SEGMENT READONLY DWORD +.CRT$XCU SEGMENT READONLY ALIGN(8) DQ OPENSSL_cpuid_setup .CRT$XCU ENDS diff --git a/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl b/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl index e47116b74b7ee1..674da3b7e67708 100755 --- a/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl +++ b/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl @@ -555,7 +555,8 @@ $v.=" READONLY"; $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref); } elsif ($line=~/\.CRT\$/i) { - $v.=" READONLY DWORD"; + $v.=" READONLY "; + $v.=$masm>=$masmref ? "ALIGN(8)" : "DWORD"; } } $current_segment = $line;