diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-11-08 23:54:53 +0100 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-11-08 23:54:53 +0100 |
| commit | 9b22944b68a91dc41015022679779472c75d4e9b (patch) | |
| tree | 71e3d41522fbe817b4c62e1772b807437cc8292a /deps/openssl | |
| parent | 44dd2c392a1378c081b5b21cf5d987e7509457c9 (diff) | |
| download | node-new-9b22944b68a91dc41015022679779472c75d4e9b.tar.gz | |
windows: fix the x64 debug build
Diffstat (limited to 'deps/openssl')
| -rw-r--r-- | deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm | 2 | ||||
| -rwxr-xr-x | 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 db26276770..cdf7f90ca0 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 e47116b74b..674da3b7e6 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 @@ 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; |