Minor perlasm updates.

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 10b8629e61472ca7def09ef782cef6f59063741d..647e72e171d6e59b10fe99a4d757bac02bc5c8b2 100755 (executable)
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -68,7 +68,7 @@ my $output = shift;
        if ($stddev!=$outdev || $stdino!=$outino);
 }
 
-my $win64=1 if ($output =~ /\.asm/);
+my $win64=1 if ($output =~ /\.asm$/);
 
 my $masmref=8 + 50727*2**-32;  # 8.00.50727 shipped with VS2005
 my $masm=0;
@@ -462,8 +462,12 @@ my %globals;
                                    last;
                                  };
                /\.size/    && do { if (defined($current_function)) {
-                                       $self->{value}="\$L\$SEH_end_$current_function->{name}:";
-                                       $self->{value}.=":\n$current_function->{name}\tENDP" if($masm);
+                                       undef $self->{value};
+                                       if ($current_function->{abi} eq "svr4") {
+                                           $self->{value}="\$L\$SEH_end_$current_function->{name}:";
+                                           $self->{value}.=":\n" if($masm);
+                                       }
+                                       $self->{value}.="$current_function->{name}\tENDP" if($masm);
                                        undef $current_function;
                                    }
                                    last;

diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl
index 9969d382cf51982835c7c49673f7cef448ebbe6b..e3fbb940f051e8aa18fd6610bdb6fd2b12f9f5e8 100644 (file)
--- a/crypto/perlasm/x86gas.pl
+++ b/crypto/perlasm/x86gas.pl
@@ -77,11 +77,11 @@ sub ::jmp_ptr       { &::generic("jmp","*$_[0]");   }
 };
 *::shld = sub
 { my($dst,$src,$bits)=@_;
-    &::emit("shldl",$bit eq "cl"?"%cl":"\$$bits","%$src","%$dst");
+    &::emit("shldl",$bits eq "cl"?"%cl":"\$$bits","%$src","%$dst");
 };
 *::shrd = sub
 { my($dst,$src,$bits)=@_;
-    &::emit("shrdl",$bit eq "cl"?"%cl":"\$$bits","%$src","%$dst");
+    &::emit("shrdl",$bits eq "cl"?"%cl":"\$$bits","%$src","%$dst");
 };
 
 sub ::DWP