Browse Source

windows: fix the x64 debug build

v0.8.15-release
Bert Belder 12 years ago
parent
commit
9b22944b68
  1. 2
      deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm
  2. 3
      deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl

2
deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm

@ -1,6 +1,6 @@
OPTION DOTNAME OPTION DOTNAME
EXTERN OPENSSL_cpuid_setup:NEAR EXTERN OPENSSL_cpuid_setup:NEAR
.CRT$XCU SEGMENT READONLY DWORD .CRT$XCU SEGMENT READONLY ALIGN(8)
DQ OPENSSL_cpuid_setup DQ OPENSSL_cpuid_setup
.CRT$XCU ENDS .CRT$XCU ENDS

3
deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl

@ -555,7 +555,8 @@ my %globals;
$v.=" READONLY"; $v.=" READONLY";
$v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref); $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
} elsif ($line=~/\.CRT\$/i) { } elsif ($line=~/\.CRT\$/i) {
$v.=" READONLY DWORD"; $v.=" READONLY ";
$v.=$masm>=$masmref ? "ALIGN(8)" : "DWORD";
} }
} }
$current_segment = $line; $current_segment = $line;

Loading…
Cancel
Save