resolve conflicts

1 files changed, 14 insertions, 13 deletions

diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl
index c3de90c65d..f535c9c7fa 100644
--- a/src/lib/libcrypto/perlasm/x86asm.pl
+++ b/src/lib/libcrypto/perlasm/x86asm.pl
@@ -18,7 +18,7 @@ sub main'asm_init
         ($type,$fn,$i386)=@_;
         $filename=$fn;
 
-        $elf=$cpp=$sol=$aout=$win32=$gaswin=$openbsd=0;
+        $elf=$cpp=$coff=$aout=$win32=$netware=$mwerks=$openbsd=0;
         if (    ($type eq "elf"))
                 { $elf=1; require "x86unix.pl"; }
         elsif ( ($type eq "openbsd-elf"))
@@ -27,28 +27,31 @@ sub main'asm_init
                 { $openbsd=1; require "x86unix.pl"; }
         elsif ( ($type eq "a.out"))
                 { $aout=1; require "x86unix.pl"; }
-        elsif ( ($type eq "gaswin"))
-                { $gaswin=1; $aout=1; require "x86unix.pl"; }
-        elsif ( ($type eq "sol"))
-                { $sol=1; require "x86unix.pl"; }
+        elsif ( ($type eq "coff" or $type eq "gaswin"))
+                { $coff=1; require "x86unix.pl"; }
         elsif ( ($type eq "cpp"))
                 { $cpp=1; require "x86unix.pl"; }
         elsif ( ($type eq "win32"))
                 { $win32=1; require "x86ms.pl"; }
         elsif ( ($type eq "win32n"))
                 { $win32=1; require "x86nasm.pl"; }
+        elsif ( ($type eq "nw-nasm"))
+                { $netware=1; require "x86nasm.pl"; }
+        elsif ( ($type eq "nw-mwasm"))
+                { $netware=1; $mwerks=1; require "x86nasm.pl"; }
         else
                 {
                 print STDERR <<"EOF";
 Pick one target type from
-        elf     - linux, FreeBSD etc
-        a.out   - old linux
-        sol     - x86 solaris
-        cpp     - format so x86unix.cpp can be used
+        elf     - Linux, FreeBSD, Solaris x86, etc.
+        a.out   - OpenBSD, DJGPP, etc.
+        coff    - GAS/COFF such as Win32 targets
         win32   - Windows 95/Windows NT
         win32n  - Windows 95/Windows NT NASM format
         openbsd-elf     - OpenBSD elf
         openbsd-a.out   - OpenBSD a.out
+        nw-nasm - NetWare NASM format
+        nw-mwasm- NetWare Metrowerks Assembler
 EOF
                 exit(1);
                 }
@@ -61,7 +64,7 @@ EOF
 &comment("Don't even think of reading this code");
 &comment("It was automatically generated by $filename");
 &comment("Which is a perl program used to generate the x86 assember for");
-&comment("any of elf, a.out, BSDI, Win32, gaswin (for GNU as on Win32) or Solaris");
+&comment("any of ELF, a.out, COFF, Win32, ...");
 &comment("eric <eay\@cryptsoft.com>");
 &comment("");
 
@@ -96,7 +99,7 @@ $tmp
 #ifdef OUT
 #define OK      1
 #define ALIGN   4
-#if defined(__CYGWIN__) || defined(__DJGPP__) || defined(__MINGW32__)
+#if defined(__CYGWIN__) || defined(__DJGPP__) || (__MINGW32__)
 #undef SIZE
 #undef TYPE
 #define SIZE(a,b)
@@ -130,6 +133,4 @@ BSDI - a.out with a very primative version of as.
 EOF
         }
 
-sub main'align() {} # swallow align statements in 0.9.7 context
-
 1;