]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
MASM: Need to strip arguments after .pdata or .xdata
authorKelvin Lee <kiyolee@gmail.com>
Mon, 24 Jun 2024 11:09:03 +0000 (21:09 +1000)
committerTomas Mraz <tomas@openssl.org>
Wed, 26 Jun 2024 10:03:45 +0000 (12:03 +0200)
For MASM,

.section .pdata,"r"

got translated to:

.pdata,"r"    SEGMENT READONLY ALIGN(4)

that breaks ml64.
Previous version of x86_64-xlate.pl did strip that ',"r"'.

CLA: trivial

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Sasa Nedvedicky <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24714)

crypto/perlasm/x86_64-xlate.pl

index 3befbde019418e6798a7997c6d2a2f88f0107b26..f9935dd9aa90d68d1cac95f42db7e79a92021bc8 100755 (executable)
@@ -1012,6 +1012,7 @@ my %globals;
                                    $align = $$line;
                                    $align =~ s/(.*)(align\s*=\s*\d+$)/$2/;
                                    $$line =~ s/(.*)(\s+align\s*=\s*\d+$)/$1/;
+                                   $$line =~ s/,.*//;
                                    $$line = ".CRT\$XCU" if ($$line eq ".init");
                                    $$line = ".rdata" if ($$line eq ".rodata");
                                    if ($nasm) {