[illumos-gate merge]

commit 2a1fd0ffe121888d44fdec321c25b53dcfaa9118
    10318 Remove starfire support
commit 84a8796cdac4378079f720e0ca4d2ff15eb1b8b7
    10353 uts: tem_safe_pix_clear_prom_output() fails to clear the first line
commit e09cef950d257b6d3955013d461825bbc79322ef
    10345 segspt_badop: cast between incompatible function types
commit 5a80180135ef1464c88328124fbd15e94a5fb632
    10337 uts: tem implement cls callback & visual_io v4
commit 82bb7c22d8e83f1de600f67544ab4c79e4d44b14
    10331 uts: gfx_private bitmap framebuffer implementation
commit 11f30dc397b17ef5d8b607824b7b028e4d3c4648
    10314 nvmeadm: NULL pointer errors
commit 0fbb50554d1bc9b33ef3b8e4e35eef6d94a8a56e
    10237 Disable smatch for iasl
commit f821b9564d61a645b0618fe71d527eeec8b2e4b5
    10339 uts: x86 should have tem 80x25
commit 09e2ab34f6c69b170fe7478e8b011d6bb505e0d9
    10322 usr/lib/libc - remove lint and lint libraries

	Conflicts:
	usr/src/uts/i86xpv/Makefile.files

5 files changed, 11 insertions, 215 deletions

diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile
index 531020ee23..9f2e51e4f7 100644
--- a/usr/src/lib/libc/Makefile
+++ b/usr/src/lib/libc/Makefile
@@ -23,6 +23,7 @@
 #
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 # Copyright (c) 2018, Joyent, Inc.
 #
@@ -44,11 +45,6 @@ ROOTFS_LIB64=	$(ROOTFS_LIB)/$(MACH64)
 ROOTVARIANTDIR=	$(ROOTLIB)/libc
 ROOTVARIANTDIR64=	$(ROOTLIB64)/libc
 
-ROOTFS_LINTDIR=		$(ROOTFS_LIB)
-ROOTFS_LINTDIR64=	$(ROOTFS_LIB64)
-ROOTFS_LINTLIB=		$(ROOTFS_LINTDIR)/$(LINTLIB)
-ROOTFS_LINTLIB64=	$(ROOTFS_LINTDIR64)/$(LINTLIB)
-
 # include common library definitions
 include ../Makefile.lib
 
@@ -96,10 +92,10 @@ VARIANT_SUBDIRS64	= $(VARIANTS64:%=$(MACH)_%/$(VARBLD64))
 SUBDIRS=	$(MACH_CAP) $(MACH) $(MACH_ETC) $(VARIANT_SUBDIRS)
 $(BUILD64)SUBDIRS += $(MACH64) $(VARIANT_SUBDIRS64)
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
-ROOTLIBS64=	$(ROOTLIBDIR64)/$(DYNLIB) $(ROOTLIBDIR64)/$(LINTLIB)
-MACHLIBS64=	$(MACH64)/$(DYNLIB) $(MACH64)/$(LINTLIB)
+ROOTLIBS64=	$(ROOTLIBDIR64)/$(DYNLIB)
+MACHLIBS64=	$(MACH64)/$(DYNLIB)
 VARIANTLIBS=	$(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1)
 VARIANTLIBS64=	$(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1)
 ROOTVARIANTLIBS= $(VARIANTS:%=$(ROOTVARIANTDIR)/$(LIBBASENAME)_%.so.1)
@@ -173,13 +169,9 @@ install:	all			\
 		inslib32		\
 		$(BUILD64) inslib64
 
-inslib32:	$(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTFS_LINT) \
-		$(ROOTFS_LINTLIB) \
-		$(ROOTVARIANTLIBS)
+inslib32:	$(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS)
 
-inslib64:	$(ROOTFS_LIBS64) $(ROOTFS_LINKS64) \
-		$(ROOTFS_LINTLIB64) \
-		$(ROOTVARIANTLIBS64)
+inslib64:	$(ROOTFS_LIBS64) $(ROOTFS_LINKS64) $(ROOTVARIANTLIBS64)
 
 install_h: all_h $(ROOTHDRS)
 
@@ -210,21 +202,6 @@ $(ROOTVARIANTDIR64): $(ROOTLIB64)
 $(ROOTVARIANTDIR64)/%: $(ROOTVARIANTDIR64) $(VAR1_BLDDIR64)/%
 	$(INS.file)
 
