windows: fix the x64 debug build

12 years ago · 9b22944b68
2 changed files with 3 additions and 2 deletions
--- 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
--- a/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl
+++ b/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl
@ -555,7 +555,8 @@ my %globals;
 					    $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;