From 68edd00d9258df93b1366c71ac124e0cadf7bc08 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 29 Apr 2005 05:39:33 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/perlasm/x86ms.pl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/lib/libcrypto/perlasm/x86ms.pl')

diff --git a/src/lib/libcrypto/perlasm/x86ms.pl b/src/lib/libcrypto/perlasm/x86ms.pl
index fbb4afb9bd..b6bd744057 100644
--- a/src/lib/libcrypto/perlasm/x86ms.pl
+++ b/src/lib/libcrypto/perlasm/x86ms.pl
@@ -160,6 +160,7 @@ sub main'not	{ &out1("not",@_); }
 sub main'call	{ &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); }
 sub main'ret	{ &out0("ret"); }
 sub main'nop	{ &out0("nop"); }
+sub main'movz	{ &out2("movzx",@_); }
 
 sub out2
 	{
-- 
cgit v1.2.3-55-g6feb