mergegcc9

25 files changed, 21 insertions, 42 deletions

diff --git a/usr/src/lib/brand/Makefile b/usr/src/lib/brand/Makefile
index 8b25716c27..a095ec4a63 100644
--- a/usr/src/lib/brand/Makefile
+++ b/usr/src/lib/brand/Makefile
@@ -44,6 +44,7 @@ _msg :=		TARGET= _msg
 
 all install clean clobber: $(SUBDIRS)
 
+
 _msg: $(MSGSUBDIRS)
 
 $(SUBDIRS): FRC
diff --git a/usr/src/lib/brand/bhyve/zone/boot.c b/usr/src/lib/brand/bhyve/zone/boot.c
index 645958d14a..3d26e350d4 100644
--- a/usr/src/lib/brand/bhyve/zone/boot.c
+++ b/usr/src/lib/brand/bhyve/zone/boot.c
@@ -286,6 +286,8 @@ add_disk(char *disk, char *path, char *slotconf, size_t slotconf_len)
 		    strcmp(guest_block_size, "0") == 0) {
 			guest_block_size = NULL;
 		}
+	} else if (is_env_string("device", disk, "model", "nvme")) {
+		model = "nvme";
 	} else if (is_env_string("device", disk, "model", "ahci")) {
 		if (is_env_string("device", disk, "media", "cdrom")) {
 			model = "ahci-cd";
diff --git a/usr/src/lib/brand/ipkg/Makefile b/usr/src/lib/brand/ipkg/Makefile
index 780492a648..334dcd4eae 100644
--- a/usr/src/lib/brand/ipkg/Makefile
+++ b/usr/src/lib/brand/ipkg/Makefile
@@ -34,9 +34,9 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
+
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/ipkg/zone/Makefile b/usr/src/lib/brand/ipkg/zone/Makefile
index 3f5183966b..b88e80ebe9 100644
--- a/usr/src/lib/brand/ipkg/zone/Makefile
+++ b/usr/src/lib/brand/ipkg/zone/Makefile
@@ -39,6 +39,5 @@ install: $(ROOTXMLDOCS) $(ROOTTEMPLATES)
 
 clean:
 
-lint:
 
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/lib/brand/labeled/Makefile b/usr/src/lib/brand/labeled/Makefile
index 7c0382b702..085ea1cc6e 100644
--- a/usr/src/lib/brand/labeled/Makefile
+++ b/usr/src/lib/brand/labeled/Makefile
@@ -34,9 +34,9 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
+
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/labeled/zone/Makefile b/usr/src/lib/brand/labeled/zone/Makefile
index 9a3479d599..18268bcefc 100644
--- a/usr/src/lib/brand/labeled/zone/Makefile
+++ b/usr/src/lib/brand/labeled/zone/Makefile
@@ -36,6 +36,5 @@ install: $(ROOTXMLDOCS)
 
 clean:
 
-lint:
 
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/lib/brand/shared/Makefile b/usr/src/lib/brand/shared/Makefile
index 9cb19dc163..2d03ab8a42 100644
--- a/usr/src/lib/brand/shared/Makefile
+++ b/usr/src/lib/brand/shared/Makefile
@@ -34,12 +34,12 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
+
 
 _msg: $(MSGSUBDIRS)
 
diff --git a/usr/src/lib/brand/shared/brand/Makefile b/usr/src/lib/brand/shared/brand/Makefile
index 1bb18cd84d..e8ec0d6de9 100644
--- a/usr/src/lib/brand/shared/brand/Makefile
+++ b/usr/src/lib/brand/shared/brand/Makefile
@@ -33,12 +33,12 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint _msg: $(SUBDIRS)
+all install clean clobber _msg: $(SUBDIRS)
+
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/shared/librtld_db/Makefile.com b/usr/src/lib/brand/shared/librtld_db/Makefile.com
index 30fef02f93..ec5d706d43 100644
--- a/usr/src/lib/brand/shared/librtld_db/Makefile.com
+++ b/usr/src/lib/brand/shared/librtld_db/Makefile.com
@@ -71,7 +71,6 @@ DTEXTDOM =
 
 all: $(LIBS)
 
-lint: lintcheck
 
 pics/%64.o:	$(BRAND_SHARED)/librtld_db/common/%.c
 		$(COMPILE.c) -D_ELF64 $(PICFLAGS) -o $@ $<
diff --git a/usr/src/lib/brand/shared/zone/Makefile b/usr/src/lib/brand/shared/zone/Makefile
index cede2f17b5..77b9ee9bf0 100644
--- a/usr/src/lib/brand/shared/zone/Makefile
+++ b/usr/src/lib/brand/shared/zone/Makefile
@@ -45,6 +45,5 @@ install: $(ROOTSHARED)
 
 clean:
 
-lint:
 
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/lib/brand/sn1/Makefile b/usr/src/lib/brand/sn1/Makefile
index e717c249a2..2ea7d34e5c 100644
--- a/usr/src/lib/brand/sn1/Makefile
+++ b/usr/src/lib/brand/sn1/Makefile
@@ -37,12 +37,12 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
+
 
 _msg: $(MSGSUBDIRS)
 
diff --git a/usr/src/lib/brand/sn1/librtld_db/Makefile b/usr/src/lib/brand/sn1/librtld_db/Makefile
index c6af8446a7..56397551e6 100644
--- a/usr/src/lib/brand/sn1/librtld_db/Makefile
+++ b/usr/src/lib/brand/sn1/librtld_db/Makefile
@@ -30,20 +30,15 @@ include $(SRC)/lib/Makefile.lib
 SUBDIRS = $(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
-LINT_SUBDIRS=	$(MACH)
-$(BUILD64)LINT_SUBDIRS += $(MACH64)
-
 all :=          TARGET= all
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 install :=      TARGET= install
-lint :=         TARGET= lint
 
 .KEEP_STATE:
 
 all install clean clobber: $(SUBDIRS)
 
-lint: $(LINT_SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/sn1/sn1_brand/Makefile b/usr/src/lib/brand/sn1/sn1_brand/Makefile
index 4b667e1fa8..52ed1b855a 100644
--- a/usr/src/lib/brand/sn1/sn1_brand/Makefile
+++ b/usr/src/lib/brand/sn1/sn1_brand/Makefile
@@ -34,12 +34,12 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint _msg: $(SUBDIRS)
+all install clean clobber _msg: $(SUBDIRS)
+
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/sn1/sn1_brand/Makefile.com b/usr/src/lib/brand/sn1/sn1_brand/Makefile.com
index 8209995ce6..38435fc044 100644
--- a/usr/src/lib/brand/sn1/sn1_brand/Makefile.com
+++ b/usr/src/lib/brand/sn1/sn1_brand/Makefile.com
@@ -77,6 +77,5 @@ $(LIBS):= PICS += $(SHAREDOBJS)
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/brand/sn1/zone/Makefile b/usr/src/lib/brand/sn1/zone/Makefile
index 7d8877afaa..15fc9f3111 100644
--- a/usr/src/lib/brand/sn1/zone/Makefile
+++ b/usr/src/lib/brand/sn1/zone/Makefile
@@ -42,7 +42,6 @@ $(POFILE): $(POFILES)
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
 
-lint:
 
 clean:
 	-$(RM) $(PROGS) $(POFILES) $(POFILE)
diff --git a/usr/src/lib/brand/solaris10/Makefile b/usr/src/lib/brand/solaris10/Makefile
index 2fc25a7dab..8238b6d2b8 100644
--- a/usr/src/lib/brand/solaris10/Makefile
+++ b/usr/src/lib/brand/solaris10/Makefile
@@ -37,12 +37,12 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
+
 
 _msg: $(MSGSUBDIRS)
 
diff --git a/usr/src/lib/brand/solaris10/cmd/Makefile b/usr/src/lib/brand/solaris10/cmd/Makefile
index 99ac1cce10..3ef9e0412f 100644
--- a/usr/src/lib/brand/solaris10/cmd/Makefile
+++ b/usr/src/lib/brand/solaris10/cmd/Makefile
@@ -40,7 +40,6 @@ s10_python_wrapper.sh:	s10_python_wrapper.sh.in
 
 all: $(PROGS)
 
-lint:
 
 install: all $(ROOTPROGS)
 
diff --git a/usr/src/lib/brand/solaris10/librtld_db/Makefile b/usr/src/lib/brand/solaris10/librtld_db/Makefile
index ad185d3c32..a71dfb6ad0 100644
--- a/usr/src/lib/brand/solaris10/librtld_db/Makefile
+++ b/usr/src/lib/brand/solaris10/librtld_db/Makefile
@@ -30,20 +30,15 @@ include $(SRC)/lib/Makefile.lib
 SUBDIRS = $(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
-LINT_SUBDIRS=	$(MACH)
-$(BUILD64)LINT_SUBDIRS += $(MACH64)
-
 all :=          TARGET= all
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 install :=      TARGET= install
-lint :=         TARGET= lint
 
 .KEEP_STATE:
 
 all install clean clobber: $(SUBDIRS)
 
-lint: $(LINT_SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/solaris10/s10_brand/Makefile b/usr/src/lib/brand/solaris10/s10_brand/Makefile
index 4b667e1fa8..52ed1b855a 100644
--- a/usr/src/lib/brand/solaris10/s10_brand/Makefile
+++ b/usr/src/lib/brand/solaris10/s10_brand/Makefile
@@ -34,12 +34,12 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint _msg: $(SUBDIRS)
+all install clean clobber _msg: $(SUBDIRS)
+
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
index c644b3bc0b..d4c5e5f683 100644
--- a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
+++ b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
@@ -80,12 +80,9 @@ CPPFLAGS +=	-D_REENTRANT -U_ASM \
 CFLAGS +=	$(CCVERBOSE)
 # Needed to handle zfs include files
 CSTD=	$(CSTD_GNU99)
-C99LMODE=	-Xc99=%all
 DYNFLAGS +=	$(DYNFLAGS_$(CLASS))
 DYNFLAGS +=	$(BLOCAL) $(ZNOVERSION) -Wl,-e_start
 LDLIBS +=	-lmapmalloc -lc
-LINTFLAGS +=	-erroff=E_STATIC_UNUSED
-LINTFLAGS64 +=	-erroff=E_STATIC_UNUSED
 
 CERRWARN +=	$(CNOWARN_UNINIT)
 
diff --git a/usr/src/lib/brand/solaris10/s10_npreload/Makefile b/usr/src/lib/brand/solaris10/s10_npreload/Makefile
index 4b667e1fa8..52ed1b855a 100644
--- a/usr/src/lib/brand/solaris10/s10_npreload/Makefile
+++ b/usr/src/lib/brand/solaris10/s10_npreload/Makefile
@@ -34,12 +34,12 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint _msg: $(SUBDIRS)
+all install clean clobber _msg: $(SUBDIRS)
+
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/solaris10/s10_npreload/Makefile.com b/usr/src/lib/brand/solaris10/s10_npreload/Makefile.com
index 658b4ea411..f4c19e2278 100644
--- a/usr/src/lib/brand/solaris10/s10_npreload/Makefile.com
+++ b/usr/src/lib/brand/solaris10/s10_npreload/Makefile.com
@@ -51,6 +51,5 @@ CLEANFILES +=	$(DYNLIB)
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/brand/solaris10/s10_replacefile/Makefile b/usr/src/lib/brand/solaris10/s10_replacefile/Makefile
index dd0bebe3c3..b0da43c84d 100644
--- a/usr/src/lib/brand/solaris10/s10_replacefile/Makefile
+++ b/usr/src/lib/brand/solaris10/s10_replacefile/Makefile
@@ -47,6 +47,5 @@ install:	all $(ROOTPROGS)
 clean:
 		$(RM) $(PROG) $(OBJS)
 
-lint:		lint_PROG
 
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/lib/brand/solaris10/s10_support/Makefile b/usr/src/lib/brand/solaris10/s10_support/Makefile
index 0c3015084f..6e32629e55 100644
--- a/usr/src/lib/brand/solaris10/s10_support/Makefile
+++ b/usr/src/lib/brand/solaris10/s10_support/Makefile
@@ -48,6 +48,5 @@ install:	all $(ROOTPROGS)
 clean:
 		$(RM) $(OBJS)
 
-lint:		lint_PROG
 
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/lib/brand/solaris10/zone/Makefile b/usr/src/lib/brand/solaris10/zone/Makefile
index b15fa490eb..f126039834 100644
--- a/usr/src/lib/brand/solaris10/zone/Makefile
+++ b/usr/src/lib/brand/solaris10/zone/Makefile
@@ -48,7 +48,6 @@ $(POFILE): $(POFILES)
 
 install: $(PROGS) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES) $(ETCUSER)
 
-lint:
 
 clean:
 	-$(RM) $(PROGS) $(POFILES) $(POFILE)