From: Andy Polyakov <appro@openssl.org>
Date: Mon, 18 Apr 2011 20:18:03 +0000 (+0000)
Subject: perlasm/x86[nm]asm.pl: make OPENSSL_instrument_bus[2] compile.
X-Git-Tag: OpenSSL-fips-2_0-rc1~534
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=70d01a7f82136b681ae8c2d77e9ff487352d9e0d;p=oweals%2Fopenssl.git

perlasm/x86[nm]asm.pl: make OPENSSL_instrument_bus[2] compile.
---

diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl
index 279ab29b8c..6154b079b9 100644
--- a/crypto/perlasm/x86masm.pl
+++ b/crypto/perlasm/x86masm.pl
@@ -31,6 +31,7 @@ sub ::generic
 sub ::call	{ &::emit("call",(&::islabel($_[0]) or "$nmdecor$_[0]")); }
 sub ::call_ptr	{ &::emit("call",@_);	}
 sub ::jmp_ptr	{ &::emit("jmp",@_);	}
+sub ::lock	{ &::data_byte(0xf0);	}
 
 sub get_mem
 { my($size,$addr,$reg1,$reg2,$idx)=@_;
diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl
index 224feff12e..23a84ba563 100644
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/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;