diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-23 19:50:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-23 19:50:13 +0000 |
| commit | b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b (patch) | |
| tree | 4722cd31e41fdda28e5c2b37bdf8500d27868384 /openssl/crypto/perlasm | |
| parent | 8cd59857a99c534c560f58c931f5c2466d4c1f9b (diff) | |
| download | vcxsrv-b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b.tar.gz vcxsrv-b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b.tar.bz2 vcxsrv-b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b.zip | |
Updated to openssl-1.0.0c
Diffstat (limited to 'openssl/crypto/perlasm')
| -rw-r--r-- | openssl/crypto/perlasm/x86_64-xlate.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openssl/crypto/perlasm/x86_64-xlate.pl b/openssl/crypto/perlasm/x86_64-xlate.pl index 354673acc..e47116b74 100644 --- a/openssl/crypto/perlasm/x86_64-xlate.pl +++ b/openssl/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}; } @@ -545,6 +545,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); @@ -552,6 +554,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; |