diff options
| author | Rich Salz <rsalz@openssl.org> | 2018-01-06 11:49:53 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-01-07 09:51:54 -0500 |
| commit | 617b49db14fa4c1211bfc5d0e88294d0f159c9a9 (patch) | |
| tree | 314445188004c85c283c0f5a29fac214d3f5230e /crypto/perlasm | |
| parent | 9422d45de2b70cabec5f6e6a5c812e0647e6d3ab (diff) | |
Remove remaining NETWARE ifdef's
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5028)
Diffstat (limited to 'crypto/perlasm')
| -rw-r--r-- | crypto/perlasm/x86asm.pl | 7 | ||||
| -rw-r--r-- | crypto/perlasm/x86nasm.pl | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl index fef94b3076..cab6284314 100644 --- a/crypto/perlasm/x86asm.pl +++ b/crypto/perlasm/x86asm.pl @@ -263,7 +263,7 @@ sub ::asm_init $i386=$cpu; - $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$android=0; + $elf=$cpp=$coff=$aout=$macosx=$win32=$mwerks=$android=0; if (($type eq "elf")) { $elf=1; require "x86gas.pl"; } elsif (($type eq "elf-1")) @@ -274,10 +274,6 @@ sub ::asm_init { $coff=1; require "x86gas.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"; } elsif (($type eq "win32")) { $win32=1; require "x86masm.pl"; } elsif (($type eq "macosx")) @@ -291,7 +287,6 @@ 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 - nw-nasm - NetWare NASM format macosx - Mac OS X EOF exit(1); diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl index b4d4e2a781..9f52b4ae3f 100644 --- a/crypto/perlasm/x86nasm.pl +++ b/crypto/perlasm/x86nasm.pl @@ -12,7 +12,7 @@ package x86nasm; *out=\@::out; $::lbdecor="L\$"; # local label decoration -$nmdecor=$::netware?"":"_"; # external name decoration +$nmdecor="_"; # external name decoration $drdecor=$::mwerks?".":""; # directive decoration $initseg=""; |