5 files changed, 427 insertions, 262 deletions

diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
index 56d9b64b6f..68b4c1ca80 100755
--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
@@ -62,8 +62,12 @@ my $flavour = shift;
 my $output  = shift;
 if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
 
-open STDOUT,">$output" || die "can't open $output: $!"
-        if (defined($output));
+{ my ($stddev,$stdino,@junk)=stat(STDOUT);
+  my ($outdev,$outino,@junk)=stat($output);
+
+    open STDOUT,">$output" || die "can't open $output: $!"
+        if (1 || $stddev!=$outdev || $stdino!=$outino);
+}
 
 my $gas=1;      $gas=0 if ($output =~ /\.asm$/);
 my $elf=1;      $elf=0 if (!$gas);
@@ -112,16 +116,12 @@ my %globals;
             $line = substr($line,@+[0]); $line =~ s/^\s+//;
 
             undef $self->{sz};
-            if ($self->{op} =~ /^(movz)x?([bw]).*/) {   # movz is pain...
+            if ($self->{op} =~ /^(movz)b.*/) {  # movz is pain...
                 $self->{op} = $1;
-                $self->{sz} = $2;
+                $self->{sz} = "b";
             } elsif ($self->{op} =~ /call|jmp/) {
                 $self->{sz} = "";
-            } elsif ($self->{op} =~ /^p/ && $' !~ /^(ush|op|insrw)/) { # SSEn
-                $self->{sz} = "";
-            } elsif ($self->{op} =~ /^v/) { # VEX
-                $self->{sz} = "";
-            } elsif ($self->{op} =~ /movq/ && $line =~ /%xmm/) {
+            } elsif ($self->{op} =~ /^p/ && $' !~ /^(ush|op)/) { # SSEn
                 $self->{sz} = "";
             } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {
                 $self->{op} = $1;
@@ -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);
@@ -246,39 +247,35 @@ my %globals;
         $self->{index} =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
         $self->{base}  =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
 
-        # Solaris /usr/ccs/bin/as can't handle multiplications
-        # in $self->{label}, new gas requires sign extension...
-        use integer;
-        $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
-        $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
-        $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
-
         if ($gas) {
+            # Solaris /usr/ccs/bin/as can't handle multiplications
+            # in $self->{label}, new gas requires sign extension...
+            use integer;
+            $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
+            $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+            $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
             $self->{label} =~ s/^___imp_/__imp__/   if ($flavour eq "mingw64");
 
             if (defined($self->{index})) {
-                sprintf "%s%s(%s,%%%s,%d)",$self->{asterisk},
-                                        $self->{label},
-                                        $self->{base}?"%$self->{base}":"",
+                sprintf "%s%s(%%%s,%%%s,%d)",$self->{asterisk},
+                                        $self->{label},$self->{base},
                                         $self->{index},$self->{scale};
             } else {
                 sprintf "%s%s(%%%s)",   $self->{asterisk},$self->{label},$self->{base};
             }
         } else {
-            %szmap = (  b=>"BYTE$PTR", w=>"WORD$PTR", l=>"DWORD$PTR",
-                        q=>"QWORD$PTR",o=>"OWORD$PTR",x=>"XMMWORD$PTR" );
+            %szmap = ( b=>"BYTE$PTR", w=>"WORD$PTR", l=>"DWORD$PTR", q=>"QWORD$PTR" );
 
             $self->{label} =~ s/\./\$/g;
             $self->{label} =~ s/(?<![\w\$\.])0x([0-9a-f]+)/0$1h/ig;
             $self->{label} = "($self->{label})" if ($self->{label} =~ /[\*\+\-\/]/);
-            $sz="q" if ($self->{asterisk} || opcode->mnemonic() eq "movq");
-            $sz="l" if (opcode->mnemonic() eq "movd");
+            $sz="q" if ($self->{asterisk});
 
             if (defined($self->{index})) {
-                sprintf "%s[%s%s*%d%s]",$szmap{$sz},
+                sprintf "%s[%s%s*%d+%s]",$szmap{$sz},
                                         $self->{label}?"$self->{label}+":"",
                                         $self->{index},$self->{scale},
-                                        $self->{base}?"+$self->{base}":"";
+                                        $self->{base};
             } elsif ($self->{base} eq "rip") {
                 sprintf "%s[%s]",$szmap{$sz},$self->{label};
             } else {
@@ -510,12 +507,6 @@ my %globals;
                     }
                 } elsif ($dir =~ /\.(text|data)/) {
                     $current_segment=".$1";
-                } elsif ($dir =~ /\.hidden/) {
-                    if    ($flavour eq "macosx")  { $self->{value} = ".private_extern\t$prefix$line"; }
-                    elsif ($flavour eq "mingw64") { $self->{value} = ""; }
-                } elsif ($dir =~ /\.comm/) {
-                    $self->{value} = "$dir\t$prefix$line";
-                    $self->{value} =~ s|,([0-9]+),([0-9]+)$|",$1,".log($2)/log(2)|e if ($flavour eq "macosx");
                 }
                 $line = "";
                 return $self;
@@ -565,8 +556,7 @@ my %globals;
                                             $v.=" READONLY";
                                             $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
                                         } elsif ($line=~/\.CRT\$/i) {
-                                            $v.=" READONLY ";
-                                            $v.=$masm>=$masmref ? "ALIGN(8)" : "DWORD";
+                                            $v.=" READONLY DWORD";
                                         }
                                     }
                                     $current_segment = $line;
