summaryrefslogtreecommitdiff
path: root/usr/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd')
-rw-r--r--usr/src/cmd/abi/spectrans/parser/Makefile.targ2
-rw-r--r--usr/src/cmd/acctadm/Makefile2
-rw-r--r--usr/src/cmd/addbadsec/Makefile2
-rw-r--r--usr/src/cmd/allocate/Makefile2
-rw-r--r--usr/src/cmd/amt/Makefile.com2
-rw-r--r--usr/src/cmd/ast/msgcc/Makefile2
-rw-r--r--usr/src/cmd/audio/audioctl/Makefile2
-rw-r--r--usr/src/cmd/audio/audioplay/Makefile2
-rw-r--r--usr/src/cmd/audio/utilities/Makefile2
-rw-r--r--usr/src/cmd/auditconfig/Makefile2
-rw-r--r--usr/src/cmd/auditreduce/Makefile2
-rw-r--r--usr/src/cmd/autopush/Makefile2
-rw-r--r--usr/src/cmd/awk/Makefile2
-rw-r--r--usr/src/cmd/awk_xpg4/Makefile2
-rw-r--r--usr/src/cmd/backup/Makefile.backup2
-rw-r--r--usr/src/cmd/backup/dump/Makefile2
-rw-r--r--usr/src/cmd/bart/Makefile2
-rw-r--r--usr/src/cmd/bdiff/Makefile2
-rw-r--r--usr/src/cmd/bnu/Makefile.inc2
-rw-r--r--usr/src/cmd/cal/Makefile2
-rw-r--r--usr/src/cmd/cdrw/Makefile2
-rw-r--r--usr/src/cmd/chmod/Makefile2
-rw-r--r--usr/src/cmd/cmd-crypto/cryptoadm/Makefile2
-rw-r--r--usr/src/cmd/cmd-crypto/decrypt/Makefile.com2
-rw-r--r--usr/src/cmd/cmd-crypto/digest/Makefile.com2
-rw-r--r--usr/src/cmd/cmd-crypto/pktool/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/lib/nwamd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/nc/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/talk/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.lib/ilbd/ilb/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.lib/ncaconfd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/in.talkd/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/inetadm/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/inetconv/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile2
-rw-r--r--usr/src/cmd/consadm/Makefile.com2
-rw-r--r--usr/src/cmd/cpc/cpustat/Makefile2
-rw-r--r--usr/src/cmd/cpio/Makefile2
-rw-r--r--usr/src/cmd/cron/Makefile2
-rw-r--r--usr/src/cmd/csh/i386/Makefile2
-rw-r--r--usr/src/cmd/csh/sparc/Makefile2
-rw-r--r--usr/src/cmd/csplit/Makefile2
-rw-r--r--usr/src/cmd/ctrun/Makefile2
-rw-r--r--usr/src/cmd/dc/Makefile2
-rw-r--r--usr/src/cmd/dcs/sparc/sun4u/Makefile2
-rw-r--r--usr/src/cmd/dd/Makefile2
-rw-r--r--usr/src/cmd/devfsadm/Makefile.com2
-rw-r--r--usr/src/cmd/devinfo/Makefile2
-rw-r--r--usr/src/cmd/devmgmt/cmds/Makefile2
-rw-r--r--usr/src/cmd/dfs.cmds/dfshares/Makefile2
-rw-r--r--usr/src/cmd/dfs.cmds/sharectl/Makefile.com2
-rw-r--r--usr/src/cmd/dfs.cmds/sharemgr/Makefile.com2
-rw-r--r--usr/src/cmd/diff/Makefile2
-rw-r--r--usr/src/cmd/dis/Makefile2
-rw-r--r--usr/src/cmd/dispadmin/Makefile2
-rw-r--r--usr/src/cmd/dladm/Makefile2
-rw-r--r--usr/src/cmd/dlmgmtd/Makefile2
-rw-r--r--usr/src/cmd/dlstat/Makefile2
-rw-r--r--usr/src/cmd/du/Makefile2
-rw-r--r--usr/src/cmd/ed/Makefile2
-rw-r--r--usr/src/cmd/eeprom/Makefile.com2
-rw-r--r--usr/src/cmd/eqn/eqn.d/Makefile2
-rw-r--r--usr/src/cmd/eqn/neqn.d/Makefile2
-rw-r--r--usr/src/cmd/expr/Makefile2
-rw-r--r--usr/src/cmd/file/Makefile2
-rw-r--r--usr/src/cmd/filesync/Makefile2
-rw-r--r--usr/src/cmd/find/Makefile2
-rw-r--r--usr/src/cmd/flowstat/Makefile2
-rw-r--r--usr/src/cmd/fm/eversholt/Makefile.esc.com2
-rw-r--r--usr/src/cmd/fm/fmd/Makefile.fmd2
-rw-r--r--usr/src/cmd/fm/fmdump/Makefile.com2
-rw-r--r--usr/src/cmd/fm/fminject/Makefile.com2
-rw-r--r--usr/src/cmd/fm/ipmitopo/Makefile.com2
-rw-r--r--usr/src/cmd/fm/modules/common/disk-monitor/Makefile2
-rw-r--r--usr/src/cmd/fm/modules/common/eversholt/Makefile2
-rw-r--r--usr/src/cmd/fm/modules/common/fabric-xlate/Makefile2
-rw-r--r--usr/src/cmd/fm/modules/common/ip-transport/Makefile2
-rw-r--r--usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile2
-rw-r--r--usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/Makefile2
-rw-r--r--usr/src/cmd/fm/modules/sun4v/etm/Makefile2
-rw-r--r--usr/src/cmd/fmtmsg/Makefile2
-rw-r--r--usr/src/cmd/format/Makefile2
-rw-r--r--usr/src/cmd/fs.d/Makefile2
-rw-r--r--usr/src/cmd/fs.d/autofs/Makefile2
-rw-r--r--usr/src/cmd/fs.d/nfs/lockd/Makefile2
-rw-r--r--usr/src/cmd/fs.d/nfs/mount/Makefile2
-rw-r--r--usr/src/cmd/fs.d/nfs/mountd/Makefile2
-rw-r--r--usr/src/cmd/fs.d/nfs/nfslog/Makefile2
-rw-r--r--usr/src/cmd/fs.d/nfs/nfsmapid/Makefile2
-rw-r--r--usr/src/cmd/fs.d/nfs/showmount/Makefile2
-rw-r--r--usr/src/cmd/fs.d/nfs/statd/Makefile2
-rw-r--r--usr/src/cmd/fs.d/pcfs/fsck/Makefile2
-rw-r--r--usr/src/cmd/fs.d/pcfs/mount/Makefile2
-rw-r--r--usr/src/cmd/fs.d/tmpfs/Makefile2
-rw-r--r--usr/src/cmd/fs.d/udfs/fsck/Makefile2
-rw-r--r--usr/src/cmd/fs.d/udfs/fsdb/Makefile2
-rw-r--r--usr/src/cmd/fs.d/udfs/fstyp/Makefile2
-rw-r--r--usr/src/cmd/fs.d/udfs/labelit/Makefile2
-rw-r--r--usr/src/cmd/fs.d/udfs/mkfs/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/ff/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/fsck/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/fsdb/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/fssnap/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/mkfs/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/newfs/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/repquota/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/tunefs/Makefile2
-rw-r--r--usr/src/cmd/fs.d/ufs/volcopy/Makefile2
-rw-r--r--usr/src/cmd/fwflash/Makefile.com2
-rw-r--r--usr/src/cmd/geniconvtbl/Makefile.com2
-rw-r--r--usr/src/cmd/getfacl/Makefile2
-rw-r--r--usr/src/cmd/grep/Makefile2
-rw-r--r--usr/src/cmd/gss/gssd/Makefile2
-rw-r--r--usr/src/cmd/hotplugd/Makefile2
-rw-r--r--usr/src/cmd/id/Makefile2
-rw-r--r--usr/src/cmd/idmap/idmap/Makefile2
-rw-r--r--usr/src/cmd/idmap/idmapd/Makefile2
-rw-r--r--usr/src/cmd/init/Makefile2
-rw-r--r--usr/src/cmd/intrstat/Makefile.com2
-rw-r--r--usr/src/cmd/ipf/Makefile.ipf2
-rw-r--r--usr/src/cmd/iscsiadm/Makefile2
-rw-r--r--usr/src/cmd/isns/isnsadm/Makefile2
-rw-r--r--usr/src/cmd/isns/isnsd/Makefile2
-rw-r--r--usr/src/cmd/kbd/Makefile2
-rw-r--r--usr/src/cmd/keyserv/Makefile2
-rw-r--r--usr/src/cmd/krb5/kadmin/kclient/Makefile2
-rw-r--r--usr/src/cmd/krb5/kadmin/kdcmgr/Makefile2
-rw-r--r--usr/src/cmd/krb5/slave/Makefile2
-rw-r--r--usr/src/cmd/latencytop/Makefile.com2
-rw-r--r--usr/src/cmd/ldap/Makefile.com2
-rw-r--r--usr/src/cmd/ldapcachemgr/Makefile2
-rw-r--r--usr/src/cmd/ldmad/Makefile2
-rw-r--r--usr/src/cmd/listen/Makefile2
-rw-r--r--usr/src/cmd/loadkeys/Makefile2
-rw-r--r--usr/src/cmd/lockstat/Makefile.com2
-rw-r--r--usr/src/cmd/lofiadm/Makefile2
-rw-r--r--usr/src/cmd/logadm/Makefile2
-rw-r--r--usr/src/cmd/logins/Makefile2
-rw-r--r--usr/src/cmd/lp/Makefile.lp2
-rw-r--r--usr/src/cmd/lp/lib/filters/Makefile2
-rw-r--r--usr/src/cmd/luxadm/Makefile2
-rw-r--r--usr/src/cmd/mail/Makefile2
-rw-r--r--usr/src/cmd/mailx/Makefile2
-rw-r--r--usr/src/cmd/mandoc/Makefile.common2
-rw-r--r--usr/src/cmd/mdb/Makefile.kmdb2
-rw-r--r--usr/src/cmd/mdb/Makefile.libstandctf2
-rw-r--r--usr/src/cmd/mdb/Makefile.mdb2
-rw-r--r--usr/src/cmd/mdb/i86pc/modules/unix/amd64/Makefile2
-rw-r--r--usr/src/cmd/mdb/i86xpv/modules/unix/amd64/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/amd64/genunix/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/amd64/idm/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/amd64/ipp/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/amd64/libproc/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/amd64/libumem/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/amd64/pmcs/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/ia32/libproc/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/ia32/libumem/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/modules/amd_opteron/amd64/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/modules/generic_cpu/amd64/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v7/libproc/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v7/libumem/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v9/genunix/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v9/idm/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v9/ipp/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v9/libproc/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v9/libumem/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v9/pmcs/Makefile2
-rw-r--r--usr/src/cmd/mdb/sun4u/modules/unix/v9/Makefile2
-rw-r--r--usr/src/cmd/mdb/sun4v/modules/unix/v9/Makefile2
-rw-r--r--usr/src/cmd/mdb/tools/findfp/Makefile.com2
-rw-r--r--usr/src/cmd/mdb/tools/setdynflag/Makefile.com2
-rw-r--r--usr/src/cmd/mkdir/Makefile2
-rw-r--r--usr/src/cmd/mkmsgs/Makefile2
-rw-r--r--usr/src/cmd/mknod/Makefile2
-rw-r--r--usr/src/cmd/mktemp/Makefile2
-rw-r--r--usr/src/cmd/more/Makefile2
-rw-r--r--usr/src/cmd/msgfmt/Makefile2
-rw-r--r--usr/src/cmd/mv/Makefile2
-rw-r--r--usr/src/cmd/ndmpadm/Makefile2
-rw-r--r--usr/src/cmd/ndmpd/Makefile2
-rw-r--r--usr/src/cmd/newform/Makefile2
-rw-r--r--usr/src/cmd/newtask/Makefile.com2
-rw-r--r--usr/src/cmd/nl/Makefile2
-rw-r--r--usr/src/cmd/nlsadmin/Makefile2
-rw-r--r--usr/src/cmd/nscd/Makefile2
-rw-r--r--usr/src/cmd/pack/Makefile2
-rw-r--r--usr/src/cmd/passmgmt/Makefile2
-rw-r--r--usr/src/cmd/pbind/Makefile.com2
-rw-r--r--usr/src/cmd/pcitool/Makefile.com2
-rw-r--r--usr/src/cmd/pg/Makefile2
-rw-r--r--usr/src/cmd/picl/plugins/Makefile.com2
-rw-r--r--usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com2
-rw-r--r--usr/src/cmd/plimit/amd64/Makefile2
-rw-r--r--usr/src/cmd/plimit/i386/Makefile2
-rw-r--r--usr/src/cmd/plimit/sparcv9/Makefile2
-rw-r--r--usr/src/cmd/pools/Makefile.pools2
-rw-r--r--usr/src/cmd/powertop/Makefile.com2
-rw-r--r--usr/src/cmd/praudit/Makefile2
-rw-r--r--usr/src/cmd/prctl/Makefile.com2
-rw-r--r--usr/src/cmd/print/bsd-sysv-commands/Makefile2
-rw-r--r--usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile2
-rw-r--r--usr/src/cmd/priocntl/Makefile2
-rw-r--r--usr/src/cmd/projects/Makefile2
-rw-r--r--usr/src/cmd/prtconf/Makefile.com2
-rw-r--r--usr/src/cmd/prtvtoc/Makefile2
-rw-r--r--usr/src/cmd/psrset/Makefile.com2
-rw-r--r--usr/src/cmd/ptools/Makefile.bld4
-rw-r--r--usr/src/cmd/raidctl/Makefile2
-rw-r--r--usr/src/cmd/ramdiskadm/Makefile2
-rw-r--r--usr/src/cmd/rcap/Makefile.com2
-rw-r--r--usr/src/cmd/rcm_daemon/Makefile.com2
-rw-r--r--usr/src/cmd/rctladm/Makefile2
-rw-r--r--usr/src/cmd/refer/Makefile2
-rw-r--r--usr/src/cmd/rmdir/Makefile2
-rw-r--r--usr/src/cmd/rmformat/Makefile2
-rw-r--r--usr/src/cmd/rmmount/Makefile2
-rw-r--r--usr/src/cmd/rmvolmgr/Makefile2
-rw-r--r--usr/src/cmd/rpcinfo/Makefile2
-rw-r--r--usr/src/cmd/sa/Makefile2
-rw-r--r--usr/src/cmd/sendmail/Makefile.cmd2
-rw-r--r--usr/src/cmd/setfacl/Makefile2
-rw-r--r--usr/src/cmd/sf880drd/Makefile2
-rw-r--r--usr/src/cmd/sgs/ar/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/dump/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/elfdump/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/elfedit/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/elfedit/modules/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/elfwrap/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/error/i386/Makefile2
-rw-r--r--usr/src/cmd/sgs/error/sparc/Makefile2
-rw-r--r--usr/src/cmd/sgs/gprof/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/lex/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/libelf/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/libld/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/liblddbg/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/librtld/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/librtld_db/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/m4/i386/Makefile2
-rw-r--r--usr/src/cmd/sgs/m4/sparc/Makefile2
-rw-r--r--usr/src/cmd/sgs/mcs/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/prof/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/rtld/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/rtld/mdbmod/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/yacc/Makefile.com2
-rw-r--r--usr/src/cmd/smbsrv/smbadm/Makefile2
-rw-r--r--usr/src/cmd/smserverd/Makefile2
-rw-r--r--usr/src/cmd/sort/Makefile.com2
-rw-r--r--usr/src/cmd/stat/iostat/Makefile2
-rw-r--r--usr/src/cmd/stat/kstat/Makefile2
-rw-r--r--usr/src/cmd/stat/mpstat/Makefile2
-rw-r--r--usr/src/cmd/stat/vmstat/Makefile2
-rw-r--r--usr/src/cmd/stmsboot/Makefile2
-rw-r--r--usr/src/cmd/streams/strcmd/Makefile2
-rw-r--r--usr/src/cmd/strings/Makefile.com2
-rw-r--r--usr/src/cmd/sunpc/other/Makefile2
-rw-r--r--usr/src/cmd/svc/configd/Makefile2
-rw-r--r--usr/src/cmd/svc/lsvcrun/Makefile2
-rw-r--r--usr/src/cmd/svc/mfstscan/Makefile2
-rw-r--r--usr/src/cmd/svc/startd/Makefile2
-rw-r--r--usr/src/cmd/svc/svcadm/Makefile2
-rw-r--r--usr/src/cmd/svc/svccfg/Makefile2
-rw-r--r--usr/src/cmd/svc/svcprop/Makefile2
-rw-r--r--usr/src/cmd/svc/svcs/Makefile2
-rw-r--r--usr/src/cmd/svr4pkg/Makefile.svr4pkg2
-rw-r--r--usr/src/cmd/svr4pkg/libinst/Makefile2
-rw-r--r--usr/src/cmd/swap/Makefile.com2
-rw-r--r--usr/src/cmd/syseventadm/Makefile2
-rw-r--r--usr/src/cmd/syseventd/daemons/syseventd/Makefile2
-rw-r--r--usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile2
-rw-r--r--usr/src/cmd/syseventd/modules/zfs_mod/Makefile2
-rw-r--r--usr/src/cmd/syslogd/Makefile.com2
-rw-r--r--usr/src/cmd/tar/Makefile2
-rw-r--r--usr/src/cmd/tbl/Makefile2
-rw-r--r--usr/src/cmd/tcopy/Makefile2
-rw-r--r--usr/src/cmd/tcpd/Makefile2
-rw-r--r--usr/src/cmd/th_tools/Makefile2
-rw-r--r--usr/src/cmd/tic/Makefile.common2
-rw-r--r--usr/src/cmd/tip/Makefile2
-rw-r--r--usr/src/cmd/tnf/prex/Makefile.com2
-rw-r--r--usr/src/cmd/tnf/tnfxtract/Makefile.com2
-rw-r--r--usr/src/cmd/troff/troff.d/Makefile2
-rw-r--r--usr/src/cmd/truss/Makefile.com2
-rw-r--r--usr/src/cmd/ttymon/Makefile2
-rw-r--r--usr/src/cmd/ucodeadm/Makefile2
-rw-r--r--usr/src/cmd/uname/Makefile2
-rw-r--r--usr/src/cmd/unpack/Makefile2
-rw-r--r--usr/src/cmd/users/Makefile2
-rw-r--r--usr/src/cmd/vi/misc/Makefile2
-rw-r--r--usr/src/cmd/vi/port/Makefile2
-rw-r--r--usr/src/cmd/volcheck/Makefile2
-rw-r--r--usr/src/cmd/volrmmount/Makefile2
-rw-r--r--usr/src/cmd/vt/Makefile2
-rw-r--r--usr/src/cmd/wall/Makefile2
-rw-r--r--usr/src/cmd/ypcmd/Makefile2
-rw-r--r--usr/src/cmd/ypcmd/revnetgroup/Makefile2
-rw-r--r--usr/src/cmd/ypcmd/yppasswd/Makefile2
-rw-r--r--usr/src/cmd/zic/Makefile.common2
-rw-r--r--usr/src/cmd/zinject/Makefile.com2
-rw-r--r--usr/src/cmd/zlogin/Makefile10
-rw-r--r--usr/src/cmd/zlogin/zlogin.c4
-rw-r--r--usr/src/cmd/zlook/Makefile.com2
-rw-r--r--usr/src/cmd/zoneadm/Makefile2
-rw-r--r--usr/src/cmd/zoneadmd/Makefile2
-rw-r--r--usr/src/cmd/zonecfg/Makefile2
-rw-r--r--usr/src/cmd/zonestat/zonestat/Makefile2
-rw-r--r--usr/src/cmd/zonestat/zonestatd/Makefile2
330 files changed, 336 insertions, 336 deletions
diff --git a/usr/src/cmd/abi/spectrans/parser/Makefile.targ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ
index 525b5bf824..8c62e3e315 100644
--- a/usr/src/cmd/abi/spectrans/parser/Makefile.targ
+++ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ
@@ -44,7 +44,7 @@ CLOBBERFILES += $(LINTLIB) $(LIBRARY)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/acctadm/Makefile b/usr/src/cmd/acctadm/Makefile
index 6055a32f2b..209d9db664 100644
--- a/usr/src/cmd/acctadm/Makefile
+++ b/usr/src/cmd/acctadm/Makefile
@@ -35,7 +35,7 @@ include ../Makefile.cmd
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
LDLIBS += -lexacct -lscf -lsecdb -ldladm
POFILE = acctadm.po
diff --git a/usr/src/cmd/addbadsec/Makefile b/usr/src/cmd/addbadsec/Makefile
index fc45ac9abe..54fc4fa23b 100644
--- a/usr/src/cmd/addbadsec/Makefile
+++ b/usr/src/cmd/addbadsec/Makefile
@@ -33,7 +33,7 @@ include ../Makefile.cmd
CPPFLAGS += -D_EXTVTOC
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/allocate/Makefile b/usr/src/cmd/allocate/Makefile
index 637283c06c..f537293574 100644
--- a/usr/src/cmd/allocate/Makefile
+++ b/usr/src/cmd/allocate/Makefile
@@ -29,7 +29,7 @@ ETCTSOLFILES = devalloc_defaults
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-unused-value
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/cmd/amt/Makefile.com b/usr/src/cmd/amt/Makefile.com
index a3a7691e4c..2787e642f1 100644
--- a/usr/src/cmd/amt/Makefile.com
+++ b/usr/src/cmd/amt/Makefile.com
@@ -35,7 +35,7 @@ LDLIBS += -lelf
LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
LINTFLAGS64 += -erroff=E_NAME_USED_NOT_DEF2
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CLEANFILES += $(PROG) $(OBJS)
diff --git a/usr/src/cmd/ast/msgcc/Makefile b/usr/src/cmd/ast/msgcc/Makefile
index 306cb54f72..70a1f3f25b 100644
--- a/usr/src/cmd/ast/msgcc/Makefile
+++ b/usr/src/cmd/ast/msgcc/Makefile
@@ -50,7 +50,7 @@ CFLAGS += \
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-empty-body
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/audio/audioctl/Makefile b/usr/src/cmd/audio/audioctl/Makefile
index f9c6b65c8b..ee4c8edac6 100644
--- a/usr/src/cmd/audio/audioctl/Makefile
+++ b/usr/src/cmd/audio/audioctl/Makefile
@@ -30,7 +30,7 @@ include ../../Makefile.cmd
LDLIBS += -ldevinfo
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/audio/audioplay/Makefile b/usr/src/cmd/audio/audioplay/Makefile
index 23ce81e74d..895c00f2af 100644
--- a/usr/src/cmd/audio/audioplay/Makefile
+++ b/usr/src/cmd/audio/audioplay/Makefile
@@ -39,7 +39,7 @@ LDFLAGS += -L../utilities
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += indenting
diff --git a/usr/src/cmd/audio/utilities/Makefile b/usr/src/cmd/audio/utilities/Makefile
index d2d68162b1..5aa3024509 100644
--- a/usr/src/cmd/audio/utilities/Makefile
+++ b/usr/src/cmd/audio/utilities/Makefile
@@ -33,7 +33,7 @@ INCLUDES += -I../include
CPPFLAGS += $(INCLUDES)
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/auditconfig/Makefile b/usr/src/cmd/auditconfig/Makefile
index 54d9e8e6b0..ce287fff2b 100644
--- a/usr/src/cmd/auditconfig/Makefile
+++ b/usr/src/cmd/auditconfig/Makefile
@@ -38,7 +38,7 @@ POFILE = $(PROG).po
MSGFILES = $(SRCS)
CPPFLAGS += -I$(LIBBSM)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
.KEEP_STATE:
diff --git a/usr/src/cmd/auditreduce/Makefile b/usr/src/cmd/auditreduce/Makefile
index 2ddee8299b..9984ce57a6 100644
--- a/usr/src/cmd/auditreduce/Makefile
+++ b/usr/src/cmd/auditreduce/Makefile
@@ -41,7 +41,7 @@ MSGFILES = $(SRCS)
CPPFLAGS += -I$(TABLEDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
LDLIBS += -lnsl -lbsm -lscf -ltsol
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# false positives / need cleanup
diff --git a/usr/src/cmd/autopush/Makefile b/usr/src/cmd/autopush/Makefile
index 4ff7a09068..7af1622c09 100644
--- a/usr/src/cmd/autopush/Makefile
+++ b/usr/src/cmd/autopush/Makefile
@@ -29,7 +29,7 @@ ROOTFS_PROG= $(PROG)
include ../Makefile.cmd
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/awk/Makefile b/usr/src/cmd/awk/Makefile
index 0b38940b29..c49c932558 100644
--- a/usr/src/cmd/awk/Makefile
+++ b/usr/src/cmd/awk/Makefile
@@ -41,7 +41,7 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/awk_xpg4/Makefile b/usr/src/cmd/awk_xpg4/Makefile
index dc03ef3b1e..515ee7a5c0 100644
--- a/usr/src/cmd/awk_xpg4/Makefile
+++ b/usr/src/cmd/awk_xpg4/Makefile
@@ -44,7 +44,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
YFLAGS += -d
LDLIBS += -lm
CLEANFILES= awk.c y.tab.h
diff --git a/usr/src/cmd/backup/Makefile.backup b/usr/src/cmd/backup/Makefile.backup
index 5a4712eb6e..a4086ac9e7 100644
--- a/usr/src/cmd/backup/Makefile.backup
+++ b/usr/src/cmd/backup/Makefile.backup
@@ -42,7 +42,7 @@ CSTYLEFLAGS= -h -p -P
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
# not linted
diff --git a/usr/src/cmd/backup/dump/Makefile b/usr/src/cmd/backup/dump/Makefile
index 965fcf8eae..1e24b4845d 100644
--- a/usr/src/cmd/backup/dump/Makefile
+++ b/usr/src/cmd/backup/dump/Makefile
@@ -69,7 +69,7 @@ CPPFLAGS= -I$(LOCAL) -I$(GENERAL) -I$(GLOBAL) -DPARTIAL \
-D_LARGEFILE64_SOURCE=1
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-extra
LIBDUMP= ../lib/libdump.a
diff --git a/usr/src/cmd/bart/Makefile b/usr/src/cmd/bart/Makefile
index 67623232e0..47938144ab 100644
--- a/usr/src/cmd/bart/Makefile
+++ b/usr/src/cmd/bart/Makefile
@@ -33,7 +33,7 @@ include ../Makefile.cmd
LDLIBS += -lsec -lmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += indenting
diff --git a/usr/src/cmd/bdiff/Makefile b/usr/src/cmd/bdiff/Makefile
index 0b76705ff5..941df00f7c 100644
--- a/usr/src/cmd/bdiff/Makefile
+++ b/usr/src/cmd/bdiff/Makefile
@@ -32,7 +32,7 @@ include ../Makefile.cmd
FILEMODE= 755
CPPFLAGS += -D_FILE_OFFSET_BITS=64
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/bnu/Makefile.inc b/usr/src/cmd/bnu/Makefile.inc
index 5433cd6431..476c5cc290 100644
--- a/usr/src/cmd/bnu/Makefile.inc
+++ b/usr/src/cmd/bnu/Makefile.inc
@@ -44,7 +44,7 @@ SRCS = account.c anlwrk.c bnuconvert.c callers.c \
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-extra
CERRWARN += -_gcc=-Wno-implicit-function-declaration
diff --git a/usr/src/cmd/cal/Makefile b/usr/src/cmd/cal/Makefile
index 0cf3f27ba5..8ae9a69d1e 100644
--- a/usr/src/cmd/cal/Makefile
+++ b/usr/src/cmd/cal/Makefile
@@ -33,7 +33,7 @@ DCFILE= $(PROG).dc
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/cdrw/Makefile b/usr/src/cmd/cdrw/Makefile
index f44584ed69..aa39fca47b 100644
--- a/usr/src/cmd/cdrw/Makefile
+++ b/usr/src/cmd/cdrw/Makefile
@@ -38,7 +38,7 @@ SRCS= $(OBJS:.o=.c)
LDLIBS += -lhal -lsecdb
NONLINTLDLIBS = -ldbus-1
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CPPFLAGS += -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(HAL_DBUS_CPPFLAGS)
LINTFLAGS += -um
diff --git a/usr/src/cmd/chmod/Makefile b/usr/src/cmd/chmod/Makefile
index 00788f1205..45439d6628 100644
--- a/usr/src/cmd/chmod/Makefile
+++ b/usr/src/cmd/chmod/Makefile
@@ -33,7 +33,7 @@ include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile
index 1f421601fc..621de49f78 100644
--- a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile
+++ b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile
@@ -40,7 +40,7 @@ POFILES = $(OBJS:%.o=%.po)
POFILE = $(PROG)_all.po
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
LDLIBS += -lcryptoutil
diff --git a/usr/src/cmd/cmd-crypto/decrypt/Makefile.com b/usr/src/cmd/cmd-crypto/decrypt/Makefile.com
index f549085acf..d6bb139100 100644
--- a/usr/src/cmd/cmd-crypto/decrypt/Makefile.com
+++ b/usr/src/cmd/cmd-crypto/decrypt/Makefile.com
@@ -39,7 +39,7 @@ CFLAGS64 += $(CCVERBOSE)
CPPFLAGS += -D_FILE_OFFSET_BITS=64
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lkmf -lpkcs11 -lcryptoutil
diff --git a/usr/src/cmd/cmd-crypto/digest/Makefile.com b/usr/src/cmd/cmd-crypto/digest/Makefile.com
index ecc0652cee..0426ce906c 100644
--- a/usr/src/cmd/cmd-crypto/digest/Makefile.com
+++ b/usr/src/cmd/cmd-crypto/digest/Makefile.com
@@ -38,7 +38,7 @@ CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
CPPFLAGS +=-D_FILE_OFFSET_BITS=64
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lkmf -lpkcs11 -lcryptoutil
diff --git a/usr/src/cmd/cmd-crypto/pktool/Makefile b/usr/src/cmd/cmd-crypto/pktool/Makefile
index 45a0113ca3..b1746c2a14 100644
--- a/usr/src/cmd/cmd-crypto/pktool/Makefile
+++ b/usr/src/cmd/cmd-crypto/pktool/Makefile
@@ -53,7 +53,7 @@ CPPFLAGS += -I. -I$(KMFDIR)/include -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
-I$(KMFDIR)/ber_der/inc
CFLAGS += $(CCVERBOSE) -DDEBUG
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
# not linted, too much mess, but it should be
diff --git a/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile b/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile
index 199f92807a..f9ae4eacdc 100644
--- a/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile
+++ b/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile
@@ -39,7 +39,7 @@ ROOTCFGFILES= $(CFGFILES:%=$(ROOTCFGDIR)/%)
ROOTMANIFESTDIR= $(ROOTSVCNETWORK)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(ROOTCFGFILES) := OWNER= ipadm
$(ROOTCFGFILES) := GROUP= sys
diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
index 160b027d0c..b0cd337547 100644
--- a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
+++ b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
@@ -54,7 +54,7 @@ LDLIBS += -ldhcpagent -ldhcputil -ldladm -ldlpi -lgen \
-linetutil -lipadm -lkstat -lnsl -lnvpair -lnwam \
-lsecdb -lscf -lsocket -lsysevent -lumem -luutil
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/cmd/cmd-inet/usr.bin/Makefile b/usr/src/cmd/cmd-inet/usr.bin/Makefile
index 6e47c6e6f0..ec3c38d215 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile
@@ -73,7 +73,7 @@ $(ROOTSUIDPROG) := FILEMODE= 04555
CPPFLAGS += -DSYSV -DSTRNET -DBSD_COMP -I$(CMDINETCOMMONDIR)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
ruptime := SMOFF += leaks
diff --git a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile
index b2cf966be6..67a3656e18 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile
@@ -42,7 +42,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 \
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
# not linted
diff --git a/usr/src/cmd/cmd-inet/usr.bin/nc/Makefile b/usr/src/cmd/cmd-inet/usr.bin/nc/Makefile
index b93a1c9132..25d04d6448 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/nc/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/nc/Makefile
@@ -31,7 +31,7 @@ SRCS= $(OBJS:%.o=%.c)
include ../../../Makefile.cmd
LDLIBS += -lresolv -lsocket
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile b/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile
index e4de485e4e..9c2565656f 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile
@@ -46,7 +46,7 @@ OBJS= $(LOCALOBJS) $(COMMONOBJS) $(STAT_COMMON_OBJS)
SRCS= $(LOCALSRCS) $(COMMONSRCS) $(STAT_COMMON_SRCS)
CPPFLAGS += -DNDEBUG -I$(CMDINETCOMMONDIR) -I$(STATCOMMONDIR)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
LDLIBS += -ldhcpagent -lsocket -lnsl -lkstat -ltsnet -ltsol
diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile b/usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile
index 234a87f7d6..a5afd14897 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile
@@ -51,7 +51,7 @@ OBJS += chap_ms.o
EXOBJS += mschap_test.o
CLOBBERFILES += mschap_test
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# main() is too hairy for smatch
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile b/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile
index 7908ed7488..959f554636 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile
@@ -15,7 +15,7 @@ CPPFLAGS += -DPPP_DEFS_IN_NET
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile b/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
index 837a6145e2..298c1b5793 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
@@ -53,7 +53,7 @@ CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile b/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile
index d0565eec44..ed46caa121 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile
@@ -39,7 +39,7 @@ POFILE= talk.po
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -DSYSV -DSTRNET -DBSD_COMP
LDLIBS += -lcurses -lsocket -lnsl
diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile
index 2feba006c7..8de83d6243 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile
@@ -51,7 +51,7 @@ CPPFLAGS += -I$(LIB_INC)
CPPFLAGS += -I$(SRC)/uts/common
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
# not linted
diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilb/Makefile b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilb/Makefile
index 30504eb2f5..19dc47e456 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilb/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilb/Makefile
@@ -36,7 +36,7 @@ all: $(PROG)
include ../../Makefile.lib
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
ROOTLIBINETILB = $(ROOTLIBINET)/ilb
ROOTLIBINETILBPROG = $(PROG:%=$(ROOTLIBINETILB)/%)
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile
index f28c630ac3..3668af100b 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile
@@ -46,7 +46,7 @@ CPPFLAGS += -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
LDLIBS += -lsocket -lnsl -lsysevent -lnvpair -lipmp -linetutil -ldlpi
LINTFLAGS += -erroff=E_INCONS_ARG_DECL2 -erroff=E_INCONS_ARG_USED2
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Instrument in.mpathd with CTF data to ease debugging.
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile
index 4b8faf3a3f..904871239a 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile
@@ -58,7 +58,7 @@ LINTFLAGS += -erroff=E_INCONS_ARG_DECL2 -erroff=E_INCONS_VAL_TYPE_DECL2
LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile
index afac8667f2..5424242b0d 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile
@@ -46,7 +46,7 @@ include ../../../Makefile.cmd
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/Makefile
index 81233c5994..1a447f1888 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/ncaconfd/Makefile
@@ -36,7 +36,7 @@ include ../Makefile.lib
LDLIBS += -lsocket -lnsl
CPPFLAGS += -I$(SRC)/uts/common/inet/nca
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
POFILE = ${PROG}.po
diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile
index 0039ea5f6a..2faa3bf02b 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile
@@ -47,7 +47,7 @@ CPPFLAGS += -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
LDLIBS += -lvrrpadm -lsocket -lnsl -ldladm -linetutil -lipadm -lsysevent -lnvpair -lsecdb
LINTFLAGS += -erroff=E_INCONS_ARG_DECL2 -erroff=E_INCONS_ARG_USED2
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Instrument vrrpd with CTF data to ease debugging.
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
index f17a96a1ed..97476c95d9 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
@@ -102,7 +102,7 @@ COMMONSRCS= $(COMMONOBJS:%.o=$(CMDINETCOMMONDIR)/%.c)
SRCS+= $(COMMONSRCS)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile
index 2f5b321f63..dfdb22cbde 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile
@@ -37,7 +37,7 @@ COMMONSRCS= $(CMDINETCOMMONDIR)/$(COMMONOBJS:%.o=%.c)
SRCS= $(LOCALSRCS) $(COMMONSRCS)
CPPFLAGS += -I$(CMDINETCOMMONDIR) -I$(SRC)/common/net/dhcp
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
LDLIBS += -ldhcpagent -ldlpi -linetutil -lipmp -ldladm -lipadm
LINTFLAGS += -m
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile
index 73b2b67758..6ecf5e326f 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile
@@ -38,7 +38,7 @@ CPPFLAGS += -I$(SRC)/lib/libilb/common -I$(SRC)/uts/common
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile
index 022fc53a8b..65077da947 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile
@@ -39,7 +39,7 @@ LINTFLAGS += -erroff=E_FUNC_DECL_VAR_ARG2 -erroff=E_INCONS_VAL_TYPE_DECL2 \
CPPFLAGS += $(_D_XOPEN_EXTN)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/Makefile
index 27e0ea85ab..b61e615607 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.talkd/Makefile
@@ -35,7 +35,7 @@ $(ROOTMANIFEST) := FILEMODE= 444
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lsocket -lnsl
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/inetadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/inetadm/Makefile
index 55cbbf7aab..e79bc10e1c 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/inetadm/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/inetadm/Makefile
@@ -33,7 +33,7 @@ include ../../../Makefile.cmd
LDLIBS += -lscf -luutil -linetsvc
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
lint := LINTFLAGS = -ux
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/inetconv/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/inetconv/Makefile
index acd230f592..9f6c5f267d 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/inetconv/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/inetconv/Makefile
@@ -29,7 +29,7 @@ PROG = inetconv
include ../../../Makefile.cmd
LDLIBS += -lscf -linetsvc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile
index cb0ca92b43..df83fc4c15 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile
@@ -29,7 +29,7 @@ ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%)
include $(SRC)/cmd/Makefile.cmd
CSTD = $(CSTD_GNU99)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lipmp -lsocket -lsysevent -lnvpair -lofmt
XGETFLAGS += -a -x $(PROG).xcl
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
index 485110bb74..90c4570bdd 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
@@ -51,7 +51,7 @@ $(ROOTLIBIPQOSCONFTYPES) := FILEMODE= 0444
CPPFLAGS += -D__EXTENSIONS__
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile
index 3cbe3dbb38..80e4a9ecf2 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile
@@ -57,7 +57,7 @@ CLEANFILES += $(PROG) $(POFILES)
CPPFLAGS += -DSYSV -DBSD_COMP -I$(CMDINETCOMMONDIR) -I.
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# not linted
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/Makefile
index 4abf5b25f6..00f4ffdb2e 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/Makefile
@@ -42,7 +42,7 @@ ROOTUSRLIBPROG = $(PROG:%=$(ROOTLIB)/%)
.KEEP_STATE:
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
LDLIBS += -lkmf -lpkcs11 -lcryptoutil -lnsl -lsocket
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile
index e3984bdda6..3b0f69b0d7 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile
@@ -33,7 +33,7 @@ XGETFLAGS += -a -x $(PROG).xcl
LDLIBS += -lofmt -linetutil -lnsl -lnwam -lumem -lscf
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
index 25d961bdb1..6b9572f233 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
@@ -39,7 +39,7 @@ CLEANFILES += nwamcfg_lex.c nwamcfg_grammar.tab.c nwamcfg_grammar.tab.h
CLEANFILES += $(PROG).ln
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-implicit-function-declaration
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile
index bd235b77b9..1226ab79e1 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile
@@ -50,7 +50,7 @@ ROOTUSRSBINLINKS= $(PROG:%=$(ROOTUSRSBIN)/%)
CPPFLAGS += -I../../../../common/svc -I$(CMDINETCOMMONDIR)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
LDLIBS += -lscf -luutil -lsocket
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
index 55327064e7..4709cfe59e 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
@@ -53,7 +53,7 @@ LDLIBS += -ldhcputil -ldlpi -lsocket -lnsl -ltsol
LDFLAGS += $(MAPFILE.NGB:%=-M%)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile
index dac6d08a21..87ff688b17 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile
@@ -51,7 +51,7 @@ CPPFLAGS += -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
LINTFLAGS += -erroff=E_FUNC_DECL_VAR_ARG2 -erroff=E_INCONS_ARG_DECL2 \
-erroff=E_INCONS_ARG_USED2 -erroff=E_INCONS_VAL_TYPE_DECL2
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
.KEEP_STATE:
diff --git a/usr/src/cmd/consadm/Makefile.com b/usr/src/cmd/consadm/Makefile.com
index 135b5d9a8f..6c11b2504f 100644
--- a/usr/src/cmd/consadm/Makefile.com
+++ b/usr/src/cmd/consadm/Makefile.com
@@ -33,7 +33,7 @@ OBJS= $(COMMONOBJS)
include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS +=
FILEMODE = 0555
diff --git a/usr/src/cmd/cpc/cpustat/Makefile b/usr/src/cmd/cpc/cpustat/Makefile
index edff7bd831..6864a2b55d 100644
--- a/usr/src/cmd/cpc/cpustat/Makefile
+++ b/usr/src/cmd/cpc/cpustat/Makefile
@@ -37,7 +37,7 @@ STAT_COMMON_SRCS = $(STAT_COMMON_OBJS:%.o=$(STATCOMMONDIR)/%.c)
SRCS += $(STAT_COMMON_SRCS)
CFLAGS += $(CCVERBOSE) $(CTF_FLAGS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -D_REENTRANT -I$(SRC)/lib/libcpc/common -I$(STATCOMMONDIR)
LDLIBS += -lcpc -lkstat
diff --git a/usr/src/cmd/cpio/Makefile b/usr/src/cmd/cpio/Makefile
index ccad9b0efc..18c3a18cca 100644
--- a/usr/src/cmd/cpio/Makefile
+++ b/usr/src/cmd/cpio/Makefile
@@ -31,7 +31,7 @@ SRCS= $(OBJS:%.o=%.c)
include ../Makefile.cmd
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DSOLARIS_PRIVS
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/cron/Makefile b/usr/src/cmd/cron/Makefile
index 5c324d9e86..2ba1fca040 100644
--- a/usr/src/cmd/cron/Makefile
+++ b/usr/src/cmd/cron/Makefile
@@ -36,7 +36,7 @@ ROOTMETHOD = $(ROOTLIBSVCMETHOD)/svc-cron
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I $(SRC)/common/util
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-value
diff --git a/usr/src/cmd/csh/i386/Makefile b/usr/src/cmd/csh/i386/Makefile
index c019a85dee..581e79cbf3 100644
--- a/usr/src/cmd/csh/i386/Makefile
+++ b/usr/src/cmd/csh/i386/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64
LDLIBS += -lcurses
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-implicit-int
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/csh/sparc/Makefile b/usr/src/cmd/csh/sparc/Makefile
index df03abd8a7..7f1262b278 100644
--- a/usr/src/cmd/csh/sparc/Makefile
+++ b/usr/src/cmd/csh/sparc/Makefile
@@ -23,7 +23,7 @@ CPPFLAGS= -I. $(DEFS) $(MBCHAR) $(CPPFLAGS.master)
CPPFLAGS += -I../../sh
CPPFLAGS += -D_FILE_OFFSET_BITS=64
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-implicit-int
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/csplit/Makefile b/usr/src/cmd/csplit/Makefile
index 66e008958a..a9c5fd8d99 100644
--- a/usr/src/cmd/csplit/Makefile
+++ b/usr/src/cmd/csplit/Makefile
@@ -33,7 +33,7 @@ XGETFLAGS += -a -x csplit.xcl
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/ctrun/Makefile b/usr/src/cmd/ctrun/Makefile
index 318c7e0874..2f372bbdce 100644
--- a/usr/src/cmd/ctrun/Makefile
+++ b/usr/src/cmd/ctrun/Makefile
@@ -30,7 +30,7 @@ include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lcontract -luutil
.KEEP_STATE:
diff --git a/usr/src/cmd/dc/Makefile b/usr/src/cmd/dc/Makefile
index 58ddd81f1a..27f3520005 100644
--- a/usr/src/cmd/dc/Makefile
+++ b/usr/src/cmd/dc/Makefile
@@ -36,7 +36,7 @@ LDFLAGS += $(MAPFILE.NGB:%=-M%)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/dcs/sparc/sun4u/Makefile b/usr/src/cmd/dcs/sparc/sun4u/Makefile
index 0abbf69042..d5861b82b2 100644
--- a/usr/src/cmd/dcs/sparc/sun4u/Makefile
+++ b/usr/src/cmd/dcs/sparc/sun4u/Makefile
@@ -90,7 +90,7 @@ LINT_FLAGS= -c -Nlevel=4 -Ncheck $($(CONCURR_MODE)_FLAGS)
XGETFLAGS += -a -s -x $(PROG).xcl
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# LIBRARIES:
diff --git a/usr/src/cmd/dd/Makefile b/usr/src/cmd/dd/Makefile
index 1a459b9e94..7462e58d72 100644
--- a/usr/src/cmd/dd/Makefile
+++ b/usr/src/cmd/dd/Makefile
@@ -29,7 +29,7 @@ PROG= dd
include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -D_FILE_OFFSET_BITS=64
LDLIBS += -lcmdutils
diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com
index 17129c7d7b..4332220e5f 100644
--- a/usr/src/cmd/devfsadm/Makefile.com
+++ b/usr/src/cmd/devfsadm/Makefile.com
@@ -97,7 +97,7 @@ LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/devinfo/Makefile b/usr/src/cmd/devinfo/Makefile
index 58b5c56131..f262fe3359 100644
--- a/usr/src/cmd/devinfo/Makefile
+++ b/usr/src/cmd/devinfo/Makefile
@@ -32,7 +32,7 @@ include ../Makefile.cmd
LDLIBS += -ladm -lefi
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/devmgmt/cmds/Makefile b/usr/src/cmd/devmgmt/cmds/Makefile
index 6eaec76115..1ef64c363b 100644
--- a/usr/src/cmd/devmgmt/cmds/Makefile
+++ b/usr/src/cmd/devmgmt/cmds/Makefile
@@ -37,7 +37,7 @@ PROG = devattr devreserv getvol putdgrp devfree getdev listdgrp getdgrp \
LDLIBS += -ladm
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += signed
diff --git a/usr/src/cmd/dfs.cmds/dfshares/Makefile b/usr/src/cmd/dfs.cmds/dfshares/Makefile
index 7134e8e4d7..ac05242ffd 100644
--- a/usr/src/cmd/dfs.cmds/dfshares/Makefile
+++ b/usr/src/cmd/dfs.cmds/dfshares/Makefile
@@ -34,7 +34,7 @@ CFLAGS += -s
include ../../Makefile.cmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/dfs.cmds/sharectl/Makefile.com b/usr/src/cmd/dfs.cmds/sharectl/Makefile.com
index 052b0100d7..0a5d9047ca 100644
--- a/usr/src/cmd/dfs.cmds/sharectl/Makefile.com
+++ b/usr/src/cmd/dfs.cmds/sharectl/Makefile.com
@@ -40,7 +40,7 @@ MYCPPFLAGS = -I.. -I../../sharemgr
CPPFLAGS += $(MYCPPFLAGS)
LDLIBS += -lshare -lumem
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SRCS = $(SHARECTL_SRC)
OBJS = $(SHARECTL_OBJ)
diff --git a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com
index 49272439c6..3c5567cfbe 100644
--- a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com
+++ b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com
@@ -43,7 +43,7 @@ LDLIBS += -lshare -lscf -lsecdb -lumem
all install := LDLIBS += -lxml2
LINTFLAGS += -u
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
POFILES = $(SRCS:.c=.po)
POFILE = sharemgr.po
diff --git a/usr/src/cmd/diff/Makefile b/usr/src/cmd/diff/Makefile
index cfa0ab04d2..a29c75c671 100644
--- a/usr/src/cmd/diff/Makefile
+++ b/usr/src/cmd/diff/Makefile
@@ -31,7 +31,7 @@ LIBDIFFH= diffh
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
#
diff --git a/usr/src/cmd/dis/Makefile b/usr/src/cmd/dis/Makefile
index c35932248f..bd56703ca3 100644
--- a/usr/src/cmd/dis/Makefile
+++ b/usr/src/cmd/dis/Makefile
@@ -32,7 +32,7 @@ SRCS= $(OBJS:%.o=%.c)
include ../Makefile.cmd
LDLIBS += -ldisasm -luutil -lelf -ldemangle-sys
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/dispadmin/Makefile b/usr/src/cmd/dispadmin/Makefile
index 65f7e7301c..131b8567f3 100644
--- a/usr/src/cmd/dispadmin/Makefile
+++ b/usr/src/cmd/dispadmin/Makefile
@@ -39,7 +39,7 @@ PROGS= $(PROG) $(RT) $(TS) $(IA) $(FSS) $(FX) $(SDC)
include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
ROOTDIR= $(ROOT)/usr/lib/class
ROOTDIRS= $(ROOTDIR) \
diff --git a/usr/src/cmd/dladm/Makefile b/usr/src/cmd/dladm/Makefile
index ef2b9868ef..57328597dd 100644
--- a/usr/src/cmd/dladm/Makefile
+++ b/usr/src/cmd/dladm/Makefile
@@ -42,7 +42,7 @@ LDLIBS += $(ZLAZYLOAD) -lrstp $(ZNOLAZYLOAD)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += snprintf_overflow
diff --git a/usr/src/cmd/dlmgmtd/Makefile b/usr/src/cmd/dlmgmtd/Makefile
index ee51fd8cd2..91fa6db521 100644
--- a/usr/src/cmd/dlmgmtd/Makefile
+++ b/usr/src/cmd/dlmgmtd/Makefile
@@ -41,7 +41,7 @@ $(ROOTCFGDIR)/datalink.conf := FILEMODE= 644
LDLIBS += -ldladm -ldlpi -lavl -lnvpair -lsysevent -lcontract
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Instrument dlmgmtd with CTF data to ease debugging.
diff --git a/usr/src/cmd/dlstat/Makefile b/usr/src/cmd/dlstat/Makefile
index bd274d10c0..75bf5acc60 100644
--- a/usr/src/cmd/dlstat/Makefile
+++ b/usr/src/cmd/dlstat/Makefile
@@ -33,7 +33,7 @@ include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/du/Makefile b/usr/src/cmd/du/Makefile
index 35b414e6cd..695eb11993 100644
--- a/usr/src/cmd/du/Makefile
+++ b/usr/src/cmd/du/Makefile
@@ -31,7 +31,7 @@ include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(XPG4) := CFLAGS += -DXPG4
CPPFLAGS += -D_FILE_OFFSET_BITS=64
POFILE = du_cmd.po
diff --git a/usr/src/cmd/ed/Makefile b/usr/src/cmd/ed/Makefile
index 0c9339377e..d4066cab10 100644
--- a/usr/src/cmd/ed/Makefile
+++ b/usr/src/cmd/ed/Makefile
@@ -42,7 +42,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/eeprom/Makefile.com b/usr/src/cmd/eeprom/Makefile.com
index eab53d485d..98398f0ab9 100644
--- a/usr/src/cmd/eeprom/Makefile.com
+++ b/usr/src/cmd/eeprom/Makefile.com
@@ -39,7 +39,7 @@ DIRMODE = 755
OBJS = error.o
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
# not linted
diff --git a/usr/src/cmd/eqn/eqn.d/Makefile b/usr/src/cmd/eqn/eqn.d/Makefile
index 08c289eb03..6c46021db2 100644
--- a/usr/src/cmd/eqn/eqn.d/Makefile
+++ b/usr/src/cmd/eqn/eqn.d/Makefile
@@ -35,7 +35,7 @@ LDFLAGS += $(MAPFILE.NGB:%=-M%)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/eqn/neqn.d/Makefile b/usr/src/cmd/eqn/neqn.d/Makefile
index a50bc23501..d4993d648d 100644
--- a/usr/src/cmd/eqn/neqn.d/Makefile
+++ b/usr/src/cmd/eqn/neqn.d/Makefile
@@ -28,7 +28,7 @@ CPPFLAGS = -DNEQN -I. -I.. $(CPPFLAGS.master)
LDFLAGS += $(MAPFILE.NGB:%=-M%)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
# not linted
diff --git a/usr/src/cmd/expr/Makefile b/usr/src/cmd/expr/Makefile
index 08117a45a3..fe0b846109 100644
--- a/usr/src/cmd/expr/Makefile
+++ b/usr/src/cmd/expr/Makefile
@@ -37,7 +37,7 @@ SRCS= expr.c compile.c
include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-extra
# "missing type for func"
SMATCH=off
diff --git a/usr/src/cmd/file/Makefile b/usr/src/cmd/file/Makefile
index f6e0ba9e81..e11a4c0259 100644
--- a/usr/src/cmd/file/Makefile
+++ b/usr/src/cmd/file/Makefile
@@ -41,7 +41,7 @@ include ../Makefile.cmd
CSTD= $(CSTD_GNU99)
C99LMODE= -Xc99=%all
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
POFILE= file_all.po
diff --git a/usr/src/cmd/filesync/Makefile b/usr/src/cmd/filesync/Makefile
index df62a44193..50e8a25bb2 100644
--- a/usr/src/cmd/filesync/Makefile
+++ b/usr/src/cmd/filesync/Makefile
@@ -34,7 +34,7 @@ include ../Makefile.cmd
LDLIBS += -lgen
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/find/Makefile b/usr/src/cmd/find/Makefile
index fa138bdd66..1278f68668 100644
--- a/usr/src/cmd/find/Makefile
+++ b/usr/src/cmd/find/Makefile
@@ -37,7 +37,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I $(SRC)/common/util
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LINTFLAGS += -u
LDLIBS += -lsec
diff --git a/usr/src/cmd/flowstat/Makefile b/usr/src/cmd/flowstat/Makefile
index c568245899..fad17d84ab 100644
--- a/usr/src/cmd/flowstat/Makefile
+++ b/usr/src/cmd/flowstat/Makefile
@@ -37,7 +37,7 @@ LDLIBS += -L$(ROOT)/lib
LDLIBS += -ldladm -lofmt
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fm/eversholt/Makefile.esc.com b/usr/src/cmd/fm/eversholt/Makefile.esc.com
index 97d684c164..ffda5bbe11 100644
--- a/usr/src/cmd/fm/eversholt/Makefile.esc.com
+++ b/usr/src/cmd/fm/eversholt/Makefile.esc.com
@@ -46,7 +46,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
CPPFLAGS += -I$(EVERCMNSRC) -I.
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
diff --git a/usr/src/cmd/fm/fmd/Makefile.fmd b/usr/src/cmd/fm/fmd/Makefile.fmd
index 7ad59e737a..caf737e114 100644
--- a/usr/src/cmd/fm/fmd/Makefile.fmd
+++ b/usr/src/cmd/fm/fmd/Makefile.fmd
@@ -120,7 +120,7 @@ CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST)
LINTFLAGS += -mu
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
$(RELEASE_BUILD)CERRWARN += -_gcc=-Wno-unused-but-set-variable
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/cmd/fm/fmdump/Makefile.com b/usr/src/cmd/fm/fmdump/Makefile.com
index fbd90d9ea1..37a6f77e1e 100644
--- a/usr/src/cmd/fm/fmdump/Makefile.com
+++ b/usr/src/cmd/fm/fmdump/Makefile.com
@@ -39,7 +39,7 @@ LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_log -lnvpair -ltopo -lfmd_msg
LDFLAGS += -R/usr/lib/fm
LINTFLAGS += -mnu
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.NO_PARALLEL:
.PARALLEL: $(OBJS) $(LINTFILES)
diff --git a/usr/src/cmd/fm/fminject/Makefile.com b/usr/src/cmd/fm/fminject/Makefile.com
index c6b60be1cb..bbcbdd095c 100644
--- a/usr/src/cmd/fm/fminject/Makefile.com
+++ b/usr/src/cmd/fm/fminject/Makefile.com
@@ -50,7 +50,7 @@ CLEANFILES += inj_grammar.c inj_grammar.h inj_lex.c y.tab.h y.tab.c
CPPFLAGS += -I. -I../common
CFLAGS += $(CCVERBOSE) $(CTF_FLAGS)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/cmd/fm/ipmitopo/Makefile.com b/usr/src/cmd/fm/ipmitopo/Makefile.com
index 003331dba6..d82449d1e9 100644
--- a/usr/src/cmd/fm/ipmitopo/Makefile.com
+++ b/usr/src/cmd/fm/ipmitopo/Makefile.com
@@ -41,7 +41,7 @@ CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST)
LDLIBS += -lipmi -lnvpair
LINTFLAGS += -mnu
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.NO_PARALLEL:
.PARALLEL: $(OBJS) $(LINTFILES)
diff --git a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile
index 3acbf7c3df..11d1642d2d 100644
--- a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile
+++ b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile
@@ -35,7 +35,7 @@ LINTFLAGS += -I. -I$(SRC)/lib/fm/topo/modules/common/disk -L$(ROOT)/usr/lib/fm
CFLAGS += -I. -I$(SRC)/lib/fm/topo/modules/common/disk
LDLIBS += -lsysevent -lnvpair -lsmbios -lcfgadm -ltopo -luutil -lipmi
LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fm/modules/common/eversholt/Makefile b/usr/src/cmd/fm/modules/common/eversholt/Makefile
index 0ca385c960..a6397dbd87 100644
--- a/usr/src/cmd/fm/modules/common/eversholt/Makefile
+++ b/usr/src/cmd/fm/modules/common/eversholt/Makefile
@@ -45,7 +45,7 @@ include ../../Makefile.plugin
CPPFLAGS += -DFMAPLUGIN -I$(EVERSRCDIR) -I.
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-implicit-function-declaration
diff --git a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile
index ce58c99d73..5395bfdf06 100644
--- a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile
+++ b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile
@@ -41,7 +41,7 @@ LDLIBS += -luutil -lxml2 -L$(ROOTLIB)/fm -ltopo
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fm/modules/common/ip-transport/Makefile b/usr/src/cmd/fm/modules/common/ip-transport/Makefile
index bafe1caba3..fb4db5994f 100644
--- a/usr/src/cmd/fm/modules/common/ip-transport/Makefile
+++ b/usr/src/cmd/fm/modules/common/ip-transport/Makefile
@@ -33,7 +33,7 @@ SRCS = ip.c
include ../../Makefile.plugin
LDLIBS += -lsocket -lnsl
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile b/usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile
index 4317a71857..00cd45bb65 100644
--- a/usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile
+++ b/usr/src/cmd/fm/modules/common/sw-diag-response/software-diagnosis/Makefile
@@ -50,4 +50,4 @@ LINTFLAGS += $(INCS)
LDLIBS += -L$(ROOTLIB)/fm -ltopo -luutil -luuid -lkstat
LDFLAGS += -R/usr/lib/fm
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/Makefile b/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/Makefile
index f54dc1ada9..8569d3628e 100644
--- a/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/Makefile
+++ b/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/Makefile
@@ -44,5 +44,5 @@ LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_adm
LDFLAGS += -R/usr/lib/fm
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
diff --git a/usr/src/cmd/fm/modules/sun4v/etm/Makefile b/usr/src/cmd/fm/modules/sun4v/etm/Makefile
index 2ea2e79af5..0e3e1cc8d1 100644
--- a/usr/src/cmd/fm/modules/sun4v/etm/Makefile
+++ b/usr/src/cmd/fm/modules/sun4v/etm/Makefile
@@ -41,4 +41,4 @@ DYNFLAGS += -R/usr/lib
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/fmtmsg/Makefile b/usr/src/cmd/fmtmsg/Makefile
index c5ae7e2c1f..ccc0408f6d 100644
--- a/usr/src/cmd/fmtmsg/Makefile
+++ b/usr/src/cmd/fmtmsg/Makefile
@@ -30,7 +30,7 @@ SRCS= $(OBJS:%.o=%.c)
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/format/Makefile b/usr/src/cmd/format/Makefile
index 6c9f7781f7..0c8e32b3c0 100644
--- a/usr/src/cmd/format/Makefile
+++ b/usr/src/cmd/format/Makefile
@@ -46,7 +46,7 @@ DATA= format.dat
include ../Makefile.cmd
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile
index 91f994ebb0..2ce08652b7 100644
--- a/usr/src/cmd/fs.d/Makefile
+++ b/usr/src/cmd/fs.d/Makefile
@@ -85,7 +85,7 @@ CPPFLAGS += -D_LARGEFILE64_SOURCE
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
# not linted
diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile
index c91673ad42..5a3a9fd234 100644
--- a/usr/src/cmd/fs.d/autofs/Makefile
+++ b/usr/src/cmd/fs.d/autofs/Makefile
@@ -95,7 +95,7 @@ CPPFLAGS= -I. -I.. -I../nfs/lib $(CPPFLAGS.master) -D_REENTRANT \
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/fs.d/nfs/lockd/Makefile b/usr/src/cmd/fs.d/nfs/lockd/Makefile
index e013de8aaa..417fc44a0c 100644
--- a/usr/src/cmd/fs.d/nfs/lockd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/lockd/Makefile
@@ -44,7 +44,7 @@ CSTD = $(CSTD_GNU99)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/nfs/mount/Makefile b/usr/src/cmd/fs.d/nfs/mount/Makefile
index f20280b634..a53b876974 100644
--- a/usr/src/cmd/fs.d/nfs/mount/Makefile
+++ b/usr/src/cmd/fs.d/nfs/mount/Makefile
@@ -46,7 +46,7 @@ UNCHECKED_HDRS= webnfs.h
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/fs.d/nfs/mountd/Makefile b/usr/src/cmd/fs.d/nfs/mountd/Makefile
index 36d3d4bca4..2daa3f38ba 100644
--- a/usr/src/cmd/fs.d/nfs/mountd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/mountd/Makefile
@@ -42,7 +42,7 @@ DOBJ = $(DSRC:%.d=%.o)
LDLIBS += -lrpcsvc -lnsl -lbsm -lsocket -ltsnet -ltsol -lnvpair -lscf -lumem
CPPFLAGS += -D_REENTRANT -I../lib
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# not linted
diff --git a/usr/src/cmd/fs.d/nfs/nfslog/Makefile b/usr/src/cmd/fs.d/nfs/nfslog/Makefile
index 7b2763a8d2..712cf79d53 100644
--- a/usr/src/cmd/fs.d/nfs/nfslog/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfslog/Makefile
@@ -40,7 +40,7 @@ SRCS= $(LOCAL:%.o=%.c) $(COMMON:%.o=../lib/%.c)
LDLIBS += -lsocket -lnsl
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile b/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
index 5f0af9ef89..a8ebbd4eb5 100644
--- a/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
@@ -44,7 +44,7 @@ CPPFLAGS += -I../lib -D_POSIX_PTHREAD_SEMANTICS
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/nfs/showmount/Makefile b/usr/src/cmd/fs.d/nfs/showmount/Makefile
index 527c776481..c9abffdf07 100644
--- a/usr/src/cmd/fs.d/nfs/showmount/Makefile
+++ b/usr/src/cmd/fs.d/nfs/showmount/Makefile
@@ -46,7 +46,7 @@ LDLIBS += -lrpcsvc -lnsl
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/nfs/statd/Makefile b/usr/src/cmd/fs.d/nfs/statd/Makefile
index c64bbb71ca..adb5cd9dd5 100644
--- a/usr/src/cmd/fs.d/nfs/statd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/statd/Makefile
@@ -42,7 +42,7 @@ CPPFLAGS += -D_REENTRANT -DSUN_THREADS
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/pcfs/fsck/Makefile b/usr/src/cmd/fs.d/pcfs/fsck/Makefile
index 4be0621768..d0b75a8449 100644
--- a/usr/src/cmd/fs.d/pcfs/fsck/Makefile
+++ b/usr/src/cmd/fs.d/pcfs/fsck/Makefile
@@ -52,7 +52,7 @@ CPPFLAGS += -D_LARGEFILE64_SOURCE
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# We need to tell lint not to complain about the routines
diff --git a/usr/src/cmd/fs.d/pcfs/mount/Makefile b/usr/src/cmd/fs.d/pcfs/mount/Makefile
index bb29ed53d8..af7da82edc 100644
--- a/usr/src/cmd/fs.d/pcfs/mount/Makefile
+++ b/usr/src/cmd/fs.d/pcfs/mount/Makefile
@@ -31,4 +31,4 @@ include ../../Makefile.fstype
include ../../Makefile.mount
include ../../Makefile.mount.targ
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/fs.d/tmpfs/Makefile b/usr/src/cmd/fs.d/tmpfs/Makefile
index 61599e70f4..1dc1cb6059 100644
--- a/usr/src/cmd/fs.d/tmpfs/Makefile
+++ b/usr/src/cmd/fs.d/tmpfs/Makefile
@@ -31,4 +31,4 @@ include ../Makefile.fstype
include ../Makefile.mount
include ../Makefile.mount.targ
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/fs.d/udfs/fsck/Makefile b/usr/src/cmd/fs.d/udfs/fsck/Makefile
index a5c12a6baa..b1d9610c70 100644
--- a/usr/src/cmd/fs.d/udfs/fsck/Makefile
+++ b/usr/src/cmd/fs.d/udfs/fsck/Makefile
@@ -38,7 +38,7 @@ UDFSDIR= ../mkfs
UDFSOBJS= udfslib.o
#UDFSSRCS= $(UDFSOBJS:%.o=%.c)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# not linted
diff --git a/usr/src/cmd/fs.d/udfs/fsdb/Makefile b/usr/src/cmd/fs.d/udfs/fsdb/Makefile
index 7c5c2494ab..36c430cf7e 100644
--- a/usr/src/cmd/fs.d/udfs/fsdb/Makefile
+++ b/usr/src/cmd/fs.d/udfs/fsdb/Makefile
@@ -48,7 +48,7 @@ LINTFLAGS64 += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/fs.d/udfs/fstyp/Makefile b/usr/src/cmd/fs.d/udfs/fstyp/Makefile
index 292faf8b32..3406009369 100644
--- a/usr/src/cmd/fs.d/udfs/fstyp/Makefile
+++ b/usr/src/cmd/fs.d/udfs/fstyp/Makefile
@@ -37,7 +37,7 @@ CFLAGS += $(C_PICFLAGS)
DYNLIB= $(LIBPROG)
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lnvpair -ladm -lc
diff --git a/usr/src/cmd/fs.d/udfs/labelit/Makefile b/usr/src/cmd/fs.d/udfs/labelit/Makefile
index 51c22de0b5..a21bc6ad8a 100644
--- a/usr/src/cmd/fs.d/udfs/labelit/Makefile
+++ b/usr/src/cmd/fs.d/udfs/labelit/Makefile
@@ -40,7 +40,7 @@ LINTFLAGS += -xerroff=E_STATIC_UNUSED
LINTFLAGS64 += -xerroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
labelit : labelit.o ud_lib.o
$(LINK.c) -o $@ labelit.o ud_lib.o $(LDLIBS)
diff --git a/usr/src/cmd/fs.d/udfs/mkfs/Makefile b/usr/src/cmd/fs.d/udfs/mkfs/Makefile
index 078f90c5fb..a2fbab17ab 100644
--- a/usr/src/cmd/fs.d/udfs/mkfs/Makefile
+++ b/usr/src/cmd/fs.d/udfs/mkfs/Makefile
@@ -47,7 +47,7 @@ UDFSDIR= ../../../../uts/common/fs/ufs
UDFSOBJS=
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/ufs/ff/Makefile b/usr/src/cmd/fs.d/ufs/ff/Makefile
index a36af880e0..4cfa9a0dbd 100644
--- a/usr/src/cmd/fs.d/ufs/ff/Makefile
+++ b/usr/src/cmd/fs.d/ufs/ff/Makefile
@@ -40,7 +40,7 @@ POFILE=
CPPFLAGS += -D_LARGEFILE64_SOURCE
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/ufs/fsck/Makefile b/usr/src/cmd/fs.d/ufs/fsck/Makefile
index cc3bd8dd12..3c3724644c 100644
--- a/usr/src/cmd/fs.d/ufs/fsck/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fsck/Makefile
@@ -50,7 +50,7 @@ LDLIBS += -lefi -lavl
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/ufs/fsdb/Makefile b/usr/src/cmd/fs.d/ufs/fsdb/Makefile
index 64527b4e5f..8d4fb03fda 100644
--- a/usr/src/cmd/fs.d/ufs/fsdb/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fsdb/Makefile
@@ -36,7 +36,7 @@ CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/ufs/fssnap/Makefile b/usr/src/cmd/fs.d/ufs/fssnap/Makefile
index c1dfb654c2..d61955c88d 100644
--- a/usr/src/cmd/fs.d/ufs/fssnap/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fssnap/Makefile
@@ -43,7 +43,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/ufs/mkfs/Makefile b/usr/src/cmd/fs.d/ufs/mkfs/Makefile
index 1df1d8c86d..a21865c9b6 100644
--- a/usr/src/cmd/fs.d/ufs/mkfs/Makefile
+++ b/usr/src/cmd/fs.d/ufs/mkfs/Makefile
@@ -41,7 +41,7 @@ MKFSOBJS= mkfs.o
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-empty-body
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# can't hack main() !
SMATCH = off
diff --git a/usr/src/cmd/fs.d/ufs/newfs/Makefile b/usr/src/cmd/fs.d/ufs/newfs/Makefile
index 82e10b3aaf..182ef9cefb 100644
--- a/usr/src/cmd/fs.d/ufs/newfs/Makefile
+++ b/usr/src/cmd/fs.d/ufs/newfs/Makefile
@@ -37,7 +37,7 @@ CPPFLAGS += -I../../ -D_LARGEFILE64_SOURCE
LDLIBS += -ladm -lefi
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/ufs/repquota/Makefile b/usr/src/cmd/fs.d/ufs/repquota/Makefile
index 4bb399e549..fb8d250c1b 100644
--- a/usr/src/cmd/fs.d/ufs/repquota/Makefile
+++ b/usr/src/cmd/fs.d/ufs/repquota/Makefile
@@ -37,7 +37,7 @@ include ../../Makefile.fstype
CPPFLAGS += -D_LARGEFILE64_SOURCE
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/ufs/tunefs/Makefile b/usr/src/cmd/fs.d/ufs/tunefs/Makefile
index ba6df6c8f5..50eb11a5be 100644
--- a/usr/src/cmd/fs.d/ufs/tunefs/Makefile
+++ b/usr/src/cmd/fs.d/ufs/tunefs/Makefile
@@ -38,7 +38,7 @@ LDLIBS += -ladm
CPPFLAGS += -D_LARGEFILE64_SOURCE
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fs.d/ufs/volcopy/Makefile b/usr/src/cmd/fs.d/ufs/volcopy/Makefile
index 9e767c6561..7bf60ec2f8 100644
--- a/usr/src/cmd/fs.d/ufs/volcopy/Makefile
+++ b/usr/src/cmd/fs.d/ufs/volcopy/Makefile
@@ -33,7 +33,7 @@ include ../../Makefile.fstype
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/fwflash/Makefile.com b/usr/src/cmd/fwflash/Makefile.com
index 3a5d9c36a2..08b90ce62b 100644
--- a/usr/src/cmd/fwflash/Makefile.com
+++ b/usr/src/cmd/fwflash/Makefile.com
@@ -26,7 +26,7 @@
# common rules for $SRC/cmd/fwflash
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
# not linted
diff --git a/usr/src/cmd/geniconvtbl/Makefile.com b/usr/src/cmd/geniconvtbl/Makefile.com
index adca670979..45fb5f174e 100644
--- a/usr/src/cmd/geniconvtbl/Makefile.com
+++ b/usr/src/cmd/geniconvtbl/Makefile.com
@@ -85,7 +85,7 @@ CLEANFILES = $(OBJS) $(YTABC) $(YTABH) $(LEXYY) $(YOUT) \
$(POFILES) $(POFILE)
CPPFLAGS += -I. -I..
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/cmd/getfacl/Makefile b/usr/src/cmd/getfacl/Makefile
index 575c1bd3cb..8166d04252 100644
--- a/usr/src/cmd/getfacl/Makefile
+++ b/usr/src/cmd/getfacl/Makefile
@@ -29,7 +29,7 @@ PROG= getfacl
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/grep/Makefile b/usr/src/cmd/grep/Makefile
index 85d00f57fe..9bcfdcebe6 100644
--- a/usr/src/cmd/grep/Makefile
+++ b/usr/src/cmd/grep/Makefile
@@ -31,7 +31,7 @@ EFILE= egrep
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
ROOTXPG4LINKS = $(ROOTXPG4BIN)/$(FFILE) $(ROOTXPG4BIN)/$(EFILE) $(ROOTXPG4BIN)/$(PROG)
ROOTLINKS = $(ROOTBIN)/$(FFILE) $(ROOTBIN)/$(EFILE)
diff --git a/usr/src/cmd/gss/gssd/Makefile b/usr/src/cmd/gss/gssd/Makefile
index cb03db28a1..90ef85ab9e 100644
--- a/usr/src/cmd/gss/gssd/Makefile
+++ b/usr/src/cmd/gss/gssd/Makefile
@@ -74,7 +74,7 @@ COPTFLAG += $(XESS) #-I$(KINCDIR)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/hotplugd/Makefile b/usr/src/cmd/hotplugd/Makefile
index 2a7be28033..91fd605489 100644
--- a/usr/src/cmd/hotplugd/Makefile
+++ b/usr/src/cmd/hotplugd/Makefile
@@ -44,7 +44,7 @@ $(ROOTMANIFEST) := FILEMODE= 444
CPPFLAGS += -I$(SRC)/lib/libhotplug/common
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -ldevinfo -lhotplug -lnvpair -lsecdb -lrcm -lbsm
.KEEP_STATE:
diff --git a/usr/src/cmd/id/Makefile b/usr/src/cmd/id/Makefile
index e6c3eef31a..d3bfb1e3cc 100644
--- a/usr/src/cmd/id/Makefile
+++ b/usr/src/cmd/id/Makefile
@@ -30,7 +30,7 @@ XPG4PROG= id
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/idmap/idmap/Makefile b/usr/src/cmd/idmap/idmap/Makefile
index 7f62b99649..3fb37bd6f5 100644
--- a/usr/src/cmd/idmap/idmap/Makefile
+++ b/usr/src/cmd/idmap/idmap/Makefile
@@ -39,7 +39,7 @@ CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
# not linted
diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile
index 4b2c59b59d..bcbd288752 100644
--- a/usr/src/cmd/idmap/idmapd/Makefile
+++ b/usr/src/cmd/idmap/idmapd/Makefile
@@ -62,7 +62,7 @@ include ../../Makefile.cmd
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/init/Makefile b/usr/src/cmd/init/Makefile
index 58d8e966a2..195a1271e8 100644
--- a/usr/src/cmd/init/Makefile
+++ b/usr/src/cmd/init/Makefile
@@ -35,7 +35,7 @@ include ../Makefile.cmd
CSTD = $(CSTD_GNU99)
LDLIBS += -lpam -lbsm -lcontract -lscf
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
CLOBBERFILES= $(STATIC)
diff --git a/usr/src/cmd/intrstat/Makefile.com b/usr/src/cmd/intrstat/Makefile.com
index 6c25d6f020..d0448ce718 100644
--- a/usr/src/cmd/intrstat/Makefile.com
+++ b/usr/src/cmd/intrstat/Makefile.com
@@ -38,7 +38,7 @@ SRCS += $(STAT_COMMON_SRCS)
CPPFLAGS += -I$(STATCOMMONDIR)
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -ldtrace
FILEMODE = 0555
diff --git a/usr/src/cmd/ipf/Makefile.ipf b/usr/src/cmd/ipf/Makefile.ipf
index f960a477a2..54c80175e9 100644
--- a/usr/src/cmd/ipf/Makefile.ipf
+++ b/usr/src/cmd/ipf/Makefile.ipf
@@ -35,7 +35,7 @@ CPPFLAGS += -I$(COMMONIPF) -I$(KERNELIPF) -DSUNDDI -DUSE_INET6 \
-DSOLARIS2=$(RELEASE_MINOR)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/iscsiadm/Makefile b/usr/src/cmd/iscsiadm/Makefile
index f515f892c5..d293c2fe69 100644
--- a/usr/src/cmd/iscsiadm/Makefile
+++ b/usr/src/cmd/iscsiadm/Makefile
@@ -41,7 +41,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/isns/isnsadm/Makefile b/usr/src/cmd/isns/isnsadm/Makefile
index e40079b4ef..a59d2c17a8 100644
--- a/usr/src/cmd/isns/isnsadm/Makefile
+++ b/usr/src/cmd/isns/isnsadm/Makefile
@@ -39,7 +39,7 @@ POFILES = $(OBJS:%.o=%.po)
LINTFLAGS += -xerroff=E_BAD_FORMAT_STR2
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/isns/isnsd/Makefile b/usr/src/cmd/isns/isnsd/Makefile
index 0cfabc0cfb..8cca720f32 100644
--- a/usr/src/cmd/isns/isnsd/Makefile
+++ b/usr/src/cmd/isns/isnsd/Makefile
@@ -61,7 +61,7 @@ LINTFLAGS += -xerroff=E_CASE_FALLTHRU
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-ignored-qualifiers
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
# not linted
diff --git a/usr/src/cmd/kbd/Makefile b/usr/src/cmd/kbd/Makefile
index 935ff52681..e1f28388c6 100644
--- a/usr/src/cmd/kbd/Makefile
+++ b/usr/src/cmd/kbd/Makefile
@@ -33,7 +33,7 @@ ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
PROG = kbd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lscf
all: $(PROG)
diff --git a/usr/src/cmd/keyserv/Makefile b/usr/src/cmd/keyserv/Makefile
index f787415ab9..dae01bb1a1 100644
--- a/usr/src/cmd/keyserv/Makefile
+++ b/usr/src/cmd/keyserv/Makefile
@@ -70,7 +70,7 @@ CPPFLAGS += -I. -I$(SRC)/lib/libnsl/include -I$(SRC)/lib/libsldap/common \
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-address
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/krb5/kadmin/kclient/Makefile b/usr/src/cmd/krb5/kadmin/kclient/Makefile
index bf766992c3..b15874dd4b 100644
--- a/usr/src/cmd/krb5/kadmin/kclient/Makefile
+++ b/usr/src/cmd/krb5/kadmin/kclient/Makefile
@@ -61,7 +61,7 @@ CPPFLAGS += -I$(SRC)/uts/common/gssapi/include \
-I$(SRC)/uts/common/gssapi/include \
-I$(SRC)/uts/common/gssapi/mechs/krb5/include
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile b/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
index 47bbc0ab43..7431b1d989 100644
--- a/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
+++ b/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
@@ -36,7 +36,7 @@ include ../../../Makefile.cmd
POFILE= $(SSRCS:%.sh=%.po)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/krb5/slave/Makefile b/usr/src/cmd/krb5/slave/Makefile
index 5b29e30459..7604827368 100644
--- a/usr/src/cmd/krb5/slave/Makefile
+++ b/usr/src/cmd/krb5/slave/Makefile
@@ -60,7 +60,7 @@ CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-address
diff --git a/usr/src/cmd/latencytop/Makefile.com b/usr/src/cmd/latencytop/Makefile.com
index 9918e58bee..75f7efef16 100644
--- a/usr/src/cmd/latencytop/Makefile.com
+++ b/usr/src/cmd/latencytop/Makefile.com
@@ -33,7 +33,7 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns
diff --git a/usr/src/cmd/ldap/Makefile.com b/usr/src/cmd/ldap/Makefile.com
index ef207e6ffd..694b71b891 100644
--- a/usr/src/cmd/ldap/Makefile.com
+++ b/usr/src/cmd/ldap/Makefile.com
@@ -88,7 +88,7 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/ldapcachemgr/Makefile b/usr/src/cmd/ldapcachemgr/Makefile
index b396397820..7048a9115c 100644
--- a/usr/src/cmd/ldapcachemgr/Makefile
+++ b/usr/src/cmd/ldapcachemgr/Makefile
@@ -54,7 +54,7 @@ CPPFLAGS += -D_REENTRANT -DSUN_THREADS \
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/ldmad/Makefile b/usr/src/cmd/ldmad/Makefile
index 0e38ddbb00..b966f307e9 100644
--- a/usr/src/cmd/ldmad/Makefile
+++ b/usr/src/cmd/ldmad/Makefile
@@ -65,7 +65,7 @@ INCS += -I$(ROOT)/usr/platform/sun4v/include/sys
INCS += -I$(SRC)/uts/sun4v
CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(INCS)
CSTD = $(CSTD_GNU99)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
diff --git a/usr/src/cmd/listen/Makefile b/usr/src/cmd/listen/Makefile
index d37edf6d6c..a35fb2b372 100644
--- a/usr/src/cmd/listen/Makefile
+++ b/usr/src/cmd/listen/Makefile
@@ -63,7 +63,7 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-empty-body
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/loadkeys/Makefile b/usr/src/cmd/loadkeys/Makefile
index df0c686088..fe942ea4ee 100644
--- a/usr/src/cmd/loadkeys/Makefile
+++ b/usr/src/cmd/loadkeys/Makefile
@@ -41,7 +41,7 @@ include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/lockstat/Makefile.com b/usr/src/cmd/lockstat/Makefile.com
index 7e8ee6cf6d..8ee28e41da 100644
--- a/usr/src/cmd/lockstat/Makefile.com
+++ b/usr/src/cmd/lockstat/Makefile.com
@@ -33,7 +33,7 @@ include ../../Makefile.cmd
LDLIBS += -lelf -lkstat -ldtrace
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += index_overflow
diff --git a/usr/src/cmd/lofiadm/Makefile b/usr/src/cmd/lofiadm/Makefile
index 462488cd35..4c5b2ed59c 100644
--- a/usr/src/cmd/lofiadm/Makefile
+++ b/usr/src/cmd/lofiadm/Makefile
@@ -39,7 +39,7 @@ CPPFLAGS += -I $(SRC)/common/crypto -I $(SRC)/common/lzma
LDLIBS += -ldevinfo -lpkcs11 -lcryptoutil
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/logadm/Makefile b/usr/src/cmd/logadm/Makefile
index 246f7b6ef8..b9ee0560ea 100644
--- a/usr/src/cmd/logadm/Makefile
+++ b/usr/src/cmd/logadm/Makefile
@@ -35,7 +35,7 @@ include ../Makefile.cmd
CPPFLAGS += -D_FILE_OFFSET_BITS=64
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
XGETFLAGS += -a -x logadm.xcl
$(ROOTETC)/$(CONFIGFILE):= FILEMODE= 644
diff --git a/usr/src/cmd/logins/Makefile b/usr/src/cmd/logins/Makefile
index 865f2163bd..4f07886a2b 100644
--- a/usr/src/cmd/logins/Makefile
+++ b/usr/src/cmd/logins/Makefile
@@ -30,7 +30,7 @@ include ../Makefile.cmd
TEXT_DOMAIN= SUNW_OST_ADMIN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
FILEMODE= 0750
diff --git a/usr/src/cmd/lp/Makefile.lp b/usr/src/cmd/lp/Makefile.lp
index c4c4ff2a92..2505a84756 100644
--- a/usr/src/cmd/lp/Makefile.lp
+++ b/usr/src/cmd/lp/Makefile.lp
@@ -88,7 +88,7 @@ LINTUSR = $(LPLIB)/users/llib-llpusr.ln
CERRWARN += -_gcc=-Wno-sequence-point
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/cmd/lp/lib/filters/Makefile b/usr/src/cmd/lp/lib/filters/Makefile
index 09c55243b6..86a533485b 100644
--- a/usr/src/cmd/lp/lib/filters/Makefile
+++ b/usr/src/cmd/lp/lib/filters/Makefile
@@ -50,7 +50,7 @@ LIBS = $(LIBRARY)
CPPFLAGS = -I../../include $(CPPFLAGS.master)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# not linted
diff --git a/usr/src/cmd/luxadm/Makefile b/usr/src/cmd/luxadm/Makefile
index 7b8abc40d3..77781b9202 100644
--- a/usr/src/cmd/luxadm/Makefile
+++ b/usr/src/cmd/luxadm/Makefile
@@ -39,7 +39,7 @@ POFILE = luxadm.po
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-address
diff --git a/usr/src/cmd/mail/Makefile b/usr/src/cmd/mail/Makefile
index 8f24d04f95..45487bfcee 100644
--- a/usr/src/cmd/mail/Makefile
+++ b/usr/src/cmd/mail/Makefile
@@ -73,7 +73,7 @@ EDITPATH= \
CPPFLAGS = -DSVR4 -I. $(CPPFLAGS.master)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-extra
diff --git a/usr/src/cmd/mailx/Makefile b/usr/src/cmd/mailx/Makefile
index 57bc1bcfe5..3b19ad4b4f 100644
--- a/usr/src/cmd/mailx/Makefile
+++ b/usr/src/cmd/mailx/Makefile
@@ -66,7 +66,7 @@ $(ROOTUCBMAILRC) := FILEMODE = 0644
CPPFLAGS= -Ihdr -DUSG -DOPTIM $(CPPFLAGS.master)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-clobbered
# not linted
diff --git a/usr/src/cmd/mandoc/Makefile.common b/usr/src/cmd/mandoc/Makefile.common
index 42d73be9f5..ac9df1c135 100644
--- a/usr/src/cmd/mandoc/Makefile.common
+++ b/usr/src/cmd/mandoc/Makefile.common
@@ -79,7 +79,7 @@ OBJS= arch.o \
OBJS += compat_ohash.o
# XXX gcc 4.4.4 false positive
-roff.o := CERRWARN += -_gcc=-Wno-uninitialized
+roff.o := CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/mdb/Makefile.kmdb b/usr/src/cmd/mdb/Makefile.kmdb
index f295d2463f..be670d3fc6 100644
--- a/usr/src/cmd/mdb/Makefile.kmdb
+++ b/usr/src/cmd/mdb/Makefile.kmdb
@@ -98,7 +98,7 @@ ALLLINTFLAGS = $(LINTFLAGS) \
-xerroff=E_INCONS_VAL_TYPE_DECL2 \
-xerroff=E_INCONS_VAL_TYPE_USED2
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/cmd/mdb/Makefile.libstandctf b/usr/src/cmd/mdb/Makefile.libstandctf
index 176291399c..e24e39d777 100644
--- a/usr/src/cmd/mdb/Makefile.libstandctf
+++ b/usr/src/cmd/mdb/Makefile.libstandctf
@@ -62,7 +62,7 @@ LINTFILES = $(OBJS:%.o=%.ln)
LINTFLAGS += -n -errtags=yes
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.NO_PARALLEL:
.PARALLEL: $(OBJS)
diff --git a/usr/src/cmd/mdb/Makefile.mdb b/usr/src/cmd/mdb/Makefile.mdb
index 5207c740f3..5eb6f4e977 100644
--- a/usr/src/cmd/mdb/Makefile.mdb
+++ b/usr/src/cmd/mdb/Makefile.mdb
@@ -102,7 +102,7 @@ C99LMODE= -Xc99=%all
LDLIBS += -lcurses -lkvm -lproc -lrtld_db -lctf -lumem -ldisasm -lscf
LDLIBS += -ldemangle-sys
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/mdb/i86pc/modules/unix/amd64/Makefile b/usr/src/cmd/mdb/i86pc/modules/unix/amd64/Makefile
index f80ce95abd..23984a8f08 100644
--- a/usr/src/cmd/mdb/i86pc/modules/unix/amd64/Makefile
+++ b/usr/src/cmd/mdb/i86pc/modules/unix/amd64/Makefile
@@ -44,6 +44,6 @@ CPPFLAGS += -I$(SRC)/uts/intel
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/mdb/i86xpv/modules/unix/amd64/Makefile b/usr/src/cmd/mdb/i86xpv/modules/unix/amd64/Makefile
index 48e79ed8dc..190631bbf0 100644
--- a/usr/src/cmd/mdb/i86xpv/modules/unix/amd64/Makefile
+++ b/usr/src/cmd/mdb/i86xpv/modules/unix/amd64/Makefile
@@ -48,6 +48,6 @@ CPPFLAGS += -I$(SRC)/uts/intel
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/mdb/intel/amd64/genunix/Makefile b/usr/src/cmd/mdb/intel/amd64/genunix/Makefile
index 8d73bebcb1..3b14cb5a58 100644
--- a/usr/src/cmd/mdb/intel/amd64/genunix/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/genunix/Makefile
@@ -74,7 +74,7 @@ CPPFLAGS += -I$(SRC)/uts/intel
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/cmd/mdb/intel/amd64/idm/Makefile b/usr/src/cmd/mdb/intel/amd64/idm/Makefile
index c68aa1c1dc..a3d7b2f52f 100644
--- a/usr/src/cmd/mdb/intel/amd64/idm/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/idm/Makefile
@@ -41,4 +41,4 @@ CPPFLAGS += -I$(ISCSITBASE)
CPPFLAGS += -I$(ISCSIBASE)
CPPFLAGS += -I$(ISERBASE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/intel/amd64/ipp/Makefile b/usr/src/cmd/mdb/intel/amd64/ipp/Makefile
index da6e6cfea0..502240f3b3 100644
--- a/usr/src/cmd/mdb/intel/amd64/ipp/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/ipp/Makefile
@@ -34,4 +34,4 @@ include ../../../../Makefile.cmd.64
include ../../Makefile.amd64
include ../../../Makefile.module
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/intel/amd64/libproc/Makefile b/usr/src/cmd/mdb/intel/amd64/libproc/Makefile
index 64e67e2d0d..5b06592bd2 100644
--- a/usr/src/cmd/mdb/intel/amd64/libproc/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libproc/Makefile
@@ -38,7 +38,7 @@ include ../../../Makefile.module
CFLAGS64 += -I../../../../../lib/libproc/common
LINTFLAGS64 += -I../../../../../lib/libproc/common
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
%.o: $(MODSRCS_DIR)/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/mdb/intel/amd64/libumem/Makefile b/usr/src/cmd/mdb/intel/amd64/libumem/Makefile
index 704ff65873..c13578207d 100644
--- a/usr/src/cmd/mdb/intel/amd64/libumem/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libumem/Makefile
@@ -52,7 +52,7 @@ dmod/$(MODULE) := LDLIBS += -lproc -lm
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
%.o: $(MODSRCS_DIR)/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile b/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile
index 02f4962b86..3527c9a764 100644
--- a/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile
@@ -39,4 +39,4 @@ CPPFLAGS += -I$(SRC)/uts/common
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/intel/ia32/libproc/Makefile b/usr/src/cmd/mdb/intel/ia32/libproc/Makefile
index 08d6644a93..369a8ec90f 100644
--- a/usr/src/cmd/mdb/intel/ia32/libproc/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/libproc/Makefile
@@ -37,7 +37,7 @@ include ../../../Makefile.module
CFLAGS += -I../../../../../lib/libproc/common
LINTFLAGS += -I../../../../../lib/libproc/common
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
%.o: $(MODSRCS_DIR)/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/mdb/intel/ia32/libumem/Makefile b/usr/src/cmd/mdb/intel/ia32/libumem/Makefile
index a1ab338f40..51f0985cf2 100644
--- a/usr/src/cmd/mdb/intel/ia32/libumem/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/libumem/Makefile
@@ -51,7 +51,7 @@ dmod/$(MODULE) := LDLIBS += -lproc -lm
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
%.o: $(MODSRCS_DIR)/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/mdb/intel/modules/amd_opteron/amd64/Makefile b/usr/src/cmd/mdb/intel/modules/amd_opteron/amd64/Makefile
index 324ea9da32..10a426a348 100644
--- a/usr/src/cmd/mdb/intel/modules/amd_opteron/amd64/Makefile
+++ b/usr/src/cmd/mdb/intel/modules/amd_opteron/amd64/Makefile
@@ -37,4 +37,4 @@ CPPFLAGS += -I$(SRC)/uts/i86pc/cpu
CPPFLAGS += -I$(SRC)/uts/intel
CPPFLAGS += -I$(SRC)/uts/i86pc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/intel/modules/generic_cpu/amd64/Makefile b/usr/src/cmd/mdb/intel/modules/generic_cpu/amd64/Makefile
index 55b43df8fb..f545fce59d 100644
--- a/usr/src/cmd/mdb/intel/modules/generic_cpu/amd64/Makefile
+++ b/usr/src/cmd/mdb/intel/modules/generic_cpu/amd64/Makefile
@@ -36,4 +36,4 @@ CPPFLAGS += -I$(SRC)/uts/i86pc/cpu
CPPFLAGS += -I$(SRC)/uts/intel
CPPFLAGS += -I$(SRC)/uts/i86pc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/sparc/v7/libproc/Makefile b/usr/src/cmd/mdb/sparc/v7/libproc/Makefile
index 137a96b715..e8782a568a 100644
--- a/usr/src/cmd/mdb/sparc/v7/libproc/Makefile
+++ b/usr/src/cmd/mdb/sparc/v7/libproc/Makefile
@@ -37,7 +37,7 @@ include ../../../Makefile.module
CFLAGS += -I../../../../../lib/libproc/common
LINTFLAGS += -I../../../../../lib/libproc/common
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
%.o: $(MODSRCS_DIR)/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/mdb/sparc/v7/libumem/Makefile b/usr/src/cmd/mdb/sparc/v7/libumem/Makefile
index 906d05d5ea..c9ca51f625 100644
--- a/usr/src/cmd/mdb/sparc/v7/libumem/Makefile
+++ b/usr/src/cmd/mdb/sparc/v7/libumem/Makefile
@@ -51,7 +51,7 @@ dmod/$(MODULE) := LDLIBS += -lproc -lm
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
%.o: $(MODSRCS_DIR)/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/mdb/sparc/v9/genunix/Makefile b/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
index a9a8a60aa2..00dadda34b 100644
--- a/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
@@ -67,7 +67,7 @@ CPPFLAGS += -I$(SRC)/uts/sparc/v9
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/cmd/mdb/sparc/v9/idm/Makefile b/usr/src/cmd/mdb/sparc/v9/idm/Makefile
index c0d77bb8bb..cf5e9e82ff 100644
--- a/usr/src/cmd/mdb/sparc/v9/idm/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/idm/Makefile
@@ -40,4 +40,4 @@ CPPFLAGS += -I$(ISCSITBASE)
CPPFLAGS += -I$(ISCSIBASE)
CPPFLAGS += -I$(ISERBASE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/sparc/v9/ipp/Makefile b/usr/src/cmd/mdb/sparc/v9/ipp/Makefile
index d546ca1f4a..daf786871f 100644
--- a/usr/src/cmd/mdb/sparc/v9/ipp/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/ipp/Makefile
@@ -34,4 +34,4 @@ include ../../../../Makefile.cmd.64
include ../../Makefile.sparcv9
include ../../../Makefile.module
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/sparc/v9/libproc/Makefile b/usr/src/cmd/mdb/sparc/v9/libproc/Makefile
index 8dbdc151d4..bc50e68808 100644
--- a/usr/src/cmd/mdb/sparc/v9/libproc/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libproc/Makefile
@@ -38,7 +38,7 @@ include ../../../Makefile.module
CFLAGS64 += -I../../../../../lib/libproc/common
LINTFLAGS64 += -I../../../../../lib/libproc/common
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
%.o: $(MODSRCS_DIR)/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/mdb/sparc/v9/libumem/Makefile b/usr/src/cmd/mdb/sparc/v9/libumem/Makefile
index 09ea0473c6..dbb51cd96f 100644
--- a/usr/src/cmd/mdb/sparc/v9/libumem/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libumem/Makefile
@@ -65,7 +65,7 @@ dmod/$(MODULE) := LDLIBS += -lproc -lm
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
%.o: $(MODSRCS_DIR)/%.c
$(COMPILE.c) $<
diff --git a/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile b/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile
index 2d28be38f9..5ca8d43850 100644
--- a/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile
@@ -39,4 +39,4 @@ CPPFLAGS += -I$(SRC)/uts/common
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/sun4u/modules/unix/v9/Makefile b/usr/src/cmd/mdb/sun4u/modules/unix/v9/Makefile
index 529847d000..9c23823491 100644
--- a/usr/src/cmd/mdb/sun4u/modules/unix/v9/Makefile
+++ b/usr/src/cmd/mdb/sun4u/modules/unix/v9/Makefile
@@ -41,4 +41,4 @@ CPPFLAGS += -I$(SRC)/uts/sun4
CPPFLAGS += -I$(SRC)/uts/sun4u
CPPFLAGS += -I$(SRC)/uts/sfmmu
CPPFLAGS += -I$(SRC)/uts/sparc/v9
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/sun4v/modules/unix/v9/Makefile b/usr/src/cmd/mdb/sun4v/modules/unix/v9/Makefile
index 6dda857ccb..30ea58449a 100644
--- a/usr/src/cmd/mdb/sun4v/modules/unix/v9/Makefile
+++ b/usr/src/cmd/mdb/sun4v/modules/unix/v9/Makefile
@@ -45,4 +45,4 @@ CPPFLAGS += -I$(SRC)/uts/sun4v
CPPFLAGS += -I$(SRC)/uts/sun4u
CPPFLAGS += -I$(SRC)/uts/sfmmu
CPPFLAGS += -I$(SRC)/uts/sparc/v9
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/cmd/mdb/tools/findfp/Makefile.com b/usr/src/cmd/mdb/tools/findfp/Makefile.com
index 1da6562ccb..6ac7877527 100644
--- a/usr/src/cmd/mdb/tools/findfp/Makefile.com
+++ b/usr/src/cmd/mdb/tools/findfp/Makefile.com
@@ -44,7 +44,7 @@ include ../../common/Makefile.util
#
CPPFLAGS = -I../../common -I../common
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS =
LDLIBS = -lelf
diff --git a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
index 9db6e62e8a..02807d7089 100644
--- a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
+++ b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
@@ -43,7 +43,7 @@ include ../../common/Makefile.util
#
CPPFLAGS = -I../../common
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS =
LDLIBS = -lelf
diff --git a/usr/src/cmd/mkdir/Makefile b/usr/src/cmd/mkdir/Makefile
index e01d79efc2..fac3bc4fbc 100644
--- a/usr/src/cmd/mkdir/Makefile
+++ b/usr/src/cmd/mkdir/Makefile
@@ -31,7 +31,7 @@ SRCS= mkdir.c ../chmod/common.c
include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
LDLIBS += -lgen
diff --git a/usr/src/cmd/mkmsgs/Makefile b/usr/src/cmd/mkmsgs/Makefile
index 3bf86c9da2..55e4b66d91 100644
--- a/usr/src/cmd/mkmsgs/Makefile
+++ b/usr/src/cmd/mkmsgs/Makefile
@@ -29,7 +29,7 @@ include ../Makefile.cmd
LDLIBS += -lgen
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/mknod/Makefile b/usr/src/cmd/mknod/Makefile
index cdffd352bd..c28ca59dc0 100644
--- a/usr/src/cmd/mknod/Makefile
+++ b/usr/src/cmd/mknod/Makefile
@@ -29,7 +29,7 @@ PROG= mknod
include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/mktemp/Makefile b/usr/src/cmd/mktemp/Makefile
index 6113762e0f..18e6feb96c 100644
--- a/usr/src/cmd/mktemp/Makefile
+++ b/usr/src/cmd/mktemp/Makefile
@@ -28,7 +28,7 @@ PROG= mktemp
include ../Makefile.cmd
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/more/Makefile b/usr/src/cmd/more/Makefile
index cfa30880a2..3aa829a0a9 100644
--- a/usr/src/cmd/more/Makefile
+++ b/usr/src/cmd/more/Makefile
@@ -39,7 +39,7 @@ $(ROOTLIBDATA) := FILEMODE = 0644
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
# not linted
diff --git a/usr/src/cmd/msgfmt/Makefile b/usr/src/cmd/msgfmt/Makefile
index 4e4a626413..13d8e3f141 100644
--- a/usr/src/cmd/msgfmt/Makefile
+++ b/usr/src/cmd/msgfmt/Makefile
@@ -66,7 +66,7 @@ ROOTLIBPROG= $(LIBPROG:%=$(ROOTLIB)/%)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
.KEEP_STATE:
diff --git a/usr/src/cmd/mv/Makefile b/usr/src/cmd/mv/Makefile
index 5e866b5bbf..fd9c1661ee 100644
--- a/usr/src/cmd/mv/Makefile
+++ b/usr/src/cmd/mv/Makefile
@@ -42,7 +42,7 @@ CLOBBERFILES += $(CPFILE) $(LNFILE)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(XPG4) := CFLAGS += -DXPG4
LINTFLAGS += -DXPG4 -u
XGETFLAGS += -a -x mv.xcl
diff --git a/usr/src/cmd/ndmpadm/Makefile b/usr/src/cmd/ndmpadm/Makefile
index 94f51fce89..ff7bd926a9 100644
--- a/usr/src/cmd/ndmpadm/Makefile
+++ b/usr/src/cmd/ndmpadm/Makefile
@@ -46,7 +46,7 @@ POFILE= ndmpadm.po
LDLIBS += -lndmp
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/ndmpd/Makefile b/usr/src/cmd/ndmpd/Makefile
index d1dd86cf8d..33b145b72c 100644
--- a/usr/src/cmd/ndmpd/Makefile
+++ b/usr/src/cmd/ndmpd/Makefile
@@ -71,7 +71,7 @@ LINTFLAGS += -xerroff=E_INCONS_ARG_USED2
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
LDLIBS += -lsocket -lnsl -lzfs -lsec -lndmp -lmd5 -lnvpair -lumem -lbsm -lgen -lcmdutils -linetutil
diff --git a/usr/src/cmd/newform/Makefile b/usr/src/cmd/newform/Makefile
index 56a6c40af3..f9a02ab204 100644
--- a/usr/src/cmd/newform/Makefile
+++ b/usr/src/cmd/newform/Makefile
@@ -27,7 +27,7 @@ PROG= newform
include ../Makefile.cmd
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/newtask/Makefile.com b/usr/src/cmd/newtask/Makefile.com
index 7f2dbf60ee..aa262f7ff7 100644
--- a/usr/src/cmd/newtask/Makefile.com
+++ b/usr/src/cmd/newtask/Makefile.com
@@ -35,7 +35,7 @@ CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I..
diff --git a/usr/src/cmd/nl/Makefile b/usr/src/cmd/nl/Makefile
index 20caaeb35f..74877dc7d0 100644
--- a/usr/src/cmd/nl/Makefile
+++ b/usr/src/cmd/nl/Makefile
@@ -40,7 +40,7 @@ include ../Makefile.cmd
LDLIBS += -lgen
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
# not linted
diff --git a/usr/src/cmd/nlsadmin/Makefile b/usr/src/cmd/nlsadmin/Makefile
index 9f88bb3986..7eeddca585 100644
--- a/usr/src/cmd/nlsadmin/Makefile
+++ b/usr/src/cmd/nlsadmin/Makefile
@@ -30,7 +30,7 @@ include ../Makefile.cmd
FILEMODE= 0755
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/nscd/Makefile b/usr/src/cmd/nscd/Makefile
index 12454b8db3..9103db70ae 100644
--- a/usr/src/cmd/nscd/Makefile
+++ b/usr/src/cmd/nscd/Makefile
@@ -60,7 +60,7 @@ LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/cmd/pack/Makefile b/usr/src/cmd/pack/Makefile
index b50710d831..e86e527e95 100644
--- a/usr/src/cmd/pack/Makefile
+++ b/usr/src/cmd/pack/Makefile
@@ -29,7 +29,7 @@ include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
XGETFLAGS += -a -x $(PROG).xcl
CPPFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/usr/src/cmd/passmgmt/Makefile b/usr/src/cmd/passmgmt/Makefile
index 2ce3ab254f..21fd15a65f 100644
--- a/usr/src/cmd/passmgmt/Makefile
+++ b/usr/src/cmd/passmgmt/Makefile
@@ -41,7 +41,7 @@ $(ROOTFILE):= FILEMODE= $(LIBFILEMODE)
LDLIBS += -lsecdb -lnsl
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/pbind/Makefile.com b/usr/src/cmd/pbind/Makefile.com
index 13f6fab98a..187d55b8ee 100644
--- a/usr/src/cmd/pbind/Makefile.com
+++ b/usr/src/cmd/pbind/Makefile.com
@@ -33,7 +33,7 @@ include ../../Makefile.cmd
LDLIBS += -lproc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/pcitool/Makefile.com b/usr/src/cmd/pcitool/Makefile.com
index de7dd7c05b..ef5ec51668 100644
--- a/usr/src/cmd/pcitool/Makefile.com
+++ b/usr/src/cmd/pcitool/Makefile.com
@@ -31,7 +31,7 @@ UTSBASE = ../../../../src/uts
LDLIBS += -ldevinfo
CFLAGS += -D$(MACH) -I$(UTSBASE)/common
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/cmd/pg/Makefile b/usr/src/cmd/pg/Makefile
index c5ba757837..0b6b8d2dd9 100644
--- a/usr/src/cmd/pg/Makefile
+++ b/usr/src/cmd/pg/Makefile
@@ -34,7 +34,7 @@ XGETFLAGS += -a -x $(PROG).xcl
CPPFLAGS += -D_FILE_OFFSET_BITS=64
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
.KEEP_STATE:
diff --git a/usr/src/cmd/picl/plugins/Makefile.com b/usr/src/cmd/picl/plugins/Makefile.com
index d56f0ec184..308c3782fe 100644
--- a/usr/src/cmd/picl/plugins/Makefile.com
+++ b/usr/src/cmd/picl/plugins/Makefile.com
@@ -31,7 +31,7 @@ CPPFLAGS += -I$(SRC)/cmd/picl/plugins/inc
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
index b590aa9806..e803da9e56 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
+++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
@@ -53,7 +53,7 @@ POFILE= picld_pluginutil.po
CPPFLAGS += -I.. -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns
diff --git a/usr/src/cmd/plimit/amd64/Makefile b/usr/src/cmd/plimit/amd64/Makefile
index 190969b38f..6835158eae 100644
--- a/usr/src/cmd/plimit/amd64/Makefile
+++ b/usr/src/cmd/plimit/amd64/Makefile
@@ -34,7 +34,7 @@ include ../../Makefile.cmd
include ../../Makefile.cmd.64
CFLAGS64 += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lproc
diff --git a/usr/src/cmd/plimit/i386/Makefile b/usr/src/cmd/plimit/i386/Makefile
index 7bfabc3b75..8e8b3343fa 100644
--- a/usr/src/cmd/plimit/i386/Makefile
+++ b/usr/src/cmd/plimit/i386/Makefile
@@ -33,7 +33,7 @@ SRCS= $(OBJS:%.o=../%.c)
include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lproc
diff --git a/usr/src/cmd/plimit/sparcv9/Makefile b/usr/src/cmd/plimit/sparcv9/Makefile
index e4f39a0931..a7132565b2 100644
--- a/usr/src/cmd/plimit/sparcv9/Makefile
+++ b/usr/src/cmd/plimit/sparcv9/Makefile
@@ -35,7 +35,7 @@ include ../../Makefile.cmd
include ../../Makefile.cmd.64
CFLAGS64 += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lproc
diff --git a/usr/src/cmd/pools/Makefile.pools b/usr/src/cmd/pools/Makefile.pools
index 14c23e64a4..d9fb87ae3f 100644
--- a/usr/src/cmd/pools/Makefile.pools
+++ b/usr/src/cmd/pools/Makefile.pools
@@ -30,7 +30,7 @@ POOLSCOMMONDIR = $(POOLSSRC)/common
COMMON_OBJS = utils.o
COMMON_SRCS = $(COMMON_OBJS:%.o=$(POOLSCOMMONDIR)/%.c)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-implicit-function-declaration
diff --git a/usr/src/cmd/powertop/Makefile.com b/usr/src/cmd/powertop/Makefile.com
index 37a1434c04..960f7d3106 100644
--- a/usr/src/cmd/powertop/Makefile.com
+++ b/usr/src/cmd/powertop/Makefile.com
@@ -43,7 +43,7 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += free
diff --git a/usr/src/cmd/praudit/Makefile b/usr/src/cmd/praudit/Makefile
index b364320c8e..9ae3e01a8b 100644
--- a/usr/src/cmd/praudit/Makefile
+++ b/usr/src/cmd/praudit/Makefile
@@ -43,7 +43,7 @@ CPPFLAGS += -D_PRAUDIT -I$(XLATEDIR)
CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += signed
diff --git a/usr/src/cmd/prctl/Makefile.com b/usr/src/cmd/prctl/Makefile.com
index 6327f99b25..049b53a2db 100644
--- a/usr/src/cmd/prctl/Makefile.com
+++ b/usr/src/cmd/prctl/Makefile.com
@@ -35,7 +35,7 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/print/bsd-sysv-commands/Makefile b/usr/src/cmd/print/bsd-sysv-commands/Makefile
index cb71a89a43..f2b8c41230 100644
--- a/usr/src/cmd/print/bsd-sysv-commands/Makefile
+++ b/usr/src/cmd/print/bsd-sysv-commands/Makefile
@@ -65,7 +65,7 @@ in.lpd:= CFLAGS += -DSOLARIS_PRIVATE_POST_0_9
in.lpd:= LDLIBS += -lnsl -lsocket
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
index 66e2527c01..6fb2c832a5 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
@@ -85,7 +85,7 @@ ROOTLIBS= $(LIBS:%=$(ROOTLIBDIR)/%)
CPPFLAGS += -I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris -I.
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/priocntl/Makefile b/usr/src/cmd/priocntl/Makefile
index 526d67098e..eb77eeb33c 100644
--- a/usr/src/cmd/priocntl/Makefile
+++ b/usr/src/cmd/priocntl/Makefile
@@ -36,7 +36,7 @@ include ../Makefile.cmd
LDLIBS += -lcontract
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CLASSD = $(ROOTLIB)/class
RTD = $(CLASSD)/RT
diff --git a/usr/src/cmd/projects/Makefile b/usr/src/cmd/projects/Makefile
index f61bc033b6..570793d0f2 100644
--- a/usr/src/cmd/projects/Makefile
+++ b/usr/src/cmd/projects/Makefile
@@ -35,7 +35,7 @@ LDLIBS += -lproject
.KEEP_STATE:
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
all: $(PROG)
diff --git a/usr/src/cmd/prtconf/Makefile.com b/usr/src/cmd/prtconf/Makefile.com
index cb54f66d15..0c21866317 100644
--- a/usr/src/cmd/prtconf/Makefile.com
+++ b/usr/src/cmd/prtconf/Makefile.com
@@ -32,7 +32,7 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -ldevinfo -lnvpair -lpcidb
FILEMODE= 02555
diff --git a/usr/src/cmd/prtvtoc/Makefile b/usr/src/cmd/prtvtoc/Makefile
index c4ae5fe936..1a64695fa6 100644
--- a/usr/src/cmd/prtvtoc/Makefile
+++ b/usr/src/cmd/prtvtoc/Makefile
@@ -32,7 +32,7 @@ ROOTSYMLINK= $(ROOTETC)/$(PROG)
LDLIBS += -ladm -lefi
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/psrset/Makefile.com b/usr/src/cmd/psrset/Makefile.com
index b162a57982..1dc5aa08bf 100644
--- a/usr/src/cmd/psrset/Makefile.com
+++ b/usr/src/cmd/psrset/Makefile.com
@@ -33,7 +33,7 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lproc
.KEEP_STATE:
diff --git a/usr/src/cmd/ptools/Makefile.bld b/usr/src/cmd/ptools/Makefile.bld
index 6f0b95ae92..088cdb92cb 100644
--- a/usr/src/cmd/ptools/Makefile.bld
+++ b/usr/src/cmd/ptools/Makefile.bld
@@ -62,12 +62,12 @@ CERRWARN_plgrp += -_smatch=off
CERRWARN_pmadvise += -_smatch=off
CERRWARN_ppriv += -_gcc=-Wno-parentheses
-CERRWARN_ppriv += -_gcc=-Wno-uninitialized
+CERRWARN_ppriv += $(CNOWARN_UNINIT)
CERRWARN_ptree += -_gcc=-Wno-parentheses
CERRWARN_ptree += -_smatch=off
-CERRWARN_pstack += -_gcc=-Wno-uninitialized
+CERRWARN_pstack += $(CNOWARN_UNINIT)
CERRWARN_pstack += -_gcc=-Wno-clobbered
CERRWARN_pargs += -_gcc=-Wno-clobbered
diff --git a/usr/src/cmd/raidctl/Makefile b/usr/src/cmd/raidctl/Makefile
index 4f7f648912..51cfb0915a 100644
--- a/usr/src/cmd/raidctl/Makefile
+++ b/usr/src/cmd/raidctl/Makefile
@@ -30,7 +30,7 @@ include $(SRC)/cmd/Makefile.cmd
LDLIBS += -lraidcfg
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/ramdiskadm/Makefile b/usr/src/cmd/ramdiskadm/Makefile
index 7dae74826e..7650809cfb 100644
--- a/usr/src/cmd/ramdiskadm/Makefile
+++ b/usr/src/cmd/ramdiskadm/Makefile
@@ -32,7 +32,7 @@ POFILES= $(OBJS:%.o=%.po)
include ../Makefile.cmd
LDLIBS += -ldevinfo
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/rcap/Makefile.com b/usr/src/cmd/rcap/Makefile.com
index 1289c6d4d8..babe6cdf81 100644
--- a/usr/src/cmd/rcap/Makefile.com
+++ b/usr/src/cmd/rcap/Makefile.com
@@ -33,7 +33,7 @@
LDFLAGS += $(MAPFILE.NGB:%=-M%)
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
SMOFF += strcpy_overflow
diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com
index 017606f830..cf9f5b0143 100644
--- a/usr/src/cmd/rcm_daemon/Makefile.com
+++ b/usr/src/cmd/rcm_daemon/Makefile.com
@@ -117,7 +117,7 @@ CFLAGS += $(CCVERBOSE) $(C_PICFLAGS)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
# not linted
diff --git a/usr/src/cmd/rctladm/Makefile b/usr/src/cmd/rctladm/Makefile
index 79348db834..2a3a3a39c5 100644
--- a/usr/src/cmd/rctladm/Makefile
+++ b/usr/src/cmd/rctladm/Makefile
@@ -35,7 +35,7 @@ include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
POFILE = rctladm_msg.po
XGETFLAGS = -a
FILEMODE = 0555
diff --git a/usr/src/cmd/refer/Makefile b/usr/src/cmd/refer/Makefile
index a07a51f0ac..c9dd6bd267 100644
--- a/usr/src/cmd/refer/Makefile
+++ b/usr/src/cmd/refer/Makefile
@@ -49,7 +49,7 @@ POFILE= refer.po
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/rmdir/Makefile b/usr/src/cmd/rmdir/Makefile
index 4c935458bd..a9b962f2b7 100644
--- a/usr/src/cmd/rmdir/Makefile
+++ b/usr/src/cmd/rmdir/Makefile
@@ -30,7 +30,7 @@ include ../Makefile.cmd
LDLIBS += -lgen
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
XGETFLAGS += -a -x rmdir.xcl
diff --git a/usr/src/cmd/rmformat/Makefile b/usr/src/cmd/rmformat/Makefile
index 6761060197..87e1e2f323 100644
--- a/usr/src/cmd/rmformat/Makefile
+++ b/usr/src/cmd/rmformat/Makefile
@@ -35,7 +35,7 @@ SRCS= $(OBJS:.o=.c)
LDLIBS += -lsmedia -lvolmgt -ladm -lefi
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/rmmount/Makefile b/usr/src/cmd/rmmount/Makefile
index 2c6d2646af..2723b40ba5 100644
--- a/usr/src/cmd/rmmount/Makefile
+++ b/usr/src/cmd/rmmount/Makefile
@@ -46,7 +46,7 @@ CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/rmvolmgr/Makefile b/usr/src/cmd/rmvolmgr/Makefile
index 589acaab2d..75481251ec 100644
--- a/usr/src/cmd/rmvolmgr/Makefile
+++ b/usr/src/cmd/rmvolmgr/Makefile
@@ -44,7 +44,7 @@ CPPFLAGS += -I$(ROOT)/usr/include/hal
CSTD = $(CSTD_GNU99)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/cmd/rpcinfo/Makefile b/usr/src/cmd/rpcinfo/Makefile
index 57483c153a..bf58aba9bb 100644
--- a/usr/src/cmd/rpcinfo/Makefile
+++ b/usr/src/cmd/rpcinfo/Makefile
@@ -31,7 +31,7 @@ include ../Makefile.cmd
CPPFLAGS= -DPORTMAP $(CPPFLAGS.master)
LDLIBS += -lnsl
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/sa/Makefile b/usr/src/cmd/sa/Makefile
index 8456d9fead..1b5e2b9fd6 100644
--- a/usr/src/cmd/sa/Makefile
+++ b/usr/src/cmd/sa/Makefile
@@ -33,7 +33,7 @@ include ../Makefile.cmd
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns
diff --git a/usr/src/cmd/sendmail/Makefile.cmd b/usr/src/cmd/sendmail/Makefile.cmd
index d3378329bd..7434d2b261 100644
--- a/usr/src/cmd/sendmail/Makefile.cmd
+++ b/usr/src/cmd/sendmail/Makefile.cmd
@@ -30,7 +30,7 @@ CPPFLAGS.sm= $(CPPFLAGS.master) -DSOLARIS=2$(RELEASE_MINOR)00 \
-D_FILE_OFFSET_BITS=64
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-empty-body
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/cmd/setfacl/Makefile b/usr/src/cmd/setfacl/Makefile
index 5d03563af4..5f70a8f4de 100644
--- a/usr/src/cmd/setfacl/Makefile
+++ b/usr/src/cmd/setfacl/Makefile
@@ -30,7 +30,7 @@ include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/sf880drd/Makefile b/usr/src/cmd/sf880drd/Makefile
index a37fdd6da5..da325e400a 100644
--- a/usr/src/cmd/sf880drd/Makefile
+++ b/usr/src/cmd/sf880drd/Makefile
@@ -42,7 +42,7 @@ LDLIBS += -lcfgadm
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
PSMPROG = $(USR_PSM_LIB_DIR)/$(PROG)
diff --git a/usr/src/cmd/sgs/ar/Makefile.com b/usr/src/cmd/sgs/ar/Makefile.com
index 99e73f70ce..0ea19dc3a8 100644
--- a/usr/src/cmd/sgs/ar/Makefile.com
+++ b/usr/src/cmd/sgs/ar/Makefile.com
@@ -43,7 +43,7 @@ CPPFLAGS= -I. -I../../include $(CPPFLAGS.master) -I$(ELFCAP)
CFLAGS += $(CCVERBOSE)
CSTD= $(CSTD_GNU99)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += signed
diff --git a/usr/src/cmd/sgs/dump/Makefile.com b/usr/src/cmd/sgs/dump/Makefile.com
index 2224b6ffe1..e857d76a95 100644
--- a/usr/src/cmd/sgs/dump/Makefile.com
+++ b/usr/src/cmd/sgs/dump/Makefile.com
@@ -44,7 +44,7 @@ LLDFLAGS = '$(LDPASS)-R$$ORIGIN/../../lib'
LLDFLAGS64 = '$(LDPASS)-R$$ORIGIN/../../../lib/$(MACH64)'
LDFLAGS += $(LLDFLAGS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += indenting
diff --git a/usr/src/cmd/sgs/elfdump/Makefile.com b/usr/src/cmd/sgs/elfdump/Makefile.com
index 5d5c1f4345..a82d85307e 100644
--- a/usr/src/cmd/sgs/elfdump/Makefile.com
+++ b/usr/src/cmd/sgs/elfdump/Makefile.com
@@ -57,7 +57,7 @@ LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPT) $(LLDFLAGS)
LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \
$(CONVLIBDIR) $(CONV_LIB)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/sgs/elfedit/Makefile.com b/usr/src/cmd/sgs/elfedit/Makefile.com
index 276d11972e..99b630ff47 100644
--- a/usr/src/cmd/sgs/elfedit/Makefile.com
+++ b/usr/src/cmd/sgs/elfedit/Makefile.com
@@ -53,7 +53,7 @@ LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \
$(CONVLIBDIR) $(CONV_LIB) -ltecla
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
BLTDEFS = msg.h
BLTDATA = msg.c
diff --git a/usr/src/cmd/sgs/elfedit/modules/Makefile.com b/usr/src/cmd/sgs/elfedit/modules/Makefile.com
index e49e89a81f..e9de1523b9 100644
--- a/usr/src/cmd/sgs/elfedit/modules/Makefile.com
+++ b/usr/src/cmd/sgs/elfedit/modules/Makefile.com
@@ -99,7 +99,7 @@ LDFLAGS += $(CC_USE_PROTO) $(LLDFLAGS)
DYNFLAGS += $(VERSREF)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
BLTDEFS = $(ELFEDITLIBS:%.so=%_msg.h)
BLTDATA = $(ELFEDITLIBS:%.so=%_msg.c)
diff --git a/usr/src/cmd/sgs/elfwrap/Makefile.com b/usr/src/cmd/sgs/elfwrap/Makefile.com
index a167760c6b..fa84c86328 100644
--- a/usr/src/cmd/sgs/elfwrap/Makefile.com
+++ b/usr/src/cmd/sgs/elfwrap/Makefile.com
@@ -56,7 +56,7 @@ LLDFLAGS64 =
LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS)
LDLIBS += $(ELFLIBDIR) -lelf $(CONVLIBDIR) $(CONV_LIB)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
BLTDEFS = msg.h
BLTDATA = msg.c
diff --git a/usr/src/cmd/sgs/error/i386/Makefile b/usr/src/cmd/sgs/error/i386/Makefile
index 9d08117798..3c9053e83e 100644
--- a/usr/src/cmd/sgs/error/i386/Makefile
+++ b/usr/src/cmd/sgs/error/i386/Makefile
@@ -43,7 +43,7 @@ CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master)
CFLAGS += $(CCVERBOSE)
CSTD= $(CSTD_GNU99)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
SMOFF += no_if_block,indenting
diff --git a/usr/src/cmd/sgs/error/sparc/Makefile b/usr/src/cmd/sgs/error/sparc/Makefile
index 029bcd6f7d..d5520de183 100644
--- a/usr/src/cmd/sgs/error/sparc/Makefile
+++ b/usr/src/cmd/sgs/error/sparc/Makefile
@@ -40,7 +40,7 @@ INCLIST= -I../common
DEFLIST= -DELF
CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master)
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CSTD= $(CSTD_GNU99)
diff --git a/usr/src/cmd/sgs/gprof/Makefile.com b/usr/src/cmd/sgs/gprof/Makefile.com
index 4dd3a736aa..1a46e900cb 100644
--- a/usr/src/cmd/sgs/gprof/Makefile.com
+++ b/usr/src/cmd/sgs/gprof/Makefile.com
@@ -44,7 +44,7 @@ CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
CFLAGS += $(CCVERBOSE)
CSTD= $(CSTD_GNU99)
LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com
index f2d2c37388..ea2224b2d0 100644
--- a/usr/src/cmd/sgs/lex/Makefile.com
+++ b/usr/src/cmd/sgs/lex/Makefile.com
@@ -49,7 +49,7 @@ SRCDIR = ../common
CSTD= $(CSTD_GNU99)
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# Override default source file derivation rule (in Makefile.lib)
diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com
index c715eba55e..35df043a20 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.com
+++ b/usr/src/cmd/sgs/libelf/Makefile.com
@@ -68,7 +68,7 @@ DYNFLAGS += $(VERSREF)
LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += indenting
diff --git a/usr/src/cmd/sgs/libld/Makefile.com b/usr/src/cmd/sgs/libld/Makefile.com
index b007c46bad..c85abded8f 100644
--- a/usr/src/cmd/sgs/libld/Makefile.com
+++ b/usr/src/cmd/sgs/libld/Makefile.com
@@ -88,7 +88,7 @@ SRCDIR = ../common
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com
index 3cf7318715..76e161501f 100644
--- a/usr/src/cmd/sgs/liblddbg/Makefile.com
+++ b/usr/src/cmd/sgs/liblddbg/Makefile.com
@@ -58,7 +58,7 @@ include $(SRC)/cmd/sgs/Makefile.com
SRCDIR = ../common
CERRWARN += -_gcc=-Wno-unused-value
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CPPFLAGS += -I$(SRCBASE)/lib/libc/inc
diff --git a/usr/src/cmd/sgs/librtld/Makefile.com b/usr/src/cmd/sgs/librtld/Makefile.com
index 3c397c933c..bc6772751e 100644
--- a/usr/src/cmd/sgs/librtld/Makefile.com
+++ b/usr/src/cmd/sgs/librtld/Makefile.com
@@ -50,7 +50,7 @@ LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -lc
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
BLTDEFS= msg.h
BLTDATA= msg.c
diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.com b/usr/src/cmd/sgs/librtld_db/Makefile.com
index 46f35529b2..13ce445558 100644
--- a/usr/src/cmd/sgs/librtld_db/Makefile.com
+++ b/usr/src/cmd/sgs/librtld_db/Makefile.com
@@ -40,7 +40,7 @@ CPPFLAGS += -I$(SRCBASE)/lib/libc/inc
DYNFLAGS += $(VERSREF)
LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
BLTDEFS= msg.h
BLTDATA= msg.c
diff --git a/usr/src/cmd/sgs/m4/i386/Makefile b/usr/src/cmd/sgs/m4/i386/Makefile
index 1fe2b9b882..6d12f01c06 100644
--- a/usr/src/cmd/sgs/m4/i386/Makefile
+++ b/usr/src/cmd/sgs/m4/i386/Makefile
@@ -56,7 +56,7 @@ CSTD= $(CSTD_GNU99)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CLEANFILES += $(BLTSRCS)
diff --git a/usr/src/cmd/sgs/m4/sparc/Makefile b/usr/src/cmd/sgs/m4/sparc/Makefile
index 4581269a08..3847891929 100644
--- a/usr/src/cmd/sgs/m4/sparc/Makefile
+++ b/usr/src/cmd/sgs/m4/sparc/Makefile
@@ -54,7 +54,7 @@ CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CSTD= $(CSTD_GNU99)
CLEANFILES += $(BLTSRCS)
diff --git a/usr/src/cmd/sgs/mcs/Makefile.com b/usr/src/cmd/sgs/mcs/Makefile.com
index 6970c04bd0..b732c5c143 100644
--- a/usr/src/cmd/sgs/mcs/Makefile.com
+++ b/usr/src/cmd/sgs/mcs/Makefile.com
@@ -48,7 +48,7 @@ LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)'
LDFLAGS += $(VERSREF) $(LLDFLAGS)
LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SRCS = $(COMOBJS:%.o=../common/%.c) \
$(TOOLSOBJS:%.o=$(SGSTOOLS)/common/%.c)
diff --git a/usr/src/cmd/sgs/prof/Makefile.com b/usr/src/cmd/sgs/prof/Makefile.com
index 8b5a907718..d713f56acc 100644
--- a/usr/src/cmd/sgs/prof/Makefile.com
+++ b/usr/src/cmd/sgs/prof/Makefile.com
@@ -43,7 +43,7 @@ INCLIST= -I../common -I../../include -I../../include/$(MACH)
CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
CFLAGS += $(CCVERBOSE)
CSTD= $(CSTD_GNU99)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com
index 1bfd593cee..fbdede2a9e 100644
--- a/usr/src/cmd/sgs/rtld/Makefile.com
+++ b/usr/src/cmd/sgs/rtld/Makefile.com
@@ -87,7 +87,7 @@ ASFLAGS= -P -D_ASM $(CPPFLAGS)
LDLIB = -L ../../libld/$(MACH)
RTLDLIB = -L ../../librtld/$(MACH)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-switch
diff --git a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
index 795b627bd7..e7cfe1137f 100644
--- a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
+++ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
@@ -48,7 +48,7 @@ SGSMSGTARG= ../common/rtld.msg
SGSMSGALL= ../common/rtld.msg
SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
MSGSRCS= $(COMOBJS:%.o=../common/%.c) $(BLTDATA)
diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com
index a68a388a87..17a509ca87 100644
--- a/usr/src/cmd/sgs/yacc/Makefile.com
+++ b/usr/src/cmd/sgs/yacc/Makefile.com
@@ -67,7 +67,7 @@ CSTD= $(CSTD_GNU99)
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/smbsrv/smbadm/Makefile b/usr/src/cmd/smbsrv/smbadm/Makefile
index bfcac47d98..8f7b43a3e3 100644
--- a/usr/src/cmd/smbsrv/smbadm/Makefile
+++ b/usr/src/cmd/smbsrv/smbadm/Makefile
@@ -37,7 +37,7 @@ LDFLAGS += -R/usr/lib/smbsrv
.KEEP_STATE:
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += free
diff --git a/usr/src/cmd/smserverd/Makefile b/usr/src/cmd/smserverd/Makefile
index ac01543191..878f50a73c 100644
--- a/usr/src/cmd/smserverd/Makefile
+++ b/usr/src/cmd/smserverd/Makefile
@@ -46,7 +46,7 @@ LDLIBS += -lnsl -lbsm
CPPFLAGS += -D_REENTRANT
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
# not linted
diff --git a/usr/src/cmd/sort/Makefile.com b/usr/src/cmd/sort/Makefile.com
index 75affc95a3..47bec7879a 100644
--- a/usr/src/cmd/sort/Makefile.com
+++ b/usr/src/cmd/sort/Makefile.com
@@ -86,7 +86,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64
LINTFLAGS += -U_FILE_OFFSET_BITS
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
# not linted
diff --git a/usr/src/cmd/stat/iostat/Makefile b/usr/src/cmd/stat/iostat/Makefile
index 36142d5a8a..0fb3c81080 100644
--- a/usr/src/cmd/stat/iostat/Makefile
+++ b/usr/src/cmd/stat/iostat/Makefile
@@ -32,7 +32,7 @@ include $(SRC)/cmd/stat/Makefile.stat
LDLIBS += -lkstat -ldevinfo -lavl
CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
FILEMODE= 0555
diff --git a/usr/src/cmd/stat/kstat/Makefile b/usr/src/cmd/stat/kstat/Makefile
index 97b1863e08..668c8ffec8 100644
--- a/usr/src/cmd/stat/kstat/Makefile
+++ b/usr/src/cmd/stat/kstat/Makefile
@@ -32,7 +32,7 @@ include $(SRC)/cmd/stat/Makefile.stat
LDLIBS += -lavl -lcmdutils -ldevinfo -lgen -lkstat
CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/stat/mpstat/Makefile b/usr/src/cmd/stat/mpstat/Makefile
index fd3d57dafb..8e34815c32 100644
--- a/usr/src/cmd/stat/mpstat/Makefile
+++ b/usr/src/cmd/stat/mpstat/Makefile
@@ -32,7 +32,7 @@ include $(SRC)/cmd/stat/Makefile.stat
LDLIBS += -ldevinfo -lkstat -lavl
CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
FILEMODE= 0555
diff --git a/usr/src/cmd/stat/vmstat/Makefile b/usr/src/cmd/stat/vmstat/Makefile
index 6827f634a7..fcbbec9071 100644
--- a/usr/src/cmd/stat/vmstat/Makefile
+++ b/usr/src/cmd/stat/vmstat/Makefile
@@ -34,7 +34,7 @@ include $(SRC)/cmd/stat/Makefile.stat
LDLIBS += -ldevinfo -lkstat -lavl
CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
SMOFF += signed
diff --git a/usr/src/cmd/stmsboot/Makefile b/usr/src/cmd/stmsboot/Makefile
index 8e97f0f467..f662b20763 100644
--- a/usr/src/cmd/stmsboot/Makefile
+++ b/usr/src/cmd/stmsboot/Makefile
@@ -40,7 +40,7 @@ ROOTFSLIB_MPXIO = $(ROOT)/lib/mpxio
ROOTMANIFESTDIR = $(ROOTSVCSYSTEMDEVICE)
LDLIBS += -ldevinfo -ldevid -lnvpair -lumem
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/streams/strcmd/Makefile b/usr/src/cmd/streams/strcmd/Makefile
index ce0aa9f71e..905aef36b5 100644
--- a/usr/src/cmd/streams/strcmd/Makefile
+++ b/usr/src/cmd/streams/strcmd/Makefile
@@ -26,7 +26,7 @@ PROG= strchg strconf
include ../../Makefile.cmd
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/strings/Makefile.com b/usr/src/cmd/strings/Makefile.com
index 36fc42dd15..daaa1ad8fa 100644
--- a/usr/src/cmd/strings/Makefile.com
+++ b/usr/src/cmd/strings/Makefile.com
@@ -33,7 +33,7 @@ LDLIBS += -lelf
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/sunpc/other/Makefile b/usr/src/cmd/sunpc/other/Makefile
index bd366ffe4e..b5c0d20801 100644
--- a/usr/src/cmd/sunpc/other/Makefile
+++ b/usr/src/cmd/sunpc/other/Makefile
@@ -30,7 +30,7 @@ SRCS= ${PROG:%=%.c}
include ../../Makefile.cmd
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
# not linted
diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile
index 419ca6248b..b90b64e302 100644
--- a/usr/src/cmd/svc/configd/Makefile
+++ b/usr/src/cmd/svc/configd/Makefile
@@ -61,7 +61,7 @@ CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# strange false positive
SMOFF += free
diff --git a/usr/src/cmd/svc/lsvcrun/Makefile b/usr/src/cmd/svc/lsvcrun/Makefile
index 4eda2674db..91634e8b32 100644
--- a/usr/src/cmd/svc/lsvcrun/Makefile
+++ b/usr/src/cmd/svc/lsvcrun/Makefile
@@ -35,7 +35,7 @@ include ../../Makefile.cmd
LDLIBS += -lcontract -lscf -luutil
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
lint := LINTFLAGS = -ux
diff --git a/usr/src/cmd/svc/mfstscan/Makefile b/usr/src/cmd/svc/mfstscan/Makefile
index 5a24abb0ca..64bcea95b8 100644
--- a/usr/src/cmd/svc/mfstscan/Makefile
+++ b/usr/src/cmd/svc/mfstscan/Makefile
@@ -44,7 +44,7 @@ CPPFLAGS += -I../common
LDLIBS += -lscf -luutil -lmd5
CLOBBERFILES += $(POFILES)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
lint := LINTFLAGS = -ux -erroff=E_GLOBAL_COULD_BE_STATIC2
diff --git a/usr/src/cmd/svc/startd/Makefile b/usr/src/cmd/svc/startd/Makefile
index 1f71fdbc6c..d9b1c523a7 100644
--- a/usr/src/cmd/svc/startd/Makefile
+++ b/usr/src/cmd/svc/startd/Makefile
@@ -71,7 +71,7 @@ CPPFLAGS += -I. -I../common
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# these look like real bugs here, but ...
SMOFF += impossible_mask,signed_integer_overflow_check
diff --git a/usr/src/cmd/svc/svcadm/Makefile b/usr/src/cmd/svc/svcadm/Makefile
index cc0cc160bf..07d22a2226 100644
--- a/usr/src/cmd/svc/svcadm/Makefile
+++ b/usr/src/cmd/svc/svcadm/Makefile
@@ -34,7 +34,7 @@ POFILE = $(PROG)_all.po
LDLIBS += -lscf -luutil -lcontract
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
lint := LINTFLAGS = -ux
diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile
index 0e50a1a293..2e32677477 100644
--- a/usr/src/cmd/svc/svccfg/Makefile
+++ b/usr/src/cmd/svc/svccfg/Makefile
@@ -77,7 +77,7 @@ LDFLAGS += $(MAPOPTS)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/svc/svcprop/Makefile b/usr/src/cmd/svc/svcprop/Makefile
index 4e1f4d4981..13b1da5368 100644
--- a/usr/src/cmd/svc/svcprop/Makefile
+++ b/usr/src/cmd/svc/svcprop/Makefile
@@ -35,7 +35,7 @@ LDLIBS += -lscf -luutil
lint := LINTFLAGS = -ux
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/svc/svcs/Makefile b/usr/src/cmd/svc/svcs/Makefile
index 0e9fc52652..72dec43271 100644
--- a/usr/src/cmd/svc/svcs/Makefile
+++ b/usr/src/cmd/svc/svcs/Makefile
@@ -39,7 +39,7 @@ CPPFLAGS += -I ../common
lint := LINTFLAGS = -mux
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
.KEEP_STATE:
diff --git a/usr/src/cmd/svr4pkg/Makefile.svr4pkg b/usr/src/cmd/svr4pkg/Makefile.svr4pkg
index ff43ccf865..9d2e11de89 100644
--- a/usr/src/cmd/svr4pkg/Makefile.svr4pkg
+++ b/usr/src/cmd/svr4pkg/Makefile.svr4pkg
@@ -36,7 +36,7 @@ CPPFLAGS += -I$(SRC)/cmd/svr4pkg/hdrs \
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
# multiple issues in this old code
diff --git a/usr/src/cmd/svr4pkg/libinst/Makefile b/usr/src/cmd/svr4pkg/libinst/Makefile
index 9abf6ebd7a..91e87f6173 100644
--- a/usr/src/cmd/svr4pkg/libinst/Makefile
+++ b/usr/src/cmd/svr4pkg/libinst/Makefile
@@ -65,7 +65,7 @@ LINTFLAGS += -un
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/cmd/swap/Makefile.com b/usr/src/cmd/swap/Makefile.com
index 54361a42d5..fce9598f5c 100644
--- a/usr/src/cmd/swap/Makefile.com
+++ b/usr/src/cmd/swap/Makefile.com
@@ -33,7 +33,7 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -D_LARGEFILE64_SOURCE
CFLAGS64 += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/syseventadm/Makefile b/usr/src/cmd/syseventadm/Makefile
index 91c515b00f..f877f7f9c4 100644
--- a/usr/src/cmd/syseventadm/Makefile
+++ b/usr/src/cmd/syseventadm/Makefile
@@ -32,7 +32,7 @@ OBJS = $(PROG).o
include ../Makefile.cmd
FILEMODE= 0555
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
POFILES = $(SRCS:.c=.po)
diff --git a/usr/src/cmd/syseventd/daemons/syseventd/Makefile b/usr/src/cmd/syseventd/daemons/syseventd/Makefile
index b599ae9560..9c7af4c462 100644
--- a/usr/src/cmd/syseventd/daemons/syseventd/Makefile
+++ b/usr/src/cmd/syseventd/daemons/syseventd/Makefile
@@ -29,7 +29,7 @@ SRCS = syseventd.c sysevent_signal.c sysevent_client.c
include ../Makefile.com
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile
index 94cba19b73..5174d57225 100644
--- a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile
+++ b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile
@@ -32,7 +32,7 @@ include ../Makefile.com
LDLIBS += -lnvpair
CPPFLAGS += -I ../../daemons/syseventconfd
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# strange smatch false positive
SMOFF += allocating_enough_data
diff --git a/usr/src/cmd/syseventd/modules/zfs_mod/Makefile b/usr/src/cmd/syseventd/modules/zfs_mod/Makefile
index 13dcc10c90..8b8c2c6c42 100644
--- a/usr/src/cmd/syseventd/modules/zfs_mod/Makefile
+++ b/usr/src/cmd/syseventd/modules/zfs_mod/Makefile
@@ -29,7 +29,7 @@ include ../Makefile.com
CPPFLAGS += -I../../../../lib/libc/inc
LDLIBS += -lzfs -ldevid -lcmdutils -lnvpair
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/syslogd/Makefile.com b/usr/src/cmd/syslogd/Makefile.com
index 0898493b3d..6d9c1a35f5 100644
--- a/usr/src/cmd/syslogd/Makefile.com
+++ b/usr/src/cmd/syslogd/Makefile.com
@@ -35,7 +35,7 @@ LLOBJS= $(OBJS:%.o=%.ll)
include ../../Makefile.cmd
$(PROG) lint := LDLIBS += -lscf -lnsl
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/tar/Makefile b/usr/src/cmd/tar/Makefile
index 9a026b00b4..c3096a8220 100644
--- a/usr/src/cmd/tar/Makefile
+++ b/usr/src/cmd/tar/Makefile
@@ -38,7 +38,7 @@ LINTFLAGS += -u
LDLIBS += -lsec -lcmdutils -lnvpair -ltsol
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/tbl/Makefile b/usr/src/cmd/tbl/Makefile
index cae02cb4f7..12eb8c3ae2 100644
--- a/usr/src/cmd/tbl/Makefile
+++ b/usr/src/cmd/tbl/Makefile
@@ -39,7 +39,7 @@ POFILE= tbl.po
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
# not linted
diff --git a/usr/src/cmd/tcopy/Makefile b/usr/src/cmd/tcopy/Makefile
index 3e29556b5f..c5230f1c77 100644
--- a/usr/src/cmd/tcopy/Makefile
+++ b/usr/src/cmd/tcopy/Makefile
@@ -30,7 +30,7 @@ include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-extra
# not linted
diff --git a/usr/src/cmd/tcpd/Makefile b/usr/src/cmd/tcpd/Makefile
index 1697a5e325..1ff5574989 100644
--- a/usr/src/cmd/tcpd/Makefile
+++ b/usr/src/cmd/tcpd/Makefile
@@ -25,7 +25,7 @@ CERRWARN += -erroff=E_FUNC_HAS_NO_RETURN_STMT
CERRWARN += -erroff=E_IMPLICIT_DECL_FUNC_RETURN_INT
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-return-type
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/cmd/th_tools/Makefile b/usr/src/cmd/th_tools/Makefile
index ed9d5ae75a..e1c4ac1baf 100644
--- a/usr/src/cmd/th_tools/Makefile
+++ b/usr/src/cmd/th_tools/Makefile
@@ -33,7 +33,7 @@ LINTFLAGS += -I$(SRC)/uts/common
CSTD= $(CSTD_GNU99)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SRCS = $(PROG:%=%.c)
OBJECTS = $(SRCS:%.c=%.o)
diff --git a/usr/src/cmd/tic/Makefile.common b/usr/src/cmd/tic/Makefile.common
index 354ef9e8c3..0303635751 100644
--- a/usr/src/cmd/tic/Makefile.common
+++ b/usr/src/cmd/tic/Makefile.common
@@ -45,7 +45,7 @@ LDFLAGS += $(MAPFILES:%=-M%)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/tip/Makefile b/usr/src/cmd/tip/Makefile
index f64b4e301c..de0e20742e 100644
--- a/usr/src/cmd/tip/Makefile
+++ b/usr/src/cmd/tip/Makefile
@@ -62,7 +62,7 @@ LINTFLAGS += -u
CPPFLAGS += -DDEFBR=300 -DDEFFS=BUFSIZ -DACULOG -DUSG
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CONFIG= -DV831 -DVENTEL -DV3451 -DDF02 -DDF03 -DBIZ1031 -DBIZ1022 -DHAYES
ACULIB= aculib/aculib.a
LDLIBS= $(ACULIB) $(LDLIBS.cmd)
diff --git a/usr/src/cmd/tnf/prex/Makefile.com b/usr/src/cmd/tnf/prex/Makefile.com
index 90303b6aa7..35d9c42d0f 100644
--- a/usr/src/cmd/tnf/prex/Makefile.com
+++ b/usr/src/cmd/tnf/prex/Makefile.com
@@ -67,7 +67,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/tnf/tnfxtract/Makefile.com b/usr/src/cmd/tnf/tnfxtract/Makefile.com
index dc5b2ea811..d7774db366 100644
--- a/usr/src/cmd/tnf/tnfxtract/Makefile.com
+++ b/usr/src/cmd/tnf/tnfxtract/Makefile.com
@@ -37,7 +37,7 @@ include ../../../Makefile.cmd
LFLAGS= -v
LDLIBS += -lkvm
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/troff/troff.d/Makefile b/usr/src/cmd/troff/troff.d/Makefile
index dfe5b8fee7..455d51a43f 100644
--- a/usr/src/cmd/troff/troff.d/Makefile
+++ b/usr/src/cmd/troff/troff.d/Makefile
@@ -48,7 +48,7 @@ CPPFLAGS = -DUSG -DINCORE -I. -I.. $(CPPFLAGS.master)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-extra
# "parse error: parsing (i (9223372034707292160-96) >= 65)"
diff --git a/usr/src/cmd/truss/Makefile.com b/usr/src/cmd/truss/Makefile.com
index bb49c12894..4140101d8d 100644
--- a/usr/src/cmd/truss/Makefile.com
+++ b/usr/src/cmd/truss/Makefile.com
@@ -38,7 +38,7 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# not linted
diff --git a/usr/src/cmd/ttymon/Makefile b/usr/src/cmd/ttymon/Makefile
index 05178e2e4c..ae70a2619c 100644
--- a/usr/src/cmd/ttymon/Makefile
+++ b/usr/src/cmd/ttymon/Makefile
@@ -76,7 +76,7 @@ LDFLAGS += $(MAPFILE.NGB:%=-M%)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-extra
# not linted
diff --git a/usr/src/cmd/ucodeadm/Makefile b/usr/src/cmd/ucodeadm/Makefile
index 1abe8bb420..a8817d2a78 100644
--- a/usr/src/cmd/ucodeadm/Makefile
+++ b/usr/src/cmd/ucodeadm/Makefile
@@ -48,7 +48,7 @@ ROOTAMDUCODE = $(AMD_UCODE_FILE:%=$(ROOTUCODEPATH)/%)
CPPFLAGS = -I../../common -I../../uts/common
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
LINTFLAGS += -errtags -erroff=E_NAME_DEF_NOT_USED2
LINTFLAGS += -erroff=E_INCONS_ARG_DECL2,E_INCONS_VAL_TYPE_DECL2
diff --git a/usr/src/cmd/uname/Makefile b/usr/src/cmd/uname/Makefile
index daa11b4aa8..14f7291b6e 100644
--- a/usr/src/cmd/uname/Makefile
+++ b/usr/src/cmd/uname/Makefile
@@ -28,7 +28,7 @@ ROOTFS_PROG= $(PROG)
include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/unpack/Makefile b/usr/src/cmd/unpack/Makefile
index bb3fc4e9e8..03c55bfe33 100644
--- a/usr/src/cmd/unpack/Makefile
+++ b/usr/src/cmd/unpack/Makefile
@@ -28,7 +28,7 @@ PROG= unpack
include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -D_FILE_OFFSET_BITS=64
LDLIBS += -lcmdutils -lsec
diff --git a/usr/src/cmd/users/Makefile b/usr/src/cmd/users/Makefile
index 253af50ff5..2ad2a40895 100644
--- a/usr/src/cmd/users/Makefile
+++ b/usr/src/cmd/users/Makefile
@@ -30,7 +30,7 @@ SRCS= $(OBJS:%.o=%.c)
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/vi/misc/Makefile b/usr/src/cmd/vi/misc/Makefile
index 3b75bb32de..26c7b7b8dc 100644
--- a/usr/src/cmd/vi/misc/Makefile
+++ b/usr/src/cmd/vi/misc/Makefile
@@ -41,7 +41,7 @@ $(XPG4) := CFLAGS += -DXPG4
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/cmd/vi/port/Makefile b/usr/src/cmd/vi/port/Makefile
index c74e8cbdbc..f85351d89a 100644
--- a/usr/src/cmd/vi/port/Makefile
+++ b/usr/src/cmd/vi/port/Makefile
@@ -59,7 +59,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-value
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
# way too old
diff --git a/usr/src/cmd/volcheck/Makefile b/usr/src/cmd/volcheck/Makefile
index d3ee4572a1..8c2543f014 100644
--- a/usr/src/cmd/volcheck/Makefile
+++ b/usr/src/cmd/volcheck/Makefile
@@ -45,7 +45,7 @@ CSTD = $(CSTD_GNU99)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
# not linted
diff --git a/usr/src/cmd/volrmmount/Makefile b/usr/src/cmd/volrmmount/Makefile
index 848088070c..a357772d00 100644
--- a/usr/src/cmd/volrmmount/Makefile
+++ b/usr/src/cmd/volrmmount/Makefile
@@ -45,7 +45,7 @@ CSTD = $(CSTD_GNU99)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
# not linted
diff --git a/usr/src/cmd/vt/Makefile b/usr/src/cmd/vt/Makefile
index daae42bee4..a08e04c18b 100644
--- a/usr/src/cmd/vt/Makefile
+++ b/usr/src/cmd/vt/Makefile
@@ -33,7 +33,7 @@ VTINFO_SRC= vtinfo.c
include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
vtdaemon := LDLIBS += -lpam -lbsm
lint_vtdaemon := LDLIBS += -lpam -lbsm
diff --git a/usr/src/cmd/wall/Makefile b/usr/src/cmd/wall/Makefile
index f593e0095b..866c7ad6c8 100644
--- a/usr/src/cmd/wall/Makefile
+++ b/usr/src/cmd/wall/Makefile
@@ -32,7 +32,7 @@ FILEMODE = 02555
LDLIBS += -lzonecfg -lcontract
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += leaks
diff --git a/usr/src/cmd/ypcmd/Makefile b/usr/src/cmd/ypcmd/Makefile
index aeefa3031e..9667086a18 100644
--- a/usr/src/cmd/ypcmd/Makefile
+++ b/usr/src/cmd/ypcmd/Makefile
@@ -147,7 +147,7 @@ NIS2LDAPINC = -I$(SRC)/lib/libnisdb/yptol
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-extra
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/cmd/ypcmd/revnetgroup/Makefile b/usr/src/cmd/ypcmd/revnetgroup/Makefile
index 7494d1ceef..7f4c4d6c03 100644
--- a/usr/src/cmd/ypcmd/revnetgroup/Makefile
+++ b/usr/src/cmd/ypcmd/revnetgroup/Makefile
@@ -35,7 +35,7 @@ HDRS = getgroup.h table.h util.h
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/ypcmd/yppasswd/Makefile b/usr/src/cmd/ypcmd/yppasswd/Makefile
index db9d000e49..ac9f82d930 100644
--- a/usr/src/cmd/ypcmd/yppasswd/Makefile
+++ b/usr/src/cmd/ypcmd/yppasswd/Makefile
@@ -59,7 +59,7 @@ RPCYPPASSWDDOBJ = yppasswdd.o changepasswd.o
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/zic/Makefile.common b/usr/src/cmd/zic/Makefile.common
index 197de36fb0..5ad10a2a2e 100644
--- a/usr/src/cmd/zic/Makefile.common
+++ b/usr/src/cmd/zic/Makefile.common
@@ -12,6 +12,6 @@ OBJS= ialloc.o \
SRCS= $(OBJS:%.o=%.c)
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += signed
diff --git a/usr/src/cmd/zinject/Makefile.com b/usr/src/cmd/zinject/Makefile.com
index a1a3baf712..8644e8185d 100644
--- a/usr/src/cmd/zinject/Makefile.com
+++ b/usr/src/cmd/zinject/Makefile.com
@@ -44,7 +44,7 @@ C99LMODE= -Xc99=%all
CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common -D_FAKE_KERNEL
CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
LINTFLAGS += -erroff=E_STATIC_UNUSED
diff --git a/usr/src/cmd/zlogin/Makefile b/usr/src/cmd/zlogin/Makefile
index 70ecb28c5c..a40f872ea4 100644
--- a/usr/src/cmd/zlogin/Makefile
+++ b/usr/src/cmd/zlogin/Makefile
@@ -21,22 +21,24 @@
#
# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
+#
PROG = zlogin
include ../Makefile.cmd
-LINTFLAGS += -u
LDLIBS += -lsocket -lzonecfg -lcontract -lbrand -lsecdb
CFLAGS += $(CCVERBOSE)
FILEMODE = 0555
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
+CSTD = $(CSTD_GNU99)
+
.KEEP_STATE:
all: $(PROG)
@@ -46,6 +48,4 @@ install: all $(ROOTUSRSBINPROG)
clean:
$(RM) $(OBJS)
-lint: lint_PROG
-
include ../Makefile.targ
diff --git a/usr/src/cmd/zlogin/zlogin.c b/usr/src/cmd/zlogin/zlogin.c
index 296c32be01..03b66fa16b 100644
--- a/usr/src/cmd/zlogin/zlogin.c
+++ b/usr/src/cmd/zlogin/zlogin.c
@@ -23,6 +23,7 @@
* Copyright 2013 DEY Storage Systems, Inc.
* Copyright (c) 2014 Gary Mills
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2019 Joyent, Inc.
*/
/*
@@ -612,7 +613,6 @@ process_user_input(int outfd, int infd)
char ibuf[ZLOGIN_BUFSIZ];
int nbytes;
char *buf = ibuf;
- char c = *buf;
nbytes = read(STDIN_FILENO, ibuf, ZLOGIN_RDBUFSIZ);
if (nbytes == -1 && (errno != EINTR || dead))
@@ -625,7 +625,7 @@ process_user_input(int outfd, int infd)
if (nbytes == 0)
return (1);
- for (c = *buf; nbytes > 0; c = *buf, --nbytes) {
+ for (char c = *buf; nbytes > 0; c = *buf, --nbytes) {
buf++;
if (beginning_of_line && !nocmdchar) {
beginning_of_line = B_FALSE;
diff --git a/usr/src/cmd/zlook/Makefile.com b/usr/src/cmd/zlook/Makefile.com
index fe96088124..a634a72d2c 100644
--- a/usr/src/cmd/zlook/Makefile.com
+++ b/usr/src/cmd/zlook/Makefile.com
@@ -34,7 +34,7 @@ CFLAGS += $(CCGDEBUG) $(CCVERBOSE)
CFLAGS64 += $(CCGDEBUG) $(CCVERBOSE)
CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/zoneadm/Makefile b/usr/src/cmd/zoneadm/Makefile
index 23584bbb5b..5dea2ace60 100644
--- a/usr/src/cmd/zoneadm/Makefile
+++ b/usr/src/cmd/zoneadm/Makefile
@@ -40,7 +40,7 @@ LDLIBS += -lzonecfg -lsocket -lgen -lpool -lzfs -luuid -lnvpair -lbrand -ldladm
INCS += -I../../common/zfs
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/cmd/zoneadmd/Makefile b/usr/src/cmd/zoneadmd/Makefile
index 8324f7fefa..04b3ab3078 100644
--- a/usr/src/cmd/zoneadmd/Makefile
+++ b/usr/src/cmd/zoneadmd/Makefile
@@ -40,7 +40,7 @@ POFILES= $(OBJS:%.o=%.po)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lsocket -lzonecfg -lnsl -ldevinfo -ldevice -lnvpair \
-lgen -lbsm -lcontract -lzfs -luuid -lbrand -ldladm -ltsnet -ltsol \
diff --git a/usr/src/cmd/zonecfg/Makefile b/usr/src/cmd/zonecfg/Makefile
index dc4dc5a16e..be3e325ba6 100644
--- a/usr/src/cmd/zonecfg/Makefile
+++ b/usr/src/cmd/zonecfg/Makefile
@@ -42,7 +42,7 @@ CPPFLAGS += -I.
LDFLAGS += $(MAPOPTS)
CLEANFILES += zonecfg_lex.c zonecfg_grammar.tab.c zonecfg_grammar.tab.h
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-implicit-function-declaration
diff --git a/usr/src/cmd/zonestat/zonestat/Makefile b/usr/src/cmd/zonestat/zonestat/Makefile
index 64e2314de5..a8b62f65d3 100644
--- a/usr/src/cmd/zonestat/zonestat/Makefile
+++ b/usr/src/cmd/zonestat/zonestat/Makefile
@@ -32,7 +32,7 @@ include ../../Makefile.cmd
LDLIBS += -lscf -lzonestat -lumem
LINTFLAGS += -u
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/cmd/zonestat/zonestatd/Makefile b/usr/src/cmd/zonestat/zonestatd/Makefile
index 5f27190f10..727c71148c 100644
--- a/usr/src/cmd/zonestat/zonestatd/Makefile
+++ b/usr/src/cmd/zonestat/zonestatd/Makefile
@@ -41,7 +41,7 @@ LDLIBS += -lkstat -lpool -lexacct -lscf \
LINTFLAGS += -u
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off