Upstream merge/2025120401

usr/src/cmd/abi/spectrans/parser/Makefile.targ

@@ -36,14 +36,10 @@ OBJECTS =	errlog.o	\
 
 include	$(SRC)/lib/Makefile.lib
 
-SRCS	=	$(OBJECTS:%.o=../%.c)
-
-LINTFLAGS +=	-xsuF -errtags=yes
 CLEANFILES +=	$(LINTOUT)
 CLOBBERFILES += $(LIBRARY)
 
 CERRWARN	+= -_gcc=-Wno-parentheses
-CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= $(CNOWARN_UNINIT)
 
 # not linted
@@ -55,6 +51,4 @@ objs/%.o: ../%.c
 
 all install:	$(LIBRARY)
 
-lint:	lintcheck
-
 include	$(SRC)/lib/Makefile.targ

usr/src/cmd/abi/spectrans/parser/extends.c

@@ -378,7 +378,6 @@ arch_match(FILE *fp, int arch)
 		buf2 = NULL;
 	}
 
-end:
 	free(buf2);
 	free(p);
 

usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ

@@ -49,8 +49,9 @@ include		../../Makefile.cmd
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
-CERRWARN +=	-_gcc=-Wno-unused-label
+
+# because of labels from yacc
+parseproto.o := CERRWARN += -_gcc=-Wno-unused-label
 
 # not linted
 SMATCH=off
-

usr/src/cmd/ast/libast/Makefile.com

@@ -88,7 +88,6 @@ CERRWARN += -_gcc=-Wno-unused-but-set-variable
 CERRWARN += -_gcc=-Wno-unused-but-set-parameter
 CERRWARN += -_gcc=-Wno-unused-value
 CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-empty-body
 CERRWARN += -_gcc=-Wno-type-limits
@@ -108,6 +107,8 @@ pics/path/pathprobe.o := CERRWARN += -_gcc14=-Wno-return-local-addr
 pics/sfio/sfdisc.o := CERRWARN += -_gcc14=-Wno-misleading-indentation
 pics/sfio/sfstack.o := CERRWARN += -_gcc14=-Wno-misleading-indentation
 
+pics/port/astconf.o := CERRWARN += -_gcc=-Wno-unused-label
+
 SMATCH= off
 
 .KEEP_STATE:

usr/src/cmd/awk/Makefile

@@ -40,11 +40,13 @@ include ../Makefile.cmd
 
 ROOTLINK =	$(LINKPROG:%=$(ROOTBIN)/%)
 
-CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += $(CNOWARN_UNINIT)
 
+# because of labels from yacc
+awk.g.o := CERRWARN += -_gcc=-Wno-unused-label
+
 # not linted
 SMATCH=off
 
@@ -59,7 +61,6 @@ XGETFLAGS += -a -x awk.xcl
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 YFLAGS += -d
 LDLIBS += -lm -lumem
-LINTFLAGS += -u
 CLEANFILES= maketab proctab.c awk.g.c y.tab.h
 
 .KEEP_STATE:

usr/src/cmd/awk_xpg4/Makefile

@@ -36,19 +36,20 @@ OBJ1= awk0.o awk1.o awk2.o awk3.o awk4.o
 OBJ2= awk.o
 XPG4AWKOBJ= values-xpg4.o
 OBJS= $(OBJ2) $(OBJ1) $(XPG4AWKOBJ)
-SRCS= $(OBJ1:%.o=%.c)
 
 include ../Makefile.cmd
 
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += $(CNOWARN_UNINIT)
 YFLAGS += -d
 LDLIBS += -lm
 CLEANFILES= awk.c y.tab.h
 
+# because of labels from yacc
+awk.o := CERRWARN += -_gcc=-Wno-unused-label
+
 # not linted
 SMATCH=off
 
@@ -80,8 +81,6 @@ values-xpg4.o: ../../lib/crt/common/values-xpg4.c
 clean:
 	$(RM) $(OBJS) $(XPG4) $(CLEANFILES)
 
-lint: lint_SRCS
-
 awk.c + y.tab.h: awk.y
 
 awk.o: awk.c y.tab.h

usr/src/cmd/backup/lib/Makefile

@@ -65,10 +65,12 @@ GLOBAL=		../../../head
 CPPFLAGS=	-I$(GENERAL) -I$(GLOBAL) $(CPPFLAGS.master)
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-parentheses
-CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CLEANFILES=	$(OBJECTS) $(DEBUGS) $(YSRC) $(LIBRARY)
 
+# because of labels from yacc
+objs/getdate.o := CERRWARN +=	-_gcc=-Wno-unused-label
+
 # support for -g library
 GLIB=		libdump_g.a
 DEBUGS=		$(OBJECTS:%=.debug/%)
@@ -100,8 +102,6 @@ install:	all
 $(POFILE):	$(POFILES)
 	$(RM) $@; cat $(POFILES) > $@
 
-lint:
-
 check:	$(HDRS)
 	$(CSTYLE) $(CSTYLEFLAGS) `echo $(SRCS) | sed -e s/getdate.c//` $(HDRS)
 	$(HDRCHK) $(HDRCHKFLAGS) $(HDRS)

