11506 smatch resync

@@ -9,10 +9,11 @@
 # http://www.illumos.org/license/CDDL.
 #
 
 #
 # Copyright 2017 Toomas Soome <tsoome@me.com>
+# Copyright 2019 Joyent, Inc.
 #
 
 # loader.help build needs better awk
 AWK=            /usr/xpg4/bin/awk
 LD=             $(GNU_ROOT)/bin/gld

@@ -50,17 +51,23 @@
 CFLAGS +=       -_gcc=-Wall
 CFLAGS +=       $(CCNOAUTOINLINE) $(CCNOREORDER) $(CSTD_GNU99)
 CCASFLAGS=      -fPIC -Wa,--divide
 ASFLAGS=        --divide
 
+SMATCH_ =
+SMATCH_on =
+SMATCH_off = -_smatch=off
+
 # smatch does not define __amd64 and __amd64__
 SMATCH_amd64=   -_smatch=-D__amd64 -_smatch=-D__amd64__
 
 # SMATCH_ARGS will bring in set of -Wno-* options.
 #CFLAGS +=      $(SMATCH_ARGS:%=-_smatch=%)
 CFLAGS +=       $(SMOFF:%=-_smatch=--disable=%)
 CFLAGS +=       $(SMATCH_$(MACHINE))
+CFLAGS +=       $(SMATCH_$(SMATCH))
+CFLAGS +=       -_smatch=--timeout=0
 
 COMPILE.S=      $(CC) $(SMATCH_off) $(CCASFLAGS) $(CPPFLAGS) -c
 
 ROOT_BOOT=      $(ROOT)/boot
 ROOTBOOTPROG=$(PROG:%=$(ROOT_BOOT)/%)