From d6522548dd0e7fce338a5b1384dc09823493a6a4 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Sun, 10 Oct 2010 21:07:55 +0000
Subject: [PATCH] x86_64-xlate.pl: fix LNK4078 and LNK4210 link warnings. PR
2356
---
crypto/perlasm/x86_64-xlate.pl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 5eb7883f96..3acac96f19 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -167,7 +167,7 @@ my %globals;
} elsif ($self->{op} =~ /^(pop|push)f/) {
$self->{op} .= $self->{sz};
} elsif ($self->{op} eq "call" && $current_segment eq ".CRT\$XCU") {
- $self->{op} = "ALIGN\t8\n\tDQ";
+ $self->{op} = "\tDQ";
}
$self->{op};
}
@@ -546,6 +546,8 @@ my %globals;
if ($line=~/\.([px])data/) {
$v.=" rdata align=";
$v.=$1 eq "p"? 4 : 8;
+ } elsif ($line=~/\.CRT\$/i) {
+ $v.=" rdata align=8";
}
} else {
$v="$current_segment\tENDS\n" if ($current_segment);
@@ -553,6 +555,8 @@ my %globals;
if ($line=~/\.([px])data/) {
$v.=" READONLY";
$v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
+ } elsif ($line=~/\.CRT\$/i) {
+ $v.=" READONLY DWORD";
}
}
$current_segment = $line;
--
2.25.1