usr/src/cmd/bc/Makefile

@@ -38,9 +38,11 @@ include ../Makefile.cmd
 
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-unused-label
 
-# nothing lintable
+# because of labels from yacc
+bc.o $(XD)/bc.o := CERRWARN += -_gcc=-Wno-unused-label
+
+# needs work
 SMATCH=off
 
 $(XPG6EXOBJS) := CFLAGS += -DXPG6
@@ -70,8 +72,6 @@ install: all $(ROOTPROG) $(ROOTXPG6PROG) $(ROOTLIBB)
 clean:
 	-@rm -rf $(PROG).c $(PROG).x $(EXOBJS) $(XD) $(PROG) $(XPG6)
 
-lint:
-
 $(XPG6EXOBJS): $(XD)
 
 $(XD)/bc.o:	bc.y

usr/src/cmd/boot/installboot/i386/installboot.c

@@ -22,6 +22,7 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
  * Copyright 2019 Toomas Soome <[email protected]>
+ * Copyright 2025 Edgecast Cloud LLC.
  */
 
 #include <stdio.h>
@@ -2354,8 +2355,10 @@ handle_mirror(char *progname, int argc, char **argv)
 
 		/* Free source list */
 		pl_src = STAILQ_LAST(src.plist, partlist, pl_next);
-		STAILQ_REMOVE(src.plist, pl_src, partlist, pl_next);
-		partlist_free(pl_src);
+		if (pl_src != NULL) {
+			STAILQ_REMOVE(src.plist, pl_src, partlist, pl_next);
+			partlist_free(pl_src);
+		}
 	}
 	retval = BC_SUCCESS;
 

usr/src/cmd/cmd-crypto/pktool/Makefile

@@ -54,7 +54,6 @@ CPPFLAGS += -I. -I$(KMFDIR)/include -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
 
 CFLAGS += $(CCVERBOSE) -DDEBUG
 CERRWARN += $(CNOWARN_UNINIT)
-CERRWARN += -_gcc=-Wno-unused-label
 
 # not linted, too much mess, but it should be
 SMATCH=off
@@ -77,6 +76,4 @@ install : all $(ROOTPROG)
 clean :
 	$(RM) $(OBJS)
 
-lint : lint_SRCS
-
 include ../../Makefile.targ

usr/src/cmd/cmd-crypto/pktool/genkeypair.c

@@ -117,7 +117,6 @@ genkeypair_pkcs11(KMF_HANDLE_T kmfhandle,
 		return (kmfrv);
 	}
 