-# install rule for lint library target
-$(ROOTFS_LINTDIR)/%: port/%
-	$(INS.file)
-$(ROOTFS_LINTDIR64)/%: port/%
-	$(INS.file)
-$(ROOTFS_LINTDIR)/%: $(MACH)/%
-	$(INS.file)
-$(ROOTFS_LINTDIR64)/%: $(MACH64)/%
-	$(INS.file)
-
-$(LINTLIB):
-	@cd $(MACH); pwd; VERSION='$(VERSION)' $(MAKE) $@
-$(LINTLIB64):
-	@cd $(MACH64); pwd; VERSION='$(VERSION)' $(MAKE) $@
-
 $(MACH)/$(LIB_PIC): FRC
 	@cd $(MACH); pwd; VERSION='$(VERSION)' $(MAKE) $(LIB_PIC)
 $(MACH64)/$(LIB_PIC): FRC
@@ -246,7 +223,7 @@ clobber: $(SUBDIRS) etc clobber_local
 clobber_local:
 	$(RM) $(CLOBBERFILES)
 
-lint: $(SUBDIRS)
+lint:
 
 _msg:	$(MSGDOMAIN) catalog
 
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index 2e5b58e349..9888b3c02c 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -25,6 +25,7 @@
 # Copyright 2013 Garrett D'Amore <garrett@damore.org>
 # Copyright 2018 Nexenta Systems, Inc.
 # Copyright (c) 2019, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 LIBCBASE=	.
@@ -1102,37 +1103,6 @@ CLEANFILES +=			\
 
 CLOBBERFILES +=	$(LIB_PIC)
 
-# list of C source for lint
-SRCS=							\
-	$(ATOMICOBJS:%.o=$(SRC)/common/atomic/%.c)	\
-	$(XATTROBJS:%.o=$(SRC)/common/xattr/%.c)	\
-	$(COMOBJS:%.o=$(SRC)/common/util/%.c)		\
-	$(PORTFP:%.o=$(LIBCDIR)/port/fp/%.c)		\
-	$(PORTGEN:%.o=$(LIBCDIR)/port/gen/%.c)		\
-	$(PORTI18N:%.o=$(LIBCDIR)/port/i18n/%.c)	\
-	$(PORTINET:%.o=$(LIBCDIR)/port/inet/%.c)	\
-	$(PORTLOCALE:%.o=$(LIBCDIR)/port/locale/%.c)	\
-	$(PORTPRINT:%.o=$(LIBCDIR)/port/print/%.c)	\
-	$(PORTREGEX:%.o=$(LIBCDIR)/port/regex/%.c)	\
-	$(PORTSTDIO:%.o=$(LIBCDIR)/port/stdio/%.c)	\
-	$(PORTSYS:%.o=$(LIBCDIR)/port/sys/%.c)		\
-	$(AIOOBJS:%.o=$(LIBCDIR)/port/aio/%.c)		\
-	$(RTOBJS:%.o=$(LIBCDIR)/port/rt/%.c)		\
-	$(SECFLAGSOBJS:%.o=$(SRC)/common/secflags/%.c)	\
-	$(TPOOLOBJS:%.o=$(LIBCDIR)/port/tpool/%.c)	\
-	$(THREADSOBJS:%.o=$(LIBCDIR)/port/threads/%.c)	\
-	$(THREADSMACHOBJS:%.o=threads/%.c)		\
-	$(UNICODEOBJS:%.o=$(SRC)/common/unicode/%.c)	\
-	$(UNWINDMACHOBJS:%.o=unwind/%.c)		\
-	$(FPOBJS:%.o=fp/%.c)				\
-	$(I386FPOBJS:%.o=$(LIBCDIR)/i386/fp/%.c)	\
-	$(LIBCBASE)/gen/ecvt.c				\
-	$(LIBCBASE)/gen/makectxt.c			\
-	$(LIBCBASE)/gen/siginfolst.c			\
-	$(LIBCBASE)/gen/siglongjmp.c			\
-	$(LIBCBASE)/gen/sync_instruction_memory.c	\
-	$(LIBCBASE)/sys/uadmin.c
-
 # conditional assignments
 # $(DYNLIB) $(LIB_PIC) := DYNOBJS = _rtbootld.o
 $(DYNLIB) := CRTI = crti.o
@@ -1223,18 +1193,6 @@ pics/gettimeofday.o := CPPFLAGS += $(COMMPAGE_CPPFLAGS)
 
 all: $(LIBS) $(LIB_PIC)
 
