mergegcc9

4 files changed, 13 insertions, 59 deletions

diff --git a/usr/src/stand/lib/Makefile b/usr/src/stand/lib/Makefile
index 1548387abb..154094db33 100644
--- a/usr/src/stand/lib/Makefile
+++ b/usr/src/stand/lib/Makefile
@@ -28,13 +28,10 @@ include Makefile.com
 
 i386_SUBDIRS =
 sparc_SUBDIRS =
-SUBDIRS = fakeboot fs/hsfs fs/nfs fs/ufs inet sa sock tcpstubs xdr \
+SUBDIRS = fs/hsfs fs/nfs fs/ufs inet sa sock tcpstubs xdr \
 	tcp $($(MACH)_SUBDIRS)
 
-#
-# Don't lint fakeboot since it doesn't have any source files.
-#
-LINTSUBDIRS = $(SUBDIRS:fakeboot=)
+LINTSUBDIRS = $(SUBDIRS)
 
 #
 # We can get away with this since we're only building .a's, and by the
diff --git a/usr/src/stand/lib/Makefile.com b/usr/src/stand/lib/Makefile.com
index 1a68ceb21f..3c90551d8c 100644
--- a/usr/src/stand/lib/Makefile.com
+++ b/usr/src/stand/lib/Makefile.com
@@ -31,11 +31,10 @@ include $(SRC)/lib/Makefile.lib
 include $(SRC)/stand/lib/Makefile.$(MACH)
 
 SRCDIR =	.
-LIBS +=		$(LIBRARY) $(LINTLIB)
+LIBS +=		$(LIBRARY)
 CFLAGS +=	$(CCVERBOSE)
 LDFLAGS =	-r
-LDLIBS +=	-lsa -lfakeboot
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
+LDLIBS +=	-lsa
 
 #
 # Reset ROOTLIBDIR to an alternate directory so that we don't clash with
@@ -72,8 +71,8 @@ CMNDIR =	.
 # the proto area since those headers match libc's implementation, and
 # libc is of course not available to standalone binaries.
 #
-CPPDEFS	= 	-D$(KARCH) -D_BOOT -D_KERNEL -D_MACHDEP
-CPPINCS	= 	-YI,$(STANDDIR)/lib/sa -I$(STANDDIR)/lib/sa \
+CPPDEFS	=	-D$(KARCH) -D_BOOT -D_KERNEL -D_MACHDEP
+CPPINCS	=	-YI,$(STANDDIR)/lib/sa -I$(STANDDIR)/lib/sa \
 		-I$(STANDDIR) -I$(SRCDIR) -I$(CMNDIR) \
 		-I$(STANDDIR)/$(MACH) -I$(SYSDIR)/common $(ARCHDIRS) \
 		-I$(SYSDIR)/sun4 -I$(SYSDIR)/$(KARCH)
diff --git a/usr/src/stand/lib/fakeboot/Makefile b/usr/src/stand/lib/fakeboot/Makefile
deleted file mode 100644
index ebe3348aa5..0000000000
--- a/usr/src/stand/lib/fakeboot/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (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]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# For details on this atrocity see llib-lfakeboot.
-#
-
-LIBRARY = libfakeboot.a
-
-include ../Makefile.com
-
-LIBS	= $(LINTLIB)
-
-include ../Makefile.targ
diff --git a/usr/src/stand/sys/bootsyms.h b/usr/src/stand/sys/bootsyms.h
index 9f8b6c636f..d09d58854c 100644
--- a/usr/src/stand/sys/bootsyms.h
+++ b/usr/src/stand/sys/bootsyms.h
@@ -38,20 +38,15 @@
  * workaround exists for lint's pass2, which requires definitions for all
  * symbols in order to properly perform cross-checks.
  *
- * Thus, this header file was created to address two problems:
+ * Thus, this header file was created to address the problems:
  *
- *	1. The "extern" problem.  All files beneath stand/lib should #include
- *	   this file rather than "extern" the symbol. Additionally, existing
- *	   externs should be removed as convenient.
+ *	- The "extern" problem.  All files beneath stand/lib should #include
+ *	  this file rather than "extern" the symbol. Additionally, existing
+ *	  externs should be removed as convenient.
  *
- *	   Of course, eventually some brave soul needs to venture over to the
- *	   slums of psm/stand and add all the proper header files, at which
- *	   point this file can be disposed of.
- *
- *	2. The lint pass2 problem.  Specifically, this file is used to build
- *	   llib-lfakeboot.ln, which is then used to properly lint the
- *	   binaries under stand/lib.  See stand/lib/llib-lfakeboot for more
- *	   details.
+ *	  Of course, eventually some brave soul needs to venture over to the
+ *	  slums of psm/stand and add all the proper header files, at which
+ *	  point this file can be disposed of.
  *
  * Note that the set of symbols shared between stand/lib and psm/stand is
  * itself a moving target.  As such, this file should be updated as needed