summaryrefslogtreecommitdiff
path: root/deps/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'deps/openssl')
-rw-r--r--deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm2
-rwxr-xr-xdeps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl3
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;