diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-13 11:41:03 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-13 11:41:03 +0000 |
| commit | 881846a585dd22760b95f55003f1344df8af4198 (patch) | |
| tree | fc7962e6d5bbf17840a85f70c0c15b745bb6c315 /usr/src/cmd | |
| parent | 6ea47f7a1107071503a26c8f0256b607e1ad29e9 (diff) | |
| parent | 7f3e7b1b3fd1f1ac090d298a0203b20c79fbe725 (diff) | |
| download | illumos-joyent-881846a585dd22760b95f55003f1344df8af4198.tar.gz | |
[illumos-gate merge]
commit 7f3e7b1b3fd1f1ac090d298a0203b20c79fbe725
11523 i86pc: dboot_startkern.c:2046: error: comparison between pointer and integer
commit 4f7f1d0fa878cb07e58af9d4f2abea08273b07c7
11475 gptzfsboot: update parsing the option switches
commit efe51d0cc2398b9ac179568b63a44e4bf295b8e2
11506 smatch resync
Conflicts:
usr/src/tools/smatch/Makefile
usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile
usr/src/cmd/svc/configd/Makefile
usr/src/boot/sys/boot/libstand/Makefile.com
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/ls/Makefile.com | 10 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/libld/Makefile.com | 6 | ||||
| -rw-r--r-- | usr/src/cmd/svc/configd/Makefile | 8 | ||||
| -rw-r--r-- | usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile | 2 |
4 files changed, 12 insertions, 14 deletions
diff --git a/usr/src/cmd/ls/Makefile.com b/usr/src/cmd/ls/Makefile.com index cc3ca0ad81..c31f661cf3 100644 --- a/usr/src/cmd/ls/Makefile.com +++ b/usr/src/cmd/ls/Makefile.com @@ -22,7 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/ls/Makefile.com +# Copyright 2019 Joyent, Inc. # PROG= ls @@ -43,14 +43,14 @@ $(XPG6) := CFLAGS64 += -DXPG4 -DXPG6 CFLAGS64 += $(CCVERBOSE) CPPFLAGS += -D_FILE_OFFSET_BITS=64 -LINTFLAGS64 += -errchk=longptr64 + +# main() can be too hairy +SMATCH=off .KEEP_STATE: all: $(PROG) $(XPG4) $(XPG6) -lint: lint_SRCS - clean: $(RM) $(CLEANFILES) @@ -61,7 +61,7 @@ include ../../Makefile.targ $(POST_PROCESS) %.xpg6: ../%.c - $(LINK.c) -o $@ $< $(LDLIBS) + $(LINK.c) -o $@ $< $(LDLIBS) $(POST_PROCESS) %: ../%.c diff --git a/usr/src/cmd/sgs/libld/Makefile.com b/usr/src/cmd/sgs/libld/Makefile.com index 2119ecec29..b007c46bad 100644 --- a/usr/src/cmd/sgs/libld/Makefile.com +++ b/usr/src/cmd/sgs/libld/Makefile.com @@ -23,7 +23,7 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 Joyent, Inc. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. LIBRARY = libld.a @@ -113,6 +113,10 @@ DYNFLAGS += $(VERSREF) $(CC_USE_PROTO) '-R$$ORIGIN' native:= DYNFLAGS += $(CONVLIBDIR) +# too hairy +pics/sections32.o := SMATCH=off +pics/sections64.o := SMATCH=off + BLTDEFS = msg.h BLTDATA = msg.c BLTMESG = $(SGSMSGDIR)/libld diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index 4d74800a7f..419ca6248b 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -63,13 +63,11 @@ CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-unused-function CERRWARN += -_gcc=-Wno-uninitialized -# Despite the source being the same as upstream, smatch gives us a bizarre false -# positive here. +# strange false positive SMOFF += free MYLDLIBS = -lumem -luutil LDLIBS += -lsecdb -lbsm $(MYLDLIBS) -LINTFLAGS += -errtags -erroff=E_BAD_FORMAT_ARG_TYPE2 -erroff=E_NAME_DEF_NOT_USED2 CLOBBERFILES += $(MYPROG:%=%-native) @@ -132,10 +130,6 @@ clean: FRC clobber: -lint: lint_SRCS - -lint_SRCS: - include ../../Makefile.targ FRC: diff --git a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile index a53111c4fb..94cba19b73 100644 --- a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile +++ b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile @@ -35,7 +35,7 @@ CPPFLAGS += -I ../../daemons/syseventconfd CERRWARN += -_gcc=-Wno-uninitialized # strange smatch false positive -SMOFF += allocating_enough_data +SMOFF += allocating_enough_data .KEEP_STATE: |