12519 Targetdirs: remove left over /usr/4lib

Reviewed by: Gergő Doma <domag02@gmail.com>
Reviewed by: Yuri Pankov <ypankov@fastmail.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Robert Mustacchi <rm@fingolfin.org>

8 files changed, 9 insertions, 45 deletions

diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index b979d1fe51..32863f0e42 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -239,7 +239,6 @@ DIRS= \
 	/system/object \
 	/tmp \
 	/usr  \
-	/usr/4lib \
 	/usr/ast \
 	/usr/ast/bin \
 	/usr/bin \
diff --git a/usr/src/cmd/abi/appcert/scripts/abi_index.pl b/usr/src/cmd/abi/appcert/scripts/abi_index.pl
index c1ff743a13..61a4e19cc8 100644
--- a/usr/src/cmd/abi/appcert/scripts/abi_index.pl
+++ b/usr/src/cmd/abi/appcert/scripts/abi_index.pl
@@ -20,9 +20,6 @@
 #
 # CDDL HEADER END
 #
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -59,7 +56,6 @@ my $must_be_public = 0;
 # paths to skip outright.
 my @skip_list = qw(
 	/etc
-	/usr/4lib
 	/usr/perl5
 );
 my $path_skip = join('|', @skip_list);
@@ -114,7 +110,7 @@ while (<$contents_fh>) {
 		next unless ($pathname =~ m,\.so,);
 		next unless ($pathname =~ m,/lib,);
 		next unless ($pathname =~ m,/lib[^/]*\.so\b,);
-		next unless ($type =~ /regular file|symbolic link/i); 
+		next unless ($type =~ /regular file|symbolic link/i);
 		next unless ($status =~ /^\s*installed\s*$/);
 		$pathname = trim($pathname);
 		$link = trim($link);
@@ -216,7 +212,7 @@ sub do_pvs
 		next if ($path =~ /'/);
 		#
 		# quote the filename in case it has meta-characters
-		# (which should never happen in all normal usage) 
+		# (which should never happen in all normal usage)
 		#
 		$paths .= "'$path'";
 		$cnt++;
diff --git a/usr/src/cmd/sgs/crle/common/crle.msg b/usr/src/cmd/sgs/crle/common/crle.msg
index 12eb812309..6c9c0e999a 100644
--- a/usr/src/cmd/sgs/crle/common/crle.msg
+++ b/usr/src/cmd/sgs/crle/common/crle.msg
@@ -159,7 +159,7 @@
 			 /usr/lib/secure/64  (system default)\n"
 
 @ MSG_DEF_AOUTDLP	"  Default Library Path (AOUT):\t\
-			 /usr/4lib:/usr/lib:/usr/local/lib  \
+			 /usr/lib:/usr/local/lib  \
 			 (system default)\n"
 @ MSG_DEF_AOUTNEWTD	"  Trusted Directories (AOUT):\t\
 			 /lib/secure:/usr/lib/secure  (system default)\n"
@@ -193,7 +193,7 @@
 
 @ MSG_DMP_HEAD		"\nConfiguration file [version %d]: %s  %s\n"
 @ MSG_DMP_PLATFORM	"  Platform:\t%s %s %s\n"
-@ MSG_DMP_APP		"  Specific application: %s  (original: %s)\n" 
+@ MSG_DMP_APP		"  Specific application: %s  (original: %s)\n"
 @ MSG_DMP_DLIBPTH	"  Default Library Path (%s):\t%s\n"
 @ MSG_DMP_TLIBPTH	"  Trusted Directories (%s):\t%s\n"
 @ MSG_DMP_RESV		"\nMemory Reservation:\t%llx - %llx (%llx bytes)\n"
@@ -291,7 +291,7 @@
 @ MSG_PTH_OLDTD_64	"/usr/lib/secure/64"
 @ MSG_PTH_UPTD_64	"/lib/secure/64"
 
-@ MSG_PTH_AOUTDLP	"/usr/4lib:/usr/lib:/usr/local/lib"
+@ MSG_PTH_AOUTDLP	"/usr/lib:/usr/local/lib"
 
 @ MSG_DIR_ROOT		"/"
 @ MSG_DIR_DOT		"."
diff --git a/usr/src/cmd/sgs/rtld/common/a.out.c b/usr/src/cmd/sgs/rtld/common/a.out.c
index c7abfcab12..6ea37918ad 100644
--- a/usr/src/cmd/sgs/rtld/common/a.out.c
+++ b/usr/src/cmd/sgs/rtld/common/a.out.c
@@ -50,7 +50,6 @@
  * Default and secure dependency search paths.
  */
 static Spath_defn _aout_def_dirs[] = {
-	{ MSG_ORIG(MSG_PTH_USR4LIB),		MSG_PTH_USR4LIB_SIZE },
 	{ MSG_ORIG(MSG_PTH_USRLIB),		MSG_PTH_USRLIB_SIZE },
 	{ MSG_ORIG(MSG_PTH_USRLCLIB),		MSG_PTH_USRLCLIB_SIZE },
 	{ 0, 0 }
diff --git a/usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg b/usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg
index 8f19af9390..99b623803d 100644
--- a/usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg
+++ b/usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg
@@ -48,7 +48,6 @@
 @ MSG_FIL_LIB		"lib"
 
 @ MSG_PTH_USRLCLIB	"/usr/local/lib"
-@ MSG_PTH_USR4LIB	"/usr/4lib"
 
 @ MSG_SYM_LAV8PLTENTER	"la_sparcv8_pltenter"
 
diff --git a/usr/src/man/man1/crle.1 b/usr/src/man/man1/crle.1
index ecab0fa618..c6dabcf56f 100644
--- a/usr/src/man/man1/crle.1
+++ b/usr/src/man/man1/crle.1
@@ -3,11 +3,10 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH CRLE 1 "Oct 6, 2008"
+.TH CRLE 1 "Apr 15, 2020"
 .SH NAME
 crle \- configure runtime linking environment
 .SH SYNOPSIS
-.LP
 .nf
 \fBcrle\fR [\fB-64\fR] [\fB-a\fR \fIname\fR] [\fB-A\fR \fIname\fR] [\fB-c\fR \fIconf\fR] [\fB-e\fR \fIenv\fR] [\fB-E\fR \fIenv\fR]
      [\fB-f\fR \fIflags\fR] [\fB-i\fR \fIname\fR] [\fB-I\fR \fIname\fR] [\fB-g\fR \fIname\fR] [\fB-G\fR \fIname\fR]
@@ -15,7 +14,6 @@ crle \- configure runtime linking environment
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBcrle\fR utility provides for the creation and display of a runtime
 linking configuration file. The configuration file is read and interpreted by
 the runtime linker, \fBld.so.1\fR(1), during process startup. The runtime
@@ -182,7 +180,6 @@ alternate object is created in the directory specified by the preceding
 is created. The flags used by \fBdldump()\fR are specified using the \fB-f\fR
 option, or default to \fBRTLD_REL_RELATIVE\fR.
 .SH OPTIONS
-.LP
 The following options are supported.
 .sp
 .ne 2
@@ -383,8 +380,8 @@ The default search paths for 32-bit \fBELF\fR objects are \fB/lib\fR followed
 by \fB/usr/lib\fR. For 64-bit \fBELF\fR objects, the default search paths are
 \fB/lib/64\fR followed by \fB/usr/lib/64\fR.
 .sp
-The default search paths for \fBAOUT\fR objects are \fB/usr/4lib\fR, followed
-by \fB/usr/lib\fR and finally \fB/usr/local/lib\fR.
+The default search paths for \fBAOUT\fR objects are \fB/usr/lib\fR and
+\fB/usr/local/lib\fR.
 .sp
 Use of this option \fBreplaces\fR the default search path. Therefore, a
 \fB-l\fR option is normally required to specify the original system default in
@@ -502,7 +499,6 @@ the \fBLD_CONFIG\fR environment variable. An alternative configuration file can
 also be specified by recording the configuration file name in the application
 at the time the application is built. See the \fB-c\fR option of \fBld\fR(1).
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRExperimenting With a Temporary Configuration File
 .sp
 .LP
@@ -792,12 +788,10 @@ together with a permanent preload object which becomes appended to the process
 environment definition.
 
 .SH EXIT STATUS
-.LP
 The creation or display of a configuration file results in a \fB0\fR being
 returned. Otherwise, any error condition is accompanied with a diagnostic
 message and a non-zero value being returned.
 .SH NOTES
-.LP
 The ability to tag an alternative application to use an application-specific
 configuration file, is possible if the original application contains one of the
 \fI\&.dynamic\fR tags \fBDT_FLAGS_1\fR or \fBDT_FEATURE_1\fR. Without these
@@ -914,7 +908,6 @@ Audit library that is employed to \fBdldump\fR(3C) 64-bit objects.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.LP
 There are no environment variables that are referenced by \fBcrle\fR. However,
 several environment variables affect the runtime linkers behavior in regard to
 the processing of configuration files that are created by \fBcrle\fR.
@@ -969,7 +962,6 @@ Disable alternative object processing from a configuration file.
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes.
 .sp
 
@@ -984,7 +976,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.LP
 \fBfile\fR(1), \fBld\fR(1), \fBld.so.1\fR(1), \fBdldump\fR(3C),
 \fBtempnam\fR(3C), \fBattributes\fR(5)
 .sp
diff --git a/usr/src/man/man5/filesystem.5 b/usr/src/man/man5/filesystem.5
index f0420111c4..8b4cd14157 100644
--- a/usr/src/man/man5/filesystem.5
+++ b/usr/src/man/man5/filesystem.5
@@ -20,11 +20,10 @@
 .\" Copyright 2016 Nexenta Systems, Inc.
 .\" Copyright 2017 Peter Tribble
 .\"
-.TH FILESYSTEM 5 "Nov 26, 2017"
+.TH FILESYSTEM 5 "Apr 15, 2020"
 .SH NAME
 filesystem \- File system organization
 .SH SYNOPSIS
-.LP
 .nf
 /
 .fi
@@ -35,7 +34,6 @@ filesystem \- File system organization
 .fi
 
 .SH DESCRIPTION
-.LP
 The file system tree is organized for administrative convenience. Distinct
 areas within the file system tree are provided for files that are private to
 one machine, files that can be shared by multiple machines of a common
@@ -85,7 +83,6 @@ the \fBplatform-specific\fR file is installed only on a subset of supported
 platforms. Most platform-specific files are gathered under \fB/platform\fR and
 \fB/usr/platform\fR.
 .SS "Root File System"
-.LP
 The root file system contains files that are unique to each machine. It
 contains the following directories:
 .sp
@@ -1544,7 +1541,6 @@ Databases used by \fBNIS\fR and \fBypbind\fR(1M).
 .RE
 
 .SS "\fB/usr\fR File System"
-.LP
 Because it is desirable to keep the root file system small and not volatile, on
 disk-based systems larger file systems are often mounted on \fB/home\fR,
 \fB/opt\fR, \fB/usr\fR, and \fB/var\fR.
@@ -1566,16 +1562,6 @@ The \fB/usr\fR file system contains the following subdirectories:
 .sp
 .ne 2
 .na
-\fB\fB/usr/4lib\fR\fR
-.ad
-.sp .6
-.RS 4n
-\fBa.out\fR libraries for the Binary Compatibility Package.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/usr/5bin\fR\fR
 .ad
 .sp .6
@@ -2951,7 +2937,6 @@ Directory for newer versions of POSIX-compliant utilities.
 .RE
 
 .SH SEE ALSO
-.LP
 \fBat\fR(1), \fBex\fR(1), \fBiconv\fR(1), \fBlp\fR(1),
 \fBisainfo\fR(1), \fBmail\fR(1), \fBmailx\fR(1), \fBnroff\fR(1),
 \fBpriocntl\fR(1), \fBrefer\fR(1), \fBsar\fR(1), \fBsh\fR(1), \fBspell\fR(1),
diff --git a/usr/src/ucbcmd/Makefile.ucbcmd b/usr/src/ucbcmd/Makefile.ucbcmd
index d8d43c44d2..47cf585440 100644
--- a/usr/src/ucbcmd/Makefile.ucbcmd
+++ b/usr/src/ucbcmd/Makefile.ucbcmd
@@ -44,7 +44,6 @@ FILEMODE=	0555
 LIBFILEMODE=	0444
 ROOTBIN=	$(ROOT)/usr/ucb
 ROOTLIB=	$(ROOT)/usr/ucblib
-ROOT4LIB=	$(ROOT)/usr/4lib
 ROOTETC=	$(ROOT)/etc
 ROOTSHLIB=	$(ROOT)/usr/share/lib
 ROOTBIN32=	$(ROOTBIN)/$(MACH32)
@@ -52,7 +51,6 @@ ROOTBIN64=	$(ROOTBIN)/$(MACH64)
 
 ROOTPROG=	$(PROG:%=$(ROOTBIN)/%)
 ROOTLIBPROG=	$(PROG:%=$(ROOTLIB)/%)
-ROOT4LIBPROG=	$(PROG:%=$(ROOT4LIB)/%)
 ROOTETCPROG=	$(PROG:%=$(ROOTETC)/%)
 ROOTPROG64=	$(PROG:%=$(ROOTBIN64)/%)
 ROOTPROG32=	$(PROG:%=$(ROOTBIN32)/%)
@@ -79,9 +77,6 @@ $(ROOTBIN)/%: %
 $(ROOTLIB)/%: %
 	$(INS.file)
 
-$(ROOT4LIB)/%: %
-	$(INS.file)
-
 $(ROOTETC)/%: %
 	$(INS.file)