1 files changed, 6 insertions, 7 deletions

diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
index e47116b74b..d66ad24095 100755
--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
@@ -66,7 +66,7 @@ if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
   my ($outdev,$outino,@junk)=stat($output);
 
     open STDOUT,">$output" || die "can't open $output: $!"
-        if ($stddev!=$outdev || $stdino!=$outino);
+        if (1 || $stddev!=$outdev || $stdino!=$outino);
 }
 
 my $gas=1;      $gas=0 if ($output =~ /\.asm$/);
@@ -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} = "\tDQ";
+                $self->{op} = "ALIGN\t8\n\tDQ";
             } 
             $self->{op};
         }
@@ -215,7 +215,8 @@ my %globals;
         undef   $ret;
 
         # optional * ---vvv--- appears in indirect jmp/call
-        if ($line =~ /^(\*?)([^\(,]*)\(([%\w,]+)\)/) {
+        if ($line =~ /^(\*?)([^\(,]*)\(([%\w,]+)\)/ &&
+            !($line =~ /^PIC_(GOT|PLT)/)) {
             $self->{asterisk} = $1;
             $self->{label} = $2;
             ($self->{base},$self->{index},$self->{scale})=split(/,/,$3);
@@ -545,8 +546,6 @@ 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);
@@ -554,8 +553,6 @@ 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;
@@ -625,6 +622,8 @@ my %globals;
     }
 }
 
+print "#include <machine/asm.h>\n";
+
 if ($nasm) {
     print <<___;
 default rel