mergegcc9

4 files changed, 14 insertions, 25 deletions

diff --git a/usr/src/lib/libast/Makefile b/usr/src/lib/libast/Makefile
index 2cd1e2bdf3..d9faffb382 100644
--- a/usr/src/lib/libast/Makefile
+++ b/usr/src/lib/libast/Makefile
@@ -35,14 +35,13 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
-_msg := 	TARGET= _msg
+_msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all clean clobber install lint _msg: $(SUBDIRS)
+all clean clobber install _msg: $(SUBDIRS)
 
-LIBRARY= 	libast.a
+LIBRARY=	libast.a
 
 HDRS=	\
 	align.h \
diff --git a/usr/src/lib/libast/Makefile.com b/usr/src/lib/libast/Makefile.com
index b701451368..4385e64f53 100644
--- a/usr/src/lib/libast/Makefile.com
+++ b/usr/src/lib/libast/Makefile.com
@@ -673,15 +673,13 @@ include ../../../Makefile.ast
 # and $(TRANSMACH) (generated)
 SRCS=		$(OBJECTS:%.o=../%.c)
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
 LDLIBS += \
 	-lsocket \
 	-lm \
 	-lc
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
-
 SRCDIR =	../common
 
 # We use "=" here since using $(CPPFLAGS.master) is very tricky in our
@@ -751,27 +749,19 @@ pics/common/hash/memhash.o		:= CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LON
 pics/common/hash/memsum.o		:= CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG
 pics/common/hash/strhash.o		:= CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG
 pics/common/hash/strsum.o		:= CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG
-pics/common/misc/recstr.o 		:= CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED
-pics/common/misc/translate.o 		:= CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED
+pics/common/misc/recstr.o		:= CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED
+pics/common/misc/translate.o		:= CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED
 pics/common/path/pathkey.o		:= CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG
 pics/common/port/astconf.o		:= CERRWARN += -erroff=E_CONST_OBJ_SHOULD_HAVE_INITIZR
-pics/common/stdio/fflush.o 		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
-pics/common/stdio/getline.o 		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
-pics/common/sfio/sfmove.o 		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
-pics/common/sfio/sfrd.o 		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
-pics/common/sfio/sfvscanf.o 		:= CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED
-pics/common/tm/tmxduration.o 		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
+pics/common/stdio/fflush.o		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
+pics/common/stdio/getline.o		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
+pics/common/sfio/sfmove.o		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
+pics/common/sfio/sfrd.o			:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
+pics/common/sfio/sfvscanf.o		:= CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED
+pics/common/tm/tmxduration.o		:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
 
 .KEEP_STATE:
 
 all: mkpicdirs .WAIT $(LIBS)
 
-#
-# libast is not lint-clean yet; fake up a target.  (You can use
-# "make lintcheck" to actually run lint; please send all lint fixes
-# upstream (to AT&T) so the next update will pull them into ON.)
-#
-lint:
-	@ print "usr/src/lib/libast is not lint-clean: skipping"
-
 include ../../Makefile.targ
diff --git a/usr/src/lib/libast/i386/Makefile b/usr/src/lib/libast/i386/Makefile
index f601e12e04..a42bed719a 100644
--- a/usr/src/lib/libast/i386/Makefile
+++ b/usr/src/lib/libast/i386/Makefile
@@ -41,4 +41,4 @@ include ../Makefile.com
 # (and on 32bit it is close to the barrier)
 i386_C_PICFLAGS  = $(C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/libast/sparc/Makefile b/usr/src/lib/libast/sparc/Makefile
index 54f6ad2f28..96eee28151 100644
--- a/usr/src/lib/libast/sparc/Makefile
+++ b/usr/src/lib/libast/sparc/Makefile
@@ -42,4 +42,4 @@ include ../Makefile.com
 # (and on 32bit it is close to the barrier)
 sparc_C_PICFLAGS = $(C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)