mergegcc9

9 files changed, 15 insertions, 77 deletions

diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine
index 12b742ef1a..0bad757481 100644
--- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine
+++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine
@@ -51,19 +51,13 @@ DMOD_OBJS = $(DMOD_SRCS:%.c=%.o)
 ROOTPROG = $(ROOTPLUGINLIBDIR)/scsi/engines/$(PROG)
 ROOTPROG64 = $(ROOTPLUGINLIBDIR)/scsi/engines/$(MACH64)/$(PROG)
 
-LINTFLAGS += -mu
-LINTFILES = $(SRCS:%.c=%.ln)
-
-DMODLINTTGT = $(DMOD:%=lint_dmod)
-DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln)
-
 APIMAP = ../../../../../libscsi/libscsi_api.map
 
 CSTD = $(CSTD_GNU99)
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
-CFLAGS += -G $(XREGSFLAG) 
+CFLAGS += -G $(XREGSFLAG)
 CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
-CFLAGS64 += -G $(XREGSFLAG) 
+CFLAGS64 += -G $(XREGSFLAG)
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 CPPFLAGS += -I../../../../../libscsi/common
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ
index edeaa039e3..e60697fbed 100644
--- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ
+++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ
@@ -29,7 +29,7 @@
 all: $(PROG) $(DMODPROG)
 
 .NO_PARALLEL:
-.PARALLEL: $(OBJS) $(LINTFILES) $(DMOD_OBJS) $(DMODLINTFILES)
+.PARALLEL: $(OBJS) $(DMOD_OBJS)
 
 $(PROG): $(OBJS) $(APIMAP)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
@@ -50,24 +50,11 @@ $(DMODPROG): $(DMOD_OBJS)
 	$(CTFCONVERT_O)
 
 clean:
-	$(RM) $(OBJS) $(DMOD_OBJS) $(LINTFILES) $(DMODLINTFILES) $(CLEANFILES)
+	$(RM) $(OBJS) $(DMOD_OBJS) $(CLEANFILES)
 
 clobber: clean
 	$(RM) $(PROG) $(DMODPROG)
 
-%.ln: %.c
-	$(LINT.c) -c $<
-
-%.ln: ../%.c
-	$(LINT.c) -c $<
-
-lint_prog: $(LINTFILES)
-	$(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS)
-
-lint_dmod: $(DMODLINTFILES)
-	$(LINT) $(LINTFLAGS) $(DMODLINTFILES) $(LDLIBS)
-
-lint: lint_prog $(DMODLINTTGT)
 
 install_h:
 
diff --git a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile
index ae7db6b449..bcc158c629 100644
--- a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile
+++ b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 include $(SRC)/Makefile.master
 
@@ -34,12 +33,11 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 install_h:=	TARGET = install_h
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 install_h check:
 
diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.lib b/usr/src/lib/scsi/plugins/ses/Makefile.lib
index c8bbd52561..4d9d106f2e 100644
--- a/usr/src/lib/scsi/plugins/ses/Makefile.lib
+++ b/usr/src/lib/scsi/plugins/ses/Makefile.lib
@@ -61,19 +61,13 @@ ROOTPROG64 = $(ROOTPLUGINDIR64)/$(PROG)
 ROOTALIASES = $(ALIASES:%=$(ROOTPLUGINDIR)/%.so)
 ROOTALIASES64 = $(ALIASES:%=$(ROOTPLUGINDIR64)/%.so)
 
-LINTFLAGS += -mu
-LINTFILES = $(SRCS:%.c=%.ln)
-
-DMODLINTTGT = $(DMOD:%=lint_dmod)
-DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln)
-
 APIMAP = ../../../../libses/libses_api.map
 
 CSTD = $(CSTD_GNU99)
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
-CFLAGS += -G $(XREGSFLAG) 
+CFLAGS += -G $(XREGSFLAG)
 CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
-CFLAGS64 += -G $(XREGSFLAG) 
+CFLAGS64 += -G $(XREGSFLAG)
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 LDFLAGS += $(ZTEXT) $(ZIGNORE)
diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.plugin b/usr/src/lib/scsi/plugins/ses/Makefile.plugin
index fe0f796fd2..9f86dc0b89 100644
--- a/usr/src/lib/scsi/plugins/ses/Makefile.plugin
+++ b/usr/src/lib/scsi/plugins/ses/Makefile.plugin
@@ -23,7 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 include $(SRC)/Makefile.master
 
@@ -39,12 +38,11 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 install_h:=	TARGET = install_h
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 install_h: $(ROOTHDRDIR) $(ROOTHDRS)
 
diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.targ b/usr/src/lib/scsi/plugins/ses/Makefile.targ
index 1753da2da4..a7a3ac5a84 100644
--- a/usr/src/lib/scsi/plugins/ses/Makefile.targ
+++ b/usr/src/lib/scsi/plugins/ses/Makefile.targ
@@ -29,7 +29,7 @@
 all: $(PROG) $(DMODPROG)
 
 .NO_PARALLEL:
-.PARALLEL: $(OBJS) $(LINTFILES) $(DMOD_OBJS) $(DMODLINTFILES)
+.PARALLEL: $(OBJS) $(DMOD_OBJS)
 
 $(PROG): $(OBJS) $(APIMAP)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
@@ -50,24 +50,11 @@ $(DMODPROG): $(DMOD_OBJS)
 	$(CTFCONVERT_O)
 
 clean:
-	$(RM) $(OBJS) $(DMOD_OBJS) $(LINTFILES) $(DMODLINTFILES) $(CLEANFILES)
+	$(RM) $(OBJS) $(DMOD_OBJS) $(CLEANFILES)
 
 clobber: clean
 	$(RM) $(PROG) $(DMODPROG)
 
-%.ln: %.c
-	$(LINT.c) -c $<
-
-%.ln: $(SRCDIR)/%.c
-	$(LINT.c) -c $<
-
-lint_prog: $(LINTFILES)
-	$(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS)
-
-lint_dmod: $(DMODLINTFILES)
-	$(LINT) $(LINTFLAGS) $(DMODLINTFILES) $(LDLIBS)
-
-lint: lint_prog $(DMODLINTTGT)
 
 install_h:
 
diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.lib b/usr/src/lib/scsi/plugins/smp/Makefile.lib
index 3ef898705c..0474284472 100644
--- a/usr/src/lib/scsi/plugins/smp/Makefile.lib
+++ b/usr/src/lib/scsi/plugins/smp/Makefile.lib
@@ -60,19 +60,13 @@ ROOTPROG64 = $(ROOTPLUGINDIR64)/$(PROG)
 ROOTALIASES = $(ALIASES:%=$(ROOTPLUGINDIR)/%.so)
 ROOTALIASES64 = $(ALIASES:%=$(ROOTPLUGINDIR64)/%.so)
 
-LINTFLAGS += -mu
-LINTFILES = $(SRCS:%.c=%.ln)
-
-DMODLINTTGT = $(DMOD:%=lint_dmod)
-DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln)
-
 APIMAP = ../../../../libsmp/libsmp_api.map
 
 CSTD = $(CSTD_GNU99)
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
-CFLAGS += -G $(XREGSFLAG) 
+CFLAGS += -G $(XREGSFLAG)
 CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
-CFLAGS64 += -G $(XREGSFLAG) 
+CFLAGS64 += -G $(XREGSFLAG)
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZIGNORE)
diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.plugin b/usr/src/lib/scsi/plugins/smp/Makefile.plugin
index add83a92c4..9a0ee38b71 100644
--- a/usr/src/lib/scsi/plugins/smp/Makefile.plugin
+++ b/usr/src/lib/scsi/plugins/smp/Makefile.plugin
@@ -37,12 +37,11 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 install_h:=	TARGET = install_h
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 install_h: $(ROOTHDRDIR) $(ROOTHDRS)
 
diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.targ b/usr/src/lib/scsi/plugins/smp/Makefile.targ
index 450fbd9562..4ee9ad587d 100644
--- a/usr/src/lib/scsi/plugins/smp/Makefile.targ
+++ b/usr/src/lib/scsi/plugins/smp/Makefile.targ
@@ -27,7 +27,7 @@
 all: $(PROG) $(DMODPROG)
 
 .NO_PARALLEL:
-.PARALLEL: $(OBJS) $(LINTFILES) $(DMOD_OBJS) $(DMODLINTFILES)
+.PARALLEL: $(OBJS) $(DMOD_OBJS)
 
 $(PROG): $(OBJS) $(APIMAP)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
@@ -48,24 +48,11 @@ $(DMODPROG): $(DMOD_OBJS)
 	$(CTFCONVERT_O)
 
 clean:
-	$(RM) $(OBJS) $(DMOD_OBJS) $(LINTFILES) $(DMODLINTFILES) $(CLEANFILES)
+	$(RM) $(OBJS) $(DMOD_OBJS) $(CLEANFILES)
 
 clobber: clean
 	$(RM) $(PROG) $(DMODPROG)
 
-%.ln: %.c
-	$(LINT.c) -c $<
-
-%.ln: $(SRCDIR)/%.c
-	$(LINT.c) -c $<
-
-lint_prog: $(LINTFILES)
-	$(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS)
-
-lint_dmod: $(DMODLINTFILES)
-	$(LINT) $(LINTFLAGS) $(DMODLINTFILES) $(LDLIBS)
-
-lint: lint_prog $(DMODLINTTGT)
 
 install_h: