1 files changed, 15 insertions, 1 deletions

diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl
index eb543db2f6..bf783cff26 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";
@@ -218,7 +225,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=$android=0;
     if    (($type eq "elf"))
     {   $elf=1;                 require "x86gas.pl";    }
     elsif (($type eq "a\.out"))
@@ -235,6 +242,10 @@ sub ::asm_init
     {   $win32=1;               require "x86masm.pl";   }
     elsif (($type eq "macosx"))
     {   $aout=1; $macosx=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";    }
     elsif (($type eq "android"))
     {   $elf=1; $android=1;     require "x86gas.pl";    }
     else
@@ -244,6 +255,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 +266,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);
 }