mergegcc9

6 files changed, 8 insertions, 29 deletions

diff --git a/usr/src/lib/libnvpair/Makefile b/usr/src/lib/libnvpair/Makefile
index 1dc8b802b0..920b1e36fa 100644
--- a/usr/src/lib/libnvpair/Makefile
+++ b/usr/src/lib/libnvpair/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.lib
 
@@ -35,7 +33,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 test :=		TARGET= test
 
 # definitions for install_h target
@@ -46,7 +43,7 @@ CHECKHDRS=	$(HDRS:%.h=%.check)
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 # install rule for install_h target
 
diff --git a/usr/src/lib/libnvpair/Makefile.com b/usr/src/lib/libnvpair/Makefile.com
index 3a58a7e630..367a6ad657 100644
--- a/usr/src/lib/libnvpair/Makefile.com
+++ b/usr/src/lib/libnvpair/Makefile.com
@@ -50,22 +50,11 @@ SRCS=		../libnvpair.c \
 # Libraries added to the next line must be present in miniroot
 #
 LDLIBS +=	-lc -lnsl
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
 # turn off ptr-cast warnings
-LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
 
 # turn off warning caused by lint bug: not understanding SCNi8 "hhi"
-LINTFLAGS +=	-erroff=E_BAD_FORMAT_STR2
-LINTFLAGS +=	-erroff=E_INVALID_TOKEN_IN_DEFINE_MACRO
-LINTFLAGS +=	-erroff=E_RET_INT_IMPLICITLY
-LINTFLAGS +=	-erroff=E_FUNC_USED_VAR_ARG2
-LINTFLAGS +=	-erroff=E_CONSTANT_CONDITION
-LINTFLAGS64 +=	-erroff=E_BAD_FORMAT_STR2
-LINTFLAGS64 +=	-erroff=E_INVALID_TOKEN_IN_DEFINE_MACRO
-LINTFLAGS64 +=	-erroff=E_RET_INT_IMPLICITLY
-LINTFLAGS64 +=	-erroff=E_FUNC_USED_VAR_ARG2
-LINTFLAGS64 +=	-erroff=E_CONSTANT_CONDITION
 
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-parentheses
@@ -75,15 +64,12 @@ CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
 
 CSTD=	$(CSTD_GNU99)
-C99LMODE=	-Xc99=%all
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libnvpair/amd64/Makefile b/usr/src/lib/libnvpair/amd64/Makefile
index cb39a2beff..ab72b4df45 100644
--- a/usr/src/lib/libnvpair/amd64/Makefile
+++ b/usr/src/lib/libnvpair/amd64/Makefile
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libnvpair/i386/Makefile b/usr/src/lib/libnvpair/i386/Makefile
index af76f5ab90..59045395eb 100644
--- a/usr/src/lib/libnvpair/i386/Makefile
+++ b/usr/src/lib/libnvpair/i386/Makefile
@@ -23,9 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libnvpair/sparc/Makefile b/usr/src/lib/libnvpair/sparc/Makefile
index af76f5ab90..59045395eb 100644
--- a/usr/src/lib/libnvpair/sparc/Makefile
+++ b/usr/src/lib/libnvpair/sparc/Makefile
@@ -23,9 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libnvpair/sparcv9/Makefile b/usr/src/lib/libnvpair/sparcv9/Makefile
index cb39a2beff..ab72b4df45 100644
--- a/usr/src/lib/libnvpair/sparcv9/Makefile
+++ b/usr/src/lib/libnvpair/sparcv9/Makefile
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)