-lint	:=	CPPFLAGS += -I$(LIBCDIR)/$(MACH)/fp
-lint	:=	CPPFLAGS += -D_MSE_INT_H -D_LCONV_C99
-lint	:=	LINTFLAGS64 += -mn -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
-
-lint:
-	@echo $(LINT.c) ... $(LDLIBS)
-	@$(LINT.c) $(SRCS) $(LDLIBS)
-
-$(LINTLIB):= SRCS=$(LIBCDIR)/port/llib-lc
-$(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
-$(LINTLIB):= LINTFLAGS64=-nvx -m64
-
 # object files that depend on inline template
 $(TIL:%=pics/%): $(LIBCBASE)/threads/amd64.il
 # pics/mul64.o: crt/mul64.il
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 69f45567b2..be3a2fb6a4 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -25,6 +25,7 @@
 # Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2013 Garrett D'Amore <garrett@damore.org>
 # Copyright 2018 Nexenta Systems, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 LIBCDIR=	$(SRC)/lib/libc
@@ -1165,39 +1166,6 @@ CLEANFILES +=			\
 
 CLOBBERFILES +=	$(LIB_PIC)
 
-# list of C source for lint
-SRCS=							\
-	$(ATOMICOBJS:%.o=$(SRC)/common/atomic/%.c)	\
-	$(XATTROBJS:%.o=$(SRC)/common/xattr/%.c)	\
-	$(COMOBJS:%.o=$(SRC)/common/util/%.c)		\
-	$(DTRACEOBJS:%.o=$(SRC)/common/dtrace/%.c)	\
-	$(PORTFP:%.o=$(LIBCDIR)/port/fp/%.c)		\
-	$(PORTGEN:%.o=$(LIBCDIR)/port/gen/%.c)		\
-	$(PORTI18N:%.o=$(LIBCDIR)/port/i18n/%.c)	\
-	$(PORTINET:%.o=$(LIBCDIR)/port/inet/%.c)	\
-	$(PORTLOCALE:%.o=$(LIBCDIR)/port/locale/%.c)	\
-	$(PORTPRINT:%.o=$(LIBCDIR)/port/print/%.c)	\
-	$(PORTREGEX:%.o=$(LIBCDIR)/port/regex/%.c)	\
-	$(PORTSTDIO:%.o=$(LIBCDIR)/port/stdio/%.c)	\
-	$(PORTSYS:%.o=$(LIBCDIR)/port/sys/%.c)		\
-	$(AIOOBJS:%.o=$(LIBCDIR)/port/aio/%.c)		\
-	$(RTOBJS:%.o=$(LIBCDIR)/port/rt/%.c)		\
-	$(SECFLAGSOBJS:%.o=$(SRC)/common/secflags/%.c)	\
-	$(TPOOLOBJS:%.o=$(LIBCDIR)/port/tpool/%.c)	\
-	$(THREADSOBJS:%.o=$(LIBCDIR)/port/threads/%.c)	\
-	$(THREADSMACHOBJS:%.o=$(LIBCDIR)/$(MACH)/threads/%.c) \
-	$(UNICODEOBJS:%.o=$(SRC)/common/unicode/%.c)	\
-	$(UNWINDMACHOBJS:%.o=$(LIBCDIR)/port/unwind/%.c) \
-	$(FPOBJS:%.o=$(LIBCDIR)/$(MACH)/fp/%.c)		\
-	$(LIBCBASE)/gen/ecvt.c				\
-	$(LIBCBASE)/gen/makectxt.c			\
-	$(LIBCBASE)/gen/siginfolst.c			\
-	$(LIBCBASE)/gen/siglongjmp.c			\
-	$(LIBCBASE)/gen/strcmp.c			\
-	$(LIBCBASE)/gen/sync_instruction_memory.c	\
-	$(LIBCBASE)/sys/ptrace.c			\
-	$(LIBCBASE)/sys/uadmin.c
-
 # conditional assignments
 $(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
@@ -1291,18 +1259,6 @@ pics/gettimeofday.o := CPPFLAGS += $(COMMPAGE_CPPFLAGS)
 
 all: $(LIBS) $(LIB_PIC)
 
-lint	:=	CPPFLAGS += -I$(LIBCDIR)/$(MACH)/fp
-lint	:=	CPPFLAGS += -D_MSE_INT_H -D_LCONV_C99
-lint	:=	LINTFLAGS += -mn -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
-
-lint:
-	@echo $(LINT.c) ...
-	@$(LINT.c) $(SRCS) $(LDLIBS)
-
-$(LINTLIB):= SRCS=$(LIBCDIR)/port/llib-lc
-$(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
-$(LINTLIB):= LINTFLAGS=-nvx
-
 # object files that depend on inline template
 $(TIL:%=pics/%): $(LIBCBASE)/threads/i386.il
 # pics/mul64.o: $(LIBCBASE)/crt/mul64.il
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com
index 042eb2ecf8..ee254984b5 100644
--- a/usr/src/lib/libc/sparc/Makefile.com
+++ b/usr/src/lib/libc/sparc/Makefile.com
@@ -25,6 +25,7 @@
 # Copyright 2013 Garrett D'Amore <garrett@damore.org>
 # Copyright 2018 Nexenta Systems, Inc.
 # Copyright 2018 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 LIBCDIR=	$(SRC)/lib/libc
@@ -1186,44 +1187,6 @@ CLEANFILES=			\
 
 CLOBBERFILES +=	$(LIB_PIC)
 
-# list of C source for lint
-SRCS=							\
-	$(ATOMICOBJS:%.o=$(SRC)/common/atomic/%.c)	\
-	$(XATTROBJS:%.o=$(SRC)/common/xattr/%.c)	\
-	$(COMOBJS:%.o=$(SRC)/common/util/%.c)		\
-	$(DTRACEOBJS:%.o=$(SRC)/common/dtrace/%.c)	\
-	$(PORTFP:%.o=$(LIBCDIR)/port/fp/%.c)		\
-	$(PORTGEN:%.o=$(LIBCDIR)/port/gen/%.c)		\
-	$(PORTI18N:%.o=$(LIBCDIR)/port/i18n/%.c)	\
-	$(PORTINET:%.o=$(LIBCDIR)/port/inet/%.c)	\
-	$(PORTLOCALE:%.o=$(LIBCDIR)/port/locale/%.c)	\
-	$(PORTPRINT:%.o=$(LIBCDIR)/port/print/%.c)	\
-	$(PORTREGEX:%.o=$(LIBCDIR)/port/regex/%.c)	\
-	$(PORTSTDIO:%.o=$(LIBCDIR)/port/stdio/%.c)	\
-	$(PORTSYS:%.o=$(LIBCDIR)/port/sys/%.c)		\
-	$(AIOOBJS:%.o=$(LIBCDIR)/port/aio/%.c)		\
-	$(RTOBJS:%.o=$(LIBCDIR)/port/rt/%.c)		\
-	$(SECFLAGSOBJS:%.o=$(SRC)/common/secflags/%.c)	\
-	$(TPOOLOBJS:%.o=$(LIBCDIR)/port/tpool/%.c)	\
-	$(THREADSOBJS:%.o=$(LIBCDIR)/port/threads/%.c)	\
-	$(THREADSMACHOBJS:%.o=$(LIBCDIR)/$(MACH)/threads/%.c) \
-	$(UNICODEOBJS:%.o=$(SRC)/common/unicode/%.c)	\
-	$(UNWINDMACHOBJS:%.o=$(LIBCDIR)/port/unwind/%.c) \
-	$(FPOBJS:%.o=$(LIBCDIR)/$(MACH)/fp/%.c)		\
-	$(LIBCBASE)/crt/_ftou.c				\
-	$(LIBCBASE)/gen/_xregs_clrptr.c			\
-	$(LIBCBASE)/gen/byteorder.c			\
-	$(LIBCBASE)/gen/ecvt.c				\
-	$(LIBCBASE)/gen/endian.c			\
-	$(LIBCBASE)/gen/getctxt.c			\
-	$(LIBCBASE)/gen/lmul.c				\
-	$(LIBCBASE)/gen/makectxt.c			\
-	$(LIBCBASE)/gen/siginfolst.c			\
-	$(LIBCBASE)/gen/siglongjmp.c			\
-	$(LIBCBASE)/gen/swapctxt.c			\
-	$(LIBCBASE)/sys/ptrace.c			\
-	$(LIBCBASE)/sys/uadmin.c
-
 # conditional assignments
 $(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
@@ -1348,18 +1311,6 @@ pics/getenv.o := sparc_COPTFLAG = -xO4
 
 all: $(LIBS) $(LIB_PIC)
 
-lint	:=	CPPFLAGS += -I$(LIBCDIR)/$(MACH)/fp
-lint	:=	CPPFLAGS += -D_MSE_INT_H -D_LCONV_C99
-lint	:=	LINTFLAGS += -mn
-
-lint:
-	@echo $(LINT.c) ... $(LDLIBS)
-	@$(LINT.c) $(SRCS) $(LDLIBS)
-
-$(LINTLIB):= SRCS=$(LIBCDIR)/port/llib-lc
-$(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
-$(LINTLIB):= LINTFLAGS=-nvx
-
 # object files that depend on inline template
 $(TIL:%=pics/%): $(LIBCBASE)/threads/sparc.il
 $(IL:%=pics/%): $(LIBCBASE)/fp/base.il
diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com
index 42c49d340c..0292db23f5 100644
--- a/usr/src/lib/libc/sparcv9/Makefile.com
+++ b/usr/src/lib/libc/sparcv9/Makefile.com
@@ -26,6 +26,7 @@
 # Copyright 2013 Garrett D'Amore <garrett@damore.org>
 # Copyright 2018 Nexenta Systems, Inc.
 # Copyright 2018 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 LIBCDIR=	$(SRC)/lib/libc
@@ -1116,41 +1117,6 @@ CLEANFILES=			\
 
 CLOBBERFILES +=	$(LIB_PIC)
 
-# list of C source for lint
-SRCS=							\
-	$(ATOMICOBJS:%.o=$(SRC)/common/atomic/%.c)	\
-	$(XATTROBJS:%.o=$(SRC)/common/xattr/%.c)	\
-	$(COMOBJS:%.o=$(SRC)/common/util/%.c)		\
-	$(PORTFP:%.o=$(LIBCDIR)/port/fp/%.c)		\
-	$(PORTGEN:%.o=$(LIBCDIR)/port/gen/%.c)		\
-	$(PORTI18N:%.o=$(LIBCDIR)/port/i18n/%.c)	\
-	$(PORTINET:%.o=$(LIBCDIR)/port/inet/%.c)	\
-	$(PORTLOCALE:%.o=$(LIBCDIR)/port/locale/%.c)	\
-	$(PORTPRINT:%.o=$(LIBCDIR)/port/print/%.c)	\
-	$(PORTREGEX:%.o=$(LIBCDIR)/port/regex/%.c)	\
-	$(PORTSTDIO:%.o=$(LIBCDIR)/port/stdio/%.c)	\
-	$(PORTSYS:%.o=$(LIBCDIR)/port/sys/%.c)		\
-	$(AIOOBJS:%.o=$(LIBCDIR)/port/aio/%.c)		\
-	$(RTOBJS:%.o=$(LIBCDIR)/port/rt/%.c)		\
-	$(SECFLAGSOBJS:%.o=$(SRC)/common/secflags/%.c)	\
-	$(TPOOLOBJS:%.o=$(LIBCDIR)/port/tpool/%.c)	\
-	$(THREADSOBJS:%.o=$(LIBCDIR)/port/threads/%.c)	\
-	$(THREADSMACHOBJS:%.o=$(LIBCDIR)/$(MACH)/threads/%.c) \
-	$(UNICODEOBJS:%.o=$(SRC)/common/unicode/%.c)	\
-	$(UNWINDMACHOBJS:%.o=$(LIBCDIR)/port/unwind/%.c) \
-	$(FPOBJS:%.o=$(LIBCDIR)/$(MACH)/fp/%.c)		\
-	$(FPOBJS64:%.o=$(LIBCBASE)/fp/%.c)		\
-	$(LIBCBASE)/crt/_ftou.c				\
-	$(LIBCBASE)/gen/_xregs_clrptr.c			\
-	$(LIBCBASE)/gen/byteorder.c			\
-	$(LIBCBASE)/gen/endian.c			\
-	$(LIBCBASE)/gen/ecvt.c				\
-	$(LIBCBASE)/gen/getctxt.c			\
-	$(LIBCBASE)/gen/makectxt.c			\
-	$(LIBCBASE)/gen/siginfolst.c			\
-	$(LIBCBASE)/gen/siglongjmp.c			\
-	$(LIBCBASE)/gen/swapctxt.c
-
 # conditional assignments
 $(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
@@ -1267,18 +1233,6 @@ pics/getenv.o := sparcv9_COPTFLAG = -xO4
 
 all: $(LIBS) $(LIB_PIC)
 
-lint	:=	CPPFLAGS += -I$(LIBCDIR)/$(MACH)/fp
-lint	:=	CPPFLAGS += -D_MSE_INT_H -D_LCONV_C99
-lint	:=	LINTFLAGS64 += -mn
-
-lint:
-	@echo $(LINT.c) ... $(LDLIBS)
-	@$(LINT.c) $(SRCS) $(LDLIBS)
-
-$(LINTLIB):= SRCS=$(LIBCDIR)/port/llib-lc
-$(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
-$(LINTLIB):= LINTFLAGS64=-nvx -m64
-
 # object files that depend on inline template
 $(TIL:%=pics/%): $(LIBCBASE)/threads/sparcv9.il
 $(IL:%=pics/%): $(LIBCBASE)/fp/base.il