12166 resync smatch to 0.6.1-rc1-il-3

*** 6,16 ****
  #
  # A full copy of the text of the CDDL should have accompanied this
  # source.  A copy of the CDDL is also available via the Internet at
  # http://www.illumos.org/license/CDDL.
  #
! # Copyright 2019 Joyent, Inc.
  #
  
  #
  # The src/ sub-directory is un-modified copy of
  # https://github.com/illumos/smatch/tree/$SPARSE_VERSION
--- 6,16 ----
  #
  # A full copy of the text of the CDDL should have accompanied this
  # source.  A copy of the CDDL is also available via the Internet at
  # http://www.illumos.org/license/CDDL.
  #
! # Copyright 2020 Joyent, Inc.
  #
  
  #
  # The src/ sub-directory is un-modified copy of
  # https://github.com/illumos/smatch/tree/$SPARSE_VERSION
*** 18,28 ****
  # This Makefile installs just enough for us to be able to run smatch
  # locally.
  #
  
  PROG = smatch
! SPARSE_VERSION = 0.6.1-rc1-il-2
  
  include ../Makefile.tools
  
  # We have to build smatch before we can use cw
  i386_CC = $(GNUC_ROOT)/bin/gcc
--- 18,28 ----
  # This Makefile installs just enough for us to be able to run smatch
  # locally.
  #
  
  PROG = smatch
! SPARSE_VERSION = 0.6.1-rc1-il-3
  
  include ../Makefile.tools
  
  # We have to build smatch before we can use cw
  i386_CC = $(GNUC_ROOT)/bin/gcc
*** 29,39 ****
  sparc_CC = $(GNUC_ROOT)/bin/gcc
  # sparc doesn't recognise -msave-args
  i386_SMATCHFLAGS = -msave-args
  sparc_SMATCHFLAGS =
  
! CFLAGS = -O -m64 $($(MACH)_SMATCHFLAGS) -D__sun -Wall -Wno-unknown-pragmas -std=gnu99 -nodefaultlibs
  
  SMATCHDATADIR = $(ROOTONBLDSHARE)/smatch
  
  CFLAGS += -DSMATCHDATADIR='"$(SMATCHDATADIR)"'
  CFLAGS += -DGCC_BASE='"/no/such/dir"'
--- 29,40 ----
  sparc_CC = $(GNUC_ROOT)/bin/gcc
  # sparc doesn't recognise -msave-args
  i386_SMATCHFLAGS = -msave-args
  sparc_SMATCHFLAGS =
  
! CFLAGS = -O -m64 -std=gnu99 -nodefaultlibs -D__sun $($(MACH)_SMATCHFLAGS)
! CFLAGS += -Wall -Wno-unknown-pragmas -Wno-psabi
  
  SMATCHDATADIR = $(ROOTONBLDSHARE)/smatch
  
  CFLAGS += -DSMATCHDATADIR='"$(SMATCHDATADIR)"'
  CFLAGS += -DGCC_BASE='"/no/such/dir"'
*** 174,183 ****
--- 175,185 ----
  SMATCH_OBJS += smatch_type.o
  SMATCH_OBJS += smatch_type_val.o
  SMATCH_OBJS += smatch_unknown_value.o
  SMATCH_OBJS += smatch_untracked_param.o
  SMATCH_OBJS += smatch_var_sym.o
+ SMATCH_OBJS += smatch_parsed_conditions.o
  
  SMATCH_CHECK_OBJS:sh=ls src/check_*.c | sed -e 's+\.c+.o+;s+src/++;'
  
  OBJS = smatch.o $(LIB_OBJS) $(SMATCH_OBJS) $(SMATCH_CHECK_OBJS)