-cleanup:
 	if (kmfrv == KMF_OK) {
 		if (outPriKey != NULL)
 			*outPriKey = prik;
@@ -304,7 +303,7 @@ genkeypair_nss(KMF_HANDLE_T kmfhandle,
 	if (kmfrv != KMF_OK) {
 		return (kmfrv);
 	}
-cleanup:
+
 	if (kmfrv == KMF_OK) {
 		if (outPriKey != NULL)
 			*outPriKey = prik;

usr/src/cmd/cmd-inet/lib/nwamd/Makefile

@@ -56,7 +56,6 @@ LDLIBS +=	-ldhcpagent -ldhcputil -ldladm -ldlpi -lgen \
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
-CERRWARN +=	-_gcc=-Wno-unused-label
 
 # not linted
 SMATCH=off

usr/src/cmd/cmd-inet/lib/nwamd/ncu.c

@@ -1309,7 +1309,6 @@ add_ip_ncu_to_ncp(nwam_ncp_handle_t ncph, const char *name)
 	/* IP NCU has the default values, so nothing else to do */
 	err = nwam_ncu_commit(ncuh, 0);
 
-finish:
 	nwam_ncu_free(ncuh);
 	if (err != NWAM_SUCCESS) {
 		nlog(LOG_ERR,

usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile

@@ -50,11 +50,13 @@ CPPFLAGS += -I. -I$(CMDINETCOMMONDIR) \
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-function
-CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-clobbered
 CERRWARN +=	$(CNOWARN_UNINIT)
 
+# because of labels from yacc
+gram.o := CERRWARN += -_gcc=-Wno-unused-label
+
 # not linted
 SMATCH=off
 

usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile

@@ -39,8 +39,6 @@ ENC_OBJS=	enc_des.o encrypt.o
 
 OBJS +=		$(AUTH_OBJS) $(ENC_OBJS)
 
-SRCS=		$(OBJS:%.o=%.c)
-
 include		../../../Makefile.cmd
 
 CPPFLAGS +=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOLD_ENVIRON
@@ -50,7 +48,6 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-extra
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
-CERRWARN +=	-_gcc=-Wno-unused-label
 LDLIBS +=	-lsocket -lnsl -ltermlib
 LDLIBS +=	-lmech_krb5
 LDFLAGS +=	$(KRUNPATH) -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL)
@@ -71,6 +68,4 @@ install: all $(ROOTPROG)
 clean:
 	$(RM) $(OBJS)
 
-lint:   lint_SRCS
-
 include		../../../Makefile.targ

usr/src/cmd/cmd-inet/usr.bin/telnet/utilities.c

@@ -957,7 +957,6 @@ printsub(direction, pointer, length)
 			    break;
 
 			default:
-			def_case:
 			    if (isprint(pointer[i]) && pointer[i] != '"') {
 				if (noquote) {
 				    (void) putc('"', NetTrace);

usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile

@@ -52,7 +52,6 @@ CPPFLAGS +=	-I$(SRC)/uts/common
 
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	$(CNOWARN_UNINIT)
-CERRWARN +=	-_gcc=-Wno-unused-label
 
 # not linted
 SMATCH=off
@@ -67,7 +66,6 @@ all:=		TARGET= all
 install:=	TARGET= install
 clean:=		TARGET= clean
 clobber:=	TARGET= clobber
-lint:=		TARGET= lint
 
 
 LDLIBS +=	-lcmdutils -lsocket -lsecdb -lnsl -lilb -lscf -linetutil -lbsm
@@ -89,14 +87,11 @@ check:	$(CHKMANIFEST) $(CHECKHDRS)
 clean:
 	$(RM) $(OBJS)
 
-lint:
-	$(LINT.c) $(ILBD_SRCS) $(LDLIBS)
-
 $(POFILE):	$(POFILES)
 		$(RM) $@
 		$(CAT) $(POFILES) > $@
 
-all install clean clobber lint: $(ILBSUBDIRS)
+all install clean clobber: $(ILBSUBDIRS)
 
 include		../../../Makefile.targ
 

usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_nat.c

@@ -180,7 +180,6 @@ ilbd_show_nat(void *cli, const ilb_comm_t *ic, uint32_t *rbuf, size_t *rbufsz)
 		nat_ret++;
 	}
 
-end:
 	free(kcmd);
 	return (ret);
 }
@@ -289,7 +288,6 @@ ilbd_show_sticky(void *cli, const ilb_comm_t *ic, uint32_t *rbuf,
 		st_ret++;
 	}
 
-end:
 	free(kcmd);
 	return (ret);
 }

usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_scf.c

@@ -1276,7 +1276,6 @@ ilbd_scf_load_prop(scf_propertygroup_t *pg, const char *prop_name, void *arg)
 	 */
 	ret = ilbd_scfval_to_data(prop_name, val_type, val, ilb_data);
 
-out:
 	if (val != NULL)
 		scf_value_destroy(val);
 

usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile

@@ -29,7 +29,6 @@ MANIFEST=	inetd.xml inetd-upgrade.xml
 SVCMETHOD=	inetd-upgrade
 
 OBJS	= inetd.o tlx.o config.o util.o contracts.o repval.o wait.o env.o
-SRCS	= $(OBJS:%.o=%.c)
 
 include ../../../Makefile.cmd
 include ../../Makefile.cmd-inet
@@ -41,7 +40,6 @@ CPPFLAGS  += -D_FILE_OFFSET_BITS=64 -I$(CMDINETCOMMONDIR) -D_REENTRANT
 $(RELEASE_BUILD)CPPFLAGS +=     -DNDEBUG
 
 CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-unused-label
 
 SMOFF += kmalloc_wrong_size
 
@@ -50,9 +48,6 @@ LDLIBS    += -lsocket -lnsl -lrestart -lscf -lcontract -linetutil \
 
 CLOBBERFILES += $(SVCMETHOD)
 
-# lint doesn't like the unused _umem_*_init()
-lint_SRCS := LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-
 .PARALLEL:	$(OBJS)
 .WAIT:		$(PROG)
 .KEEP_STATE:
@@ -74,6 +69,4 @@ check:		$(CHKMANIFEST)
 clean:
 		$(RM) $(OBJS)
 
-lint:		lint_SRCS
-
 include ../../../Makefile.targ

usr/src/cmd/cmd-inet/usr.lib/inetd/repval.c

@@ -605,7 +605,6 @@ store_retrieve_rep_vals(uu_list_t *vals, const char *fmri,
 		}
 	}
 
-out:
 	return (ret);
 }
 

usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile

@@ -36,13 +36,15 @@ LFLAGS =	-t
 LDLIBS +=	-ll -ltecla -lnwam -lumem
 YFLAGS +=	-d -b nwamcfg_grammar
 CLEANFILES +=	nwamcfg_lex.c nwamcfg_grammar.tab.c nwamcfg_grammar.tab.h
-CLEANFILES +=	$(PROG).ln
 
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
-CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# because of labels from yacc
+nwamcfg_lex.o := CERRWARN += -_gcc=-Wno-unused-label
+nwamcfg_grammar.tab.o := CERRWARN += -_gcc=-Wno-unused-label
+
 SMOFF += all_func_returns
 
 .KEEP_STATE:

usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile

@@ -60,7 +60,6 @@ CERRWARN += -_gcc=-Wno-clobbered
 CERRWARN += -_gcc=-Wno-unused-value
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-unused-function
 
 # we really should have smatch running on this code but...