aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2024-02-27 07:18:09 -0600
committerBrent Cook <busterb@gmail.com>2024-02-27 07:18:09 -0600
commitd8702f6951420d7641e02c04c8ce4db5762ddb07 (patch)
treeb17ae03e53ed2befaf55883492bf1e293e2a7026 /patches
parent53edbd00c12ee1d27f1b9533933b32781125c758 (diff)
downloadportable-d8702f6951420d7641e02c04c8ce4db5762ddb07.tar.gz
portable-d8702f6951420d7641e02c04c8ce4db5762ddb07.tar.bz2
portable-d8702f6951420d7641e02c04c8ce4db5762ddb07.zip
upstreamed masm alignment fix
Diffstat (limited to 'patches')
-rw-r--r--patches/asm/masm-align-64.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/patches/asm/masm-align-64.patch b/patches/asm/masm-align-64.patch
deleted file mode 100644
index ba41c71..0000000
--- a/patches/asm/masm-align-64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1commit 3797e05de28ab07bb522898cbf022bdf67a71c99
2Author: Brent Cook <busterb@gmail.com>
3Date: Sun Feb 4 22:53:59 2024 -0600
4
5 align read-only sections on masm/windows to 64 bytes
6
7 Avoid conflicts where alignment is specified later in the underlying
8 assembly.
9
10diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
11index 5dbed2a8c..d8b607b5c 100755
12--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
13+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
14@@ -567,7 +567,15 @@ my %globals;
15 $v.="$line\tSEGMENT";
16 if ($line=~/\.([prx])data/) {
17 $v.=" READONLY";
18- $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
19+ if ($masm>=$masmref) {
20+ if ($1 eq "r") {
21+ $v.=" ALIGN(64)";
22+ } elsif ($1 eq "p") {
23+ $v.=" ALIGN(4)";
24+ } else {
25+ $v.=" ALIGN(8)";
26+ }
27+ }
28 } elsif ($line=~/\.CRT\$/i) {
29 $v.=" READONLY ";
30 $v.=$masm>=$masmref ? "ALIGN(8)" : "DWORD";