@@ -588,7 +578,7 @@ my %globals;
                                             $self->{value}="${decor}SEH_end_$current_function->{name}:";
                                             $self->{value}.=":\n" if($masm);
                                         }
-                                        $self->{value}.="$current_function->{name}\tENDP" if($masm && $current_function->{name});
+                                        $self->{value}.="$current_function->{name}\tENDP" if($masm);
                                         undef $current_function;
                                     }
                                     last;
@@ -624,19 +614,6 @@ my %globals;
                                                 .join(",",@str) if (@str);
                                     last;
                                   };
-                /\.comm/    && do { my @str=split(/,\s*/,$line);
-                                    my $v=undef;
-                                    if ($nasm) {
-                                        $v.="common     $prefix@str[0] @str[1]";
-                                    } else {
-                                        $v="$current_segment\tENDS\n" if ($current_segment);
-                                        $current_segment = "_DATA";
-                                        $v.="$current_segment\tSEGMENT\n";
-                                        $v.="COMM       @str[0]:DWORD:".@str[1]/4;
-                                    }
-                                    $self->{value} = $v;
-                                    last;
-                                  };
             }
             $line = "";
         }
@@ -649,133 +626,11 @@ my %globals;
     }
 }
 
-sub rex {
- local *opcode=shift;
- my ($dst,$src,$rex)=@_;
-
-   $rex|=0x04 if($dst>=8);
-   $rex|=0x01 if($src>=8);
-   push @opcode,($rex|0x40) if ($rex);
-}
-
-# older gas and ml64 don't handle SSE>2 instructions
-my %regrm = (   "%eax"=>0, "%ecx"=>1, "%edx"=>2, "%ebx"=>3,
-                "%esp"=>4, "%ebp"=>5, "%esi"=>6, "%edi"=>7      );
-
-my $movq = sub {        # elderly gas can't handle inter-register movq
-  my $arg = shift;
-  my @opcode=(0x66);
-    if ($arg =~ /%xmm([0-9]+),\s*%r(\w+)/) {
-        my ($src,$dst)=($1,$2);
-        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
-        rex(\@opcode,$src,$dst,0x8);
-        push @opcode,0x0f,0x7e;
-        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
-        @opcode;
-    } elsif ($arg =~ /%r(\w+),\s*%xmm([0-9]+)/) {
-        my ($src,$dst)=($2,$1);
-        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
-        rex(\@opcode,$src,$dst,0x8);
-        push @opcode,0x0f,0x6e;
-        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $pextrd = sub {
-    if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*(%\w+)/) {
-      my @opcode=(0x66);
-        $imm=$1;
-        $src=$2;
-        $dst=$3;
-        if ($dst =~ /%r([0-9]+)d/)      { $dst = $1; }
-        elsif ($dst =~ /%e/)            { $dst = $regrm{$dst}; }
-        rex(\@opcode,$src,$dst);
-        push @opcode,0x0f,0x3a,0x16;
-        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
-        push @opcode,$imm;
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $pinsrd = sub {
-    if (shift =~ /\$([0-9]+),\s*(%\w+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        $imm=$1;
-        $src=$2;
-        $dst=$3;
-        if ($src =~ /%r([0-9]+)/)       { $src = $1; }
-        elsif ($src =~ /%e/)            { $src = $regrm{$src}; }
-        rex(\@opcode,$dst,$src);
-        push @opcode,0x0f,0x3a,0x22;
-        push @opcode,0xc0|(($dst&7)<<3)|($src&7);       # ModR/M
-        push @opcode,$imm;
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $pshufb = sub {
-    if (shift =~ /%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$2,$1);
-        push @opcode,0x0f,0x38,0x00;
-        push @opcode,0xc0|($1&7)|(($2&7)<<3);           # ModR/M
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $palignr = sub {
-    if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x3a,0x0f;
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);           # ModR/M
-        push @opcode,$1;
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $pclmulqdq = sub {
-    if (shift =~ /\$([x0-9a-f]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x3a,0x44;
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);           # ModR/M
-        my $c=$1;
-        push @opcode,$c=~/^0/?oct($c):$c;
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $rdrand = sub {
-    if (shift =~ /%[er](\w+)/) {
-      my @opcode=();
-      my $dst=$1;
-        if ($dst !~ /[0-9]+/) { $dst = $regrm{"%e$dst"}; }
-        rex(\@opcode,0,$1,8);
-        push @opcode,0x0f,0xc7,0xf0|($dst&7);
-        @opcode;
-    } else {
-        ();
-    }
-};
+print "#include <machine/asm.h>\n";
 
 if ($nasm) {
     print <<___;
 default rel
-%define XMMWORD
 ___
 } elsif ($masm) {
     print <<___;
@@ -792,22 +647,14 @@ while($line=<>) {
 
     undef $label;
     undef $opcode;
+    undef $sz;
     undef @args;
 
     if ($label=label->re(\$line))       { print $label->out(); }
 
     if (directive->re(\$line)) {
         printf "%s",directive->out();
-    } elsif ($opcode=opcode->re(\$line)) {
-        my $asm = eval("\$".$opcode->mnemonic());
-        undef @bytes;
-        
-        if ((ref($asm) eq 'CODE') && scalar(@bytes=&$asm($line))) {
-            print $gas?".byte\t":"DB\t",join(',',@bytes),"\n";
-            next;
-        }
-
-        ARGUMENT: while (1) {
+    } elsif ($opcode=opcode->re(\$line)) { ARGUMENT: while (1) {
         my $arg;
 
         if ($arg=register->re(\$line))  { opcode->size($arg->size()); }
@@ -823,26 +670,19 @@ while($line=<>) {
         $line =~ s/^,\s*//;
         } # ARGUMENT:
 
+        $sz=opcode->size();
+
         if ($#args>=0) {
             my $insn;
-            my $sz=opcode->size();
-
             if ($gas) {
                 $insn = $opcode->out($#args>=1?$args[$#args]->size():$sz);
-                @args = map($_->out($sz),@args);
-                printf "\t%s\t%s",$insn,join(",",@args);
             } else {
                 $insn = $opcode->out();
-                foreach (@args) {
-                    my $arg = $_->out();
-                    # $insn.=$sz compensates for movq, pinsrw, ...
-                    if ($arg =~ /^xmm[0-9]+$/) { $insn.=$sz; $sz="x" if(!$sz); last; }
-                    if ($arg =~ /^mm[0-9]+$/)  { $insn.=$sz; $sz="q" if(!$sz); last; }
-                }
+                $insn .= $sz if (map($_->out() =~ /x?mm/,@args));
                 @args = reverse(@args);
                 undef $sz if ($nasm && $opcode->mnemonic() eq "lea");
-                printf "\t%s\t%s",$insn,join(",",map($_->out($sz),@args));
             }
+            printf "\t%s\t%s",$insn,join(",",map($_->out($sz),@args));
         } else {
             printf "\t%s",$opcode->out();
         }
diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl
index eb543db2f6..4756a28e59 100644
--- a/src/lib/libcrypto/perlasm/x86asm.pl
+++ b/src/lib/libcrypto/perlasm/x86asm.pl
@@ -33,6 +33,13 @@ sub ::emit
     else            { push(@out,"\t$opcode\t".join(',',@_)."\n");       }
 }
 
+sub ::emitraw
+{ my $opcode=shift;
+
+    if ($#_==-1)    { push(@out,"$opcode\n");                           }
+    else            { push(@out,"$opcode\t".join(',',@_)."\n"); }
+}
+
 sub ::LB
 {   $_[0] =~ m/^e?([a-d])x$/o or die "$_[0] does not have a 'low byte'";
   $1."l";
@@ -80,57 +87,6 @@ sub ::movq
     {   &::generic("movq",@_);                  }
 }
 
-# SSE>2 instructions
-my %regrm = (   "eax"=>0, "ecx"=>1, "edx"=>2, "ebx"=>3,
-                "esp"=>4, "ebp"=>5, "esi"=>6, "edi"=>7  );
-sub ::pextrd
-{ my($dst,$src,$imm)=@_;
-    if ("$dst:$src" =~ /(e[a-dsd][ixp]):xmm([0-7])/)
-    {   &::data_byte(0x66,0x0f,0x3a,0x16,0xc0|($2<<3)|$regrm{$1},$imm); }
-    else
-    {   &::generic("pextrd",@_);                }
-}
-
-sub ::pinsrd
-{ my($dst,$src,$imm)=@_;
-    if ("$dst:$src" =~ /xmm([0-7]):(e[a-dsd][ixp])/)
-    {   &::data_byte(0x66,0x0f,0x3a,0x22,0xc0|($1<<3)|$regrm{$2},$imm); }
-    else
-    {   &::generic("pinsrd",@_);                }
-}
-
-sub ::pshufb
-{ my($dst,$src)=@_;
-    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
-    {   &data_byte(0x66,0x0f,0x38,0x00,0xc0|($1<<3)|$2);        }
-    else
-    {   &::generic("pshufb",@_);                }
-}
-
-sub ::palignr
-{ my($dst,$src,$imm)=@_;
-    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
-    {   &::data_byte(0x66,0x0f,0x3a,0x0f,0xc0|($1<<3)|$2,$imm); }
-    else
-    {   &::generic("palignr",@_);               }
-}
-
-sub ::pclmulqdq
-{ my($dst,$src,$imm)=@_;
-    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
-    {   &::data_byte(0x66,0x0f,0x3a,0x44,0xc0|($1<<3)|$2,$imm); }
-    else
-    {   &::generic("pclmulqdq",@_);             }
-}
-
-sub ::rdrand
-{ my ($dst)=@_;
-    if ($dst =~ /(e[a-dsd][ixp])/)
-    {   &::data_byte(0x0f,0xc7,0xf0|$regrm{$dst});      }
-    else
-    {   &::generic("rdrand",@_);        }
-}
-
 # label management
 $lbdecor="L";           # local label decoration, set by package
 $label="000";
@@ -218,7 +174,7 @@ sub ::asm_init
     $filename=$fn;
     $i386=$cpu;
 
-    $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$android=0;
+    $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$openbsd=0;
     if    (($type eq "elf"))
     {   $elf=1;                 require "x86gas.pl";    }
     elsif (($type eq "a\.out"))
@@ -235,8 +191,10 @@ sub ::asm_init
     {   $win32=1;               require "x86masm.pl";   }
     elsif (($type eq "macosx"))
     {   $aout=1; $macosx=1;     require "x86gas.pl";    }
-    elsif (($type eq "android"))
-    {   $elf=1; $android=1;     require "x86gas.pl";    }
+    elsif (($type eq "openbsd-elf"))
+    {   $openbsd=$elf=1;        require "x86gas.pl";    }
+    elsif (($type eq "openbsd-a.out"))
+    {   $openbsd=1;             require "x86gas.pl";    }
     else
     {   print STDERR <<"EOF";
 Pick one target type from
@@ -244,6 +202,8 @@ Pick one target type from
         a.out   - DJGPP, elder OpenBSD, etc.
         coff    - GAS/COFF such as Win32 targets
         win32n  - Windows 95/Windows NT NASM format
+        openbsd-elf     - OpenBSD elf
+        openbsd-a.out   - OpenBSD a.out
         nw-nasm - NetWare NASM format
         macosx  - Mac OS X
 EOF
@@ -253,6 +213,7 @@ EOF
     $pic=0;
     for (@ARGV) { $pic=1 if (/\-[fK]PIC/i); }
 
+    ::emitraw("#include <machine/asm.h>\n") if $openbsd;
     $filename =~ s/\.pl$//;
     &file($filename);
 }
diff --git a/src/lib/libcrypto/perlasm/x86gas.pl b/src/lib/libcrypto/perlasm/x86gas.pl
index 682a3a3163..9a1cce026e 100644
--- a/src/lib/libcrypto/perlasm/x86gas.pl
+++ b/src/lib/libcrypto/perlasm/x86gas.pl
@@ -45,8 +45,9 @@ sub ::generic
     undef $suffix if ($dst =~ m/^%[xm]/o || $src =~ m/^%[xm]/o);
 
     if ($#_==0)                         { &::emit($opcode);             }
-    elsif ($#_==1 && $opcode =~ m/^(call|clflush|j|loop|set)/o)
-                                        { &::emit($opcode,@arg);        }
+    elsif ($opcode =~ m/^j/o && $#_==1) { &::emit($opcode,@arg);        }
+    elsif ($opcode eq "call" && $#_==1) { &::emit($opcode,@arg);        }
+    elsif ($opcode =~ m/^set/&& $#_==1) { &::emit($opcode,@arg);        }
     else                                { &::emit($opcode.$suffix,@arg);}
 
   1;
@@ -90,7 +91,6 @@ sub ::DWP
 }
 sub ::QWP       { &::DWP(@_);   }
 sub ::BP        { &::DWP(@_);   }
-sub ::WP        { &::DWP(@_);   }
 sub ::BC        { @_;           }
 sub ::DWC       { @_;           }
 
@@ -149,24 +149,22 @@ sub ::public_label
 {   push(@out,".globl\t".&::LABEL($_[0],$nmdecor.$_[0])."\n");   }
 
 sub ::file_end
-{   if ($::macosx)
+{   if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) {
+        my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,4";
+        if ($::elf)     { push (@out,"$tmp,4\n"); }
+        else            { push (@out,"$tmp\n"); }
+    }
+    if ($::macosx)
     {   if (%non_lazy_ptr)
         {   push(@out,".section __IMPORT,__pointers,non_lazy_symbol_pointers\n");
             foreach $i (keys %non_lazy_ptr)
             {   push(@out,"$non_lazy_ptr{$i}:\n.indirect_symbol\t$i\n.long\t0\n");   }
         }
     }
-    if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) {
-        my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,8";
-        if ($::macosx)  { push (@out,"$tmp,2\n"); }
-        elsif ($::elf)  { push (@out,"$tmp,4\n"); }
-        else            { push (@out,"$tmp\n"); }
-    }
     push(@out,$initseg) if ($initseg);
 }
 
 sub ::data_byte {   push(@out,".byte\t".join(',',@_)."\n");   }
-sub ::data_short{   push(@out,".value\t".join(',',@_)."\n");  }
 sub ::data_word {   push(@out,".long\t".join(',',@_)."\n");   }
 
 sub ::align
@@ -182,7 +180,16 @@ sub ::align
 sub ::picmeup
 { my($dst,$sym,$base,$reflabel)=@_;
 
-    if (($::pic && ($::elf || $::aout)) || $::macosx)
+    if ($::openbsd)
+    {  &::emitraw("#if defined(PIC) || defined(__PIC__)");
+       &::emitraw("PIC_PROLOGUE");
+       &::mov($dst, &::DWP("PIC_GOT($sym)"));
+       &::emitraw("PIC_EPILOGUE");
+       &::emitraw("#else /* PIC */");
+       &::lea($dst,&::DWP($sym));
+       &::emitraw("#endif /* PIC */");
+    }
+    elsif ($::pic && ($::elf || $::aout))
     {   if (!defined($base))
         {   &::call(&::label("PIC_me_up"));
             &::set_label("PIC_me_up");
@@ -208,17 +215,24 @@ sub ::picmeup
 sub ::initseg
 { my $f=$nmdecor.shift;
 
-    if ($::android)
+    if ($::openbsd)
     {   $initseg.=<<___;
-.section        .init_array
-.align  4
-.long   $f
+.section        .init
+PIC_PROLOGUE
+        call    PIC_PLT($f)
+PIC_EPILOGUE
+        jmp     .Linitalign
+.align  $align
+.Linitalign:
 ___
     }
     elsif ($::elf)
     {   $initseg.=<<___;
 .section        .init
         call    $f
+        jmp     .Linitalign
+.align  $align
+.Linitalign:
 ___
     }
     elsif ($::coff)
diff --git a/src/lib/libcrypto/perlasm/x86masm.pl b/src/lib/libcrypto/perlasm/x86masm.pl
new file mode 100644
index 0000000000..3d50e4a786
--- /dev/null
+++ b/src/lib/libcrypto/perlasm/x86masm.pl
@@ -0,0 +1,184 @@
+#!/usr/bin/env perl
+
+package x86masm;
+
+*out=\@::out;
+
+$::lbdecor="\$L";       # local label decoration
+$nmdecor="_";           # external name decoration
+
+$initseg="";
+$segment="";
+
+sub ::generic
+{ my ($opcode,@arg)=@_;
+
+    # fix hexadecimal constants
+    for (@arg) { s/0x([0-9a-f]+)/0$1h/oi; }
+
+    if ($opcode !~ /movq/)
+    {   # fix xmm references
+        $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
+        $arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
+    }
+
+    &::emit($opcode,@arg);
+  1;
+}
+#
+# opcodes not covered by ::generic above, mostly inconsistent namings...
+#
+sub ::call      { &::emit("call",(&::islabel($_[0]) or "$nmdecor$_[0]")); }
+sub ::call_ptr  { &::emit("call",@_);   }
+sub ::jmp_ptr   { &::emit("jmp",@_);    }
+
+sub get_mem
+{ my($size,$addr,$reg1,$reg2,$idx)=@_;
+  my($post,$ret);
+
+    $ret .= "$size PTR " if ($size ne "");
+
+    $addr =~ s/^\s+//;
+    # prepend global references with optional underscore
+    $addr =~ s/^([^\+\-0-9][^\+\-]*)/&::islabel($1) or "$nmdecor$1"/ige;
+    # put address arithmetic expression in parenthesis
+    $addr="($addr)" if ($addr =~ /^.+[\-\+].+$/);
+
+    if (($addr ne "") && ($addr ne 0))
+    {   if ($addr !~ /^-/)      { $ret .= "$addr";  }
+        else                    { $post=$addr;      }
+    }
+    $ret .= "[";
+
+    if ($reg2 ne "")
+    {   $idx!=0 or $idx=1;
+        $ret .= "$reg2*$idx";
+        $ret .= "+$reg1" if ($reg1 ne "");
+    }
+    else
+    {   $ret .= "$reg1";   }
+
+    $ret .= "$post]";
+    $ret =~ s/\+\]/]/; # in case $addr was the only argument
+    $ret =~ s/\[\s*\]//;
+
+  $ret;
+}
+sub ::BP        { &get_mem("BYTE",@_);  }
+sub ::DWP       { &get_mem("DWORD",@_); }
+sub ::QWP       { &get_mem("QWORD",@_); }
+sub ::BC        { "@_";  }
+sub ::DWC       { "@_"; }
+
+sub ::file
+{ my $tmp=<<___;
+TITLE   $_[0].asm
+IF \@Version LT 800
+ECHO MASM version 8.00 or later is strongly recommended.
+ENDIF
+.486
+.MODEL  FLAT
+OPTION  DOTNAME
+IF \@Version LT 800
+.text\$ SEGMENT PAGE 'CODE'
+ELSE
+.text\$ SEGMENT ALIGN(64) 'CODE'
+ENDIF
+___
+    push(@out,$tmp);
+    $segment = ".text\$";
+}
+
+sub ::function_begin_B
+{ my $func=shift;
+  my $global=($func !~ /^_/);
+  my $begin="${::lbdecor}_${func}_begin";
+
+    &::LABEL($func,$global?"$begin":"$nmdecor$func");
+    $func="ALIGN\t16\n".$nmdecor.$func."\tPROC";
+
+    if ($global)    { $func.=" PUBLIC\n${begin}::\n"; }
+    else            { $func.=" PRIVATE\n";            }
+    push(@out,$func);
+    $::stack=4;
+}
+sub ::function_end_B
+{ my $func=shift;
+
+    push(@out,"$nmdecor$func ENDP\n");
+    $::stack=0;
+    &::wipe_labels();
+}
+
+sub ::file_end
+{ my $xmmheader=<<___;
+.686
+.XMM
+IF \@Version LT 800
+XMMWORD STRUCT 16
+DQ      2 dup (?)
+XMMWORD ENDS
+ENDIF
+___
+    if (grep {/\b[x]?mm[0-7]\b/i} @out) {
+        grep {s/\.[3-7]86/$xmmheader/} @out;
+    }
+
+    push(@out,"$segment ENDS\n");
+
+    if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out)
+    {   my $comm=<<___;
+.bss    SEGMENT 'BSS'
+COMM    ${nmdecor}OPENSSL_ia32cap_P:DWORD
+.bss    ENDS
+___
+        # comment out OPENSSL_ia32cap_P declarations
+        grep {s/(^EXTERN\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out;
+        push (@out,$comm);
+    }
+    push (@out,$initseg) if ($initseg);
+    push (@out,"END\n");
+}
+
+sub ::comment {   foreach (@_) { push(@out,"\t; $_\n"); }   }
+
+*::set_label_B = sub
+{ my $l=shift; push(@out,$l.($l=~/^\Q${::lbdecor}\E[0-9]{3}/?":\n":"::\n")); };
+
+sub ::external_label
+{   foreach(@_)
+    {   push(@out, "EXTERN\t".&::LABEL($_,$nmdecor.$_).":NEAR\n");   }
+}
+
+sub ::public_label
+{   push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n");   }
+
+sub ::data_byte
+{   push(@out,("DB\t").join(',',@_)."\n");      }
+
+sub ::data_word
+{   push(@out,("DD\t").join(',',@_)."\n");      }
+
+sub ::align
+{   push(@out,"ALIGN\t$_[0]\n");        }
+
+sub ::picmeup
+{ my($dst,$sym)=@_;
+    &::lea($dst,&::DWP($sym));
+}
+
+sub ::initseg
+{ my $f=$nmdecor.shift;
+
+    $initseg.=<<___;
+.CRT\$XCU       SEGMENT DWORD PUBLIC 'DATA'
+EXTERN  $f:NEAR
+DD      $f
+.CRT\$XCU       ENDS
+___
+}
+
+sub ::dataseg
+{   push(@out,"$segment\tENDS\n_DATA\tSEGMENT\n"); $segment="_DATA";   }
+
+1;
diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl
new file mode 100644
index 0000000000..ce2bed9bb2
--- /dev/null
+++ b/src/lib/libcrypto/perlasm/x86nasm.pl
@@ -0,0 +1,166 @@
+#!/usr/bin/env perl
+
+package x86nasm;
+
+*out=\@::out;
+
+$::lbdecor="L\$";               # local label decoration
+$nmdecor=$::netware?"":"_";     # external name decoration
+$drdecor=$::mwerks?".":"";      # directive decoration
+
+$initseg="";
+
+sub ::generic
+{ my $opcode=shift;
+  my $tmp;
+
+    if (!$::mwerks)
+    {   if    ($opcode =~ m/^j/o && $#_==0) # optimize jumps
+        {   $_[0] = "NEAR $_[0]";       }
+        elsif ($opcode eq "lea" && $#_==1)  # wipe storage qualifier from lea
+        {   $_[1] =~ s/^[^\[]*\[/\[/o;  }
+    }
+    &::emit($opcode,@_);
+  1;
+}
+#
+# opcodes not covered by ::generic above, mostly inconsistent namings...
+#
+sub ::call      { &::emit("call",(&::islabel($_[0]) or "$nmdecor$_[0]")); }
+sub ::call_ptr  { &::emit("call",@_);   }
+sub ::jmp_ptr   { &::emit("jmp",@_);    }
+
+sub get_mem
+{ my($size,$addr,$reg1,$reg2,$idx)=@_;
+  my($post,$ret);
+
+    if ($size ne "")
+    {   $ret .= "$size";
+        $ret .= " PTR" if ($::mwerks);
+        $ret .= " ";
+    }
+    $ret .= "[";
+
+    $addr =~ s/^\s+//;
+    # prepend global references with optional underscore
+    $addr =~ s/^([^\+\-0-9][^\+\-]*)/::islabel($1) or "$nmdecor$1"/ige;
+    # put address arithmetic expression in parenthesis
+    $addr="($addr)" if ($addr =~ /^.+[\-\+].+$/);
+
+    if (($addr ne "") && ($addr ne 0))
+    {   if ($addr !~ /^-/)      { $ret .= "$addr+"; }
+        else                    { $post=$addr;      }
+    }
+
+    if ($reg2 ne "")
+    {   $idx!=0 or $idx=1;
+        $ret .= "$reg2*$idx";
+        $ret .= "+$reg1" if ($reg1 ne "");
+    }
+    else
+    {   $ret .= "$reg1";   }
+
+    $ret .= "$post]";
+    $ret =~ s/\+\]/]/; # in case $addr was the only argument
+
+  $ret;
+}
+sub ::BP        { &get_mem("BYTE",@_);  }
+sub ::DWP       { &get_mem("DWORD",@_); }
+sub ::QWP       { &get_mem("",@_);      }
+sub ::BC        { (($::mwerks)?"":"BYTE ")."@_";  }
+sub ::DWC       { (($::mwerks)?"":"DWORD ")."@_"; }
+
+sub ::file
+{   if ($::mwerks)      { push(@out,".section\t.text,64\n"); }
+    else
+    { my $tmp=<<___;
+%ifidn __OUTPUT_FORMAT__,obj
+section code    use32 class=code align=64
+%elifidn __OUTPUT_FORMAT__,win32
+\$\@feat.00 equ 1
+section .text   code align=64
+%else
+section .text   code
+%endif
+___
+        push(@out,$tmp);
+    }
+}
+
+sub ::function_begin_B
+{ my $func=shift;
+  my $global=($func !~ /^_/);
+  my $begin="${::lbdecor}_${func}_begin";
+
+    $begin =~ s/^\@/./ if ($::mwerks);  # the torture never stops
+
+    &::LABEL($func,$global?"$begin":"$nmdecor$func");
+    $func=$nmdecor.$func;
+
+    push(@out,"${drdecor}global $func\n")       if ($global);
+    push(@out,"${drdecor}align  16\n");
+    push(@out,"$func:\n");
+    push(@out,"$begin:\n")                      if ($global);
+    $::stack=4;
+}
+
+sub ::function_end_B
+{   $::stack=0;
+    &::wipe_labels();
+}
+
+sub ::file_end
+{   if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out)
+    {   my $comm=<<___;
+${drdecor}segment       .bss
+${drdecor}common        ${nmdecor}OPENSSL_ia32cap_P 4
+___
+        # comment out OPENSSL_ia32cap_P declarations
+        grep {s/(^extern\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out;
+        push (@out,$comm)
+    }
+    push (@out,$initseg) if ($initseg);         
+}
+
+sub ::comment {   foreach (@_) { push(@out,"\t; $_\n"); }   }
+
+sub ::external_label
+{   foreach(@_)
+    {   push(@out,"${drdecor}extern\t".&::LABEL($_,$nmdecor.$_)."\n");   }
+}
+
+sub ::public_label
+{   push(@out,"${drdecor}global\t".&::LABEL($_[0],$nmdecor.$_[0])."\n");  }
+
+sub ::data_byte
+{   push(@out,(($::mwerks)?".byte\t":"db\t").join(',',@_)."\n");        }
+
+sub ::data_word
+{   push(@out,(($::mwerks)?".long\t":"dd\t").join(',',@_)."\n");        }
+
+sub ::align
+{   push(@out,"${drdecor}align\t$_[0]\n");      }
+
+sub ::picmeup
+{ my($dst,$sym)=@_;
+    &::lea($dst,&::DWP($sym));
+}
+
+sub ::initseg
+{ my $f=$nmdecor.shift;
+    if ($::win32)
+    {   $initseg=<<___;
+segment .CRT\$XCU data align=4
+extern  $f
+dd      $f
+___
+    }
+}
+
+sub ::dataseg
+{   if ($mwerks)        { push(@out,".section\t.data,4\n");   }
+    else                { push(@out,"section\t.data align=4\n"); }
+}
+
+1;