x86_64-xlate.pl: fix LNK4078 and LNK4210 link warnings.
authorAndy Polyakov <appro@openssl.org>
Sun, 10 Oct 2010 21:07:55 +0000 (21:07 +0000)
committerAndy Polyakov <appro@openssl.org>
Sun, 10 Oct 2010 21:07:55 +0000 (21:07 +0000)
PR 2356

crypto/perlasm/x86_64-xlate.pl

index 5eb7883..3acac96 100755 (executable)
@@ -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;