commit 49587b2c10482d8f949b616ed4f42f130c9ebbaf
author David Benjamin <davidben@google.com> Fri Dec 11 11:36:54 2020 -0500
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Dec 11 17:34:27 2020 +0000
tree 2cde9e803b986742e908159bc5c7642c30e2113a
parent a929e327463bfa71b065111c0245c1599d39f99b

Remove unused Netware codepaths in x86 perlasm.

Imported from upstream's 617b49db14fa4c1211bfc5d0e88294d0f159c9a9.

Change-Id: I64349b7cbbda8fbacf1e20ca609081ed42f10550
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/44565
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>

crypto/perlasm/x86asm.pl

diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
index 2d19425..51f3766 100644
--- a/crypto/perlasm/x86asm.pl
+++ b/crypto/perlasm/x86asm.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -276,13 +276,13 @@
 sub ::asm_finish
 {   &file_end();
     my $comment = "#";
-    $comment = ";" if ($win32 || $netware);
+    $comment = ";" if ($win32);
     print <<___;
 $comment This file is generated from a similarly-named Perl script in the BoringSSL
 $comment source tree. Do not edit by hand.
 
 ___
-    if ($win32 || $netware) {
+    if ($win32) {
         print <<___ unless $masm;
 %ifdef BORINGSSL_PREFIX
 %include "boringssl_prefix_symbols_nasm.inc"
@@ -297,7 +297,7 @@
 ___
     }
     print @out;
-    print "#endif\n" unless ($win32 || $netware);
+    print "#endif\n" unless ($win32);
     # See https://www.airs.com/blog/archives/518.
     print ".section\t.note.GNU-stack,\"\",\@progbits\n" if ($elf);
 }
@@ -307,7 +307,7 @@
 
     $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"))
@@ -318,10 +318,6 @@
     {	$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; $masm=1;	require "x86masm.pl";	}
     elsif (($type eq "macosx"))
@@ -335,7 +331,6 @@
 	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);

crypto/perlasm/x86nasm.pl

diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl
index 454f3cf..96883ff 100644
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/perlasm/x86nasm.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -12,7 +12,7 @@
 *out=\@::out;
 
 $::lbdecor="L\$";		# local label decoration
-$nmdecor=$::netware?"":"_";	# external name decoration
+$nmdecor="_";			# external name decoration
 $drdecor=$::mwerks?".":"";	# directive decoration
 
 $initseg="";