mergegcc9

8 files changed, 9 insertions, 28 deletions

diff --git a/usr/src/lib/storage/Makefile b/usr/src/lib/storage/Makefile
index ec0e5bd34c..7f9504e6ea 100644
--- a/usr/src/lib/storage/Makefile
+++ b/usr/src/lib/storage/Makefile
@@ -31,11 +31,10 @@ all	:= TARGET = all
 clean	:= TARGET = clean
 clobber	:= TARGET = clobber
 check	:= TARGET = check
-lint	:= TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber lint install: $(SRCSUBDIRS)
+all clean clobber install: $(SRCSUBDIRS)
 
 install_h check: $(ALLSUBDIRS)
 
diff --git a/usr/src/lib/storage/liba5k/Makefile b/usr/src/lib/storage/liba5k/Makefile
index 5f5092904e..0ed87ae65d 100644
--- a/usr/src/lib/storage/liba5k/Makefile
+++ b/usr/src/lib/storage/liba5k/Makefile
@@ -35,14 +35,13 @@ install_h :=	TARGET= install_h
 check :=	TARGET= check
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 
 HDRS =	a5k.h a_state.h exec.h rom.h
 HDRDIR = common/hdrs
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install_h:      $(ROOTHDRS)
 check:          $(CHECKHDRS)
diff --git a/usr/src/lib/storage/liba5k/Makefile.com b/usr/src/lib/storage/liba5k/Makefile.com
index 91c40ddda7..f7986c860a 100644
--- a/usr/src/lib/storage/liba5k/Makefile.com
+++ b/usr/src/lib/storage/liba5k/Makefile.com
@@ -32,27 +32,19 @@ OBJECTS =	diag.o \
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
-LIBS =	$(DYNLIB) $(LINTLIB)
+LIBS =	$(DYNLIB)
 
 SRCDIR	= ../common
 
 .KEEP_STATE:
 
-COMMON_LINTFLAGS = -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY
-COMMON_LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT
-
-LINTFLAGS += $(COMMON_LINTFLAGS) 
-LINTFLAGS64 +=  $(COMMON_LINTFLAGS)
-
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += $(CNOWARN_UNINIT)
 
 LDLIBS += -lc -ldevice -lg_fc
 
-$(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include  ../../../Makefile.targ
diff --git a/usr/src/lib/storage/liba5k/sparc/Makefile b/usr/src/lib/storage/liba5k/sparc/Makefile
index 4d168987d0..63d3db287c 100644
--- a/usr/src/lib/storage/liba5k/sparc/Makefile
+++ b/usr/src/lib/storage/liba5k/sparc/Makefile
@@ -28,4 +28,4 @@ include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/storage/libg_fc/Makefile b/usr/src/lib/storage/libg_fc/Makefile
index a34711fa65..1c6447ae6d 100644
--- a/usr/src/lib/storage/libg_fc/Makefile
+++ b/usr/src/lib/storage/libg_fc/Makefile
@@ -32,19 +32,18 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 
 
 HDRS = gfc.h g_state.h g_scsi.h
 HDRDIR = common/hdrs
 
 .KEEP_STATE:
- 
+
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/storage/libg_fc/Makefile.com b/usr/src/lib/storage/libg_fc/Makefile.com
index 41a7abbac5..d9cbead7d3 100644
--- a/usr/src/lib/storage/libg_fc/Makefile.com
+++ b/usr/src/lib/storage/libg_fc/Makefile.com
@@ -37,27 +37,19 @@ OBJECTS=	cmd.o	    \
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
-LIBS =	$(DYNLIB) $(LINTLIB)
+LIBS =	$(DYNLIB)
 
 SRCDIR = ../common
 
 LDLIBS += -lc -ldevinfo -ldevice -lnvpair -ldevid
 
-COMMON_LINTFLAGS = -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY
-COMMON_LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT
-
-LINTFLAGS += $(COMMON_LINTFLAGS)
-LINTFLAGS64 += $(COMMON_LINTFLAGS)
-
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += $(CNOWARN_UNINIT)
 
-$(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include  ../../../Makefile.targ
diff --git a/usr/src/lib/storage/libg_fc/sparc/Makefile b/usr/src/lib/storage/libg_fc/sparc/Makefile
index 7c01618599..6d8ce8465c 100644
--- a/usr/src/lib/storage/libg_fc/sparc/Makefile
+++ b/usr/src/lib/storage/libg_fc/sparc/Makefile
@@ -27,4 +27,4 @@ include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/storage/libg_fc/sparcv9/Makefile b/usr/src/lib/storage/libg_fc/sparcv9/Makefile
index b86d3f1aa6..f20c879508 100644
--- a/usr/src/lib/storage/libg_fc/sparcv9/Makefile
+++ b/usr/src/lib/storage/libg_fc/sparcv9/Makefile
@@ -27,6 +27,6 @@ include ../../../Makefile.lib.64
 
 .KEEP_STATE:
 
-all: $(LIBS) 
+all: $(LIBS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)