1 files changed, 20 insertions, 14 deletions

diff --git a/src/lib/libcrypto/perlasm/x86gas.pl b/src/lib/libcrypto/perlasm/x86gas.pl
index 6eab727fd4..682a3a3163 100644
--- a/src/lib/libcrypto/perlasm/x86gas.pl
+++ b/src/lib/libcrypto/perlasm/x86gas.pl
@@ -45,9 +45,8 @@ sub ::generic
     undef $suffix if ($dst =~ m/^%[xm]/o || $src =~ m/^%[xm]/o);
 
     if ($#_==0)                         { &::emit($opcode);             }
-    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);        }
+    elsif ($#_==1 && $opcode =~ m/^(call|clflush|j|loop|set)/o)
+                                        { &::emit($opcode,@arg);        }
     else                                { &::emit($opcode.$suffix,@arg);}
 
   1;
@@ -91,6 +90,7 @@ sub ::DWP
 }
 sub ::QWP       { &::DWP(@_);   }
 sub ::BP        { &::DWP(@_);   }
+sub ::WP        { &::DWP(@_);   }
 sub ::BC        { @_;           }
 sub ::DWC       { @_;           }
 
@@ -149,22 +149,24 @@ sub ::public_label
 {   push(@out,".globl\t".&::LABEL($_[0],$nmdecor.$_[0])."\n");   }
 
 sub ::file_end
-{   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 ($::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
@@ -180,7 +182,7 @@ sub ::align
 sub ::picmeup
 { my($dst,$sym,$base,$reflabel)=@_;
 
-    if ($::pic && ($::elf || $::aout))
+    if (($::pic && ($::elf || $::aout)) || $::macosx)
     {   if (!defined($base))
         {   &::call(&::label("PIC_me_up"));
             &::set_label("PIC_me_up");
@@ -206,13 +208,17 @@ sub ::picmeup
 sub ::initseg
 { my $f=$nmdecor.shift;
 
-    if ($::elf)
+    if ($::android)
+    {   $initseg.=<<___;
+.section        .init_array
+.align  4
+.long   $f
+___
+    }
+    elsif ($::elf)
     {   $initseg.=<<___;
 .section        .init
         call    $f
-        jmp     .Linitalign
-.align  $align
-.Linitalign:
 ___
     }
     elsif ($::coff)