Deprecate cpp and gaswin targets. New coff fills in for gaswin, but cpp is

[openssl.git] / crypto / perlasm / x86asm.pl

diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
index f9c7c37aca486b76b9fa7fec245893b3448fb287..32eacd2bc2fcea627d65822dc5f882de775f5717 100644 (file)
--- a/crypto/perlasm/x86asm.pl
+++ b/crypto/perlasm/x86asm.pl
@@ -18,15 +18,13 @@ sub main'asm_init
        ($type,$fn,$i386)=@_;
        $filename=$fn;
 
-       $elf=$cpp=$sol=$aout=$win32=$gaswin=$netware=0;
+       $elf=$cpp=$coff=$aout=$win32=$netware=0;
        if (    ($type eq "elf"))
                { $elf=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"))
@@ -41,10 +39,9 @@ sub main'asm_init
                {
                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
        nw-nasm - NetWare NASM format
@@ -61,7 +58,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("");