resolve conflicts

1 files changed, 13 insertions, 2 deletions

diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl
index ce2bed9bb2..ca2511c9eb 100644
--- a/src/lib/libcrypto/perlasm/x86nasm.pl
+++ b/src/lib/libcrypto/perlasm/x86nasm.pl
@@ -19,6 +19,8 @@ sub ::generic
         {   $_[0] = "NEAR $_[0]";       }
         elsif ($opcode eq "lea" && $#_==1)  # wipe storage qualifier from lea
         {   $_[1] =~ s/^[^\[]*\[/\[/o;  }
+        elsif ($opcode eq "clflush" && $#_==0)
+        {   $_[0] =~ s/^[^\[]*\[/\[/o;  }
     }
     &::emit($opcode,@_);
   1;
@@ -67,6 +69,7 @@ sub get_mem
 }
 sub ::BP        { &get_mem("BYTE",@_);  }
 sub ::DWP       { &get_mem("DWORD",@_); }
+sub ::WP        { &get_mem("WORD",@_);  }
 sub ::QWP       { &get_mem("",@_);      }
 sub ::BC        { (($::mwerks)?"":"BYTE ")."@_";  }
 sub ::DWC       { (($::mwerks)?"":"DWORD ")."@_"; }
@@ -114,7 +117,7 @@ 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
+${drdecor}common        ${nmdecor}OPENSSL_ia32cap_P 8
 ___
         # comment out OPENSSL_ia32cap_P declarations
         grep {s/(^extern\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out;
@@ -135,7 +138,8 @@ sub ::public_label
 
 sub ::data_byte
 {   push(@out,(($::mwerks)?".byte\t":"db\t").join(',',@_)."\n");        }
-
+sub ::data_short
+{   push(@out,(($::mwerks)?".word\t":"dw\t").join(',',@_)."\n");        }
 sub ::data_word
 {   push(@out,(($::mwerks)?".long\t":"dd\t").join(',',@_)."\n");        }
 
@@ -163,4 +167,11 @@ sub ::dataseg
     else                { push(@out,"section\t.data align=4\n"); }
 }
 
+sub ::safeseh
+{ my $nm=shift;
+    push(@out,"%if      __NASM_VERSION_ID__ >= 0x02030000\n");
+    push(@out,"safeseh  ".&::LABEL($nm,$nmdecor.$nm)."\n");
+    push(@out,"%endif\n");
+}
+
 1;