summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2019-08-07 12:09:20 -0700
committerJohn Levon <john.levon@joyent.com>2019-08-16 01:57:38 -0700
commitd3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe (patch)
tree8e10c8af012b9fd1ff07c66edc3bfcf328897cf1
parentc4ccc1f9004b70b07e4cdb57641c38ab607306c9 (diff)
downloadillumos-joyent-d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe.tar.gz
11528 Makefile.noget can get gone
11529 Use -Wno-maybe-initialized Reviewed by: Peter Tribble <peter.tribble@gmail.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Robert Mustacchi <rm@joyent.com>
-rw-r--r--usr/src/Makefile.master9
-rw-r--r--usr/src/Makefile.noget236
-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
-rw-r--r--usr/src/lib/abi/apptrace/Makefile.com2
-rw-r--r--usr/src/lib/auditd_plugins/syslog/Makefile.com2
-rw-r--r--usr/src/lib/brand/solaris10/s10_brand/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/fp/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/ib/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/pci/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/sata/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/sbd/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/scsi/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/shp/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com2
-rw-r--r--usr/src/lib/cfgadm_plugins/usb/Makefile.com2
-rw-r--r--usr/src/lib/efcode/Makefile.efcode2
-rw-r--r--usr/src/lib/efcode/interpreter/Makefile2
-rw-r--r--usr/src/lib/fm/libfmd_log/Makefile.com2
-rw-r--r--usr/src/lib/fm/libfmd_msg/Makefile.com2
-rw-r--r--usr/src/lib/fm/libfmevent/Makefile.com2
-rw-r--r--usr/src/lib/fm/topo/libtopo/Makefile.com2
-rw-r--r--usr/src/lib/fm/topo/modules/Makefile.plugin2
-rw-r--r--usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com2
-rw-r--r--usr/src/lib/gss_mechs/mech_dummy/Makefile.com2
-rw-r--r--usr/src/lib/gss_mechs/mech_krb5/Makefile.com2
-rw-r--r--usr/src/lib/gss_mechs/mech_krb5/krb5/krb/gic_pwd.c26
-rw-r--r--usr/src/lib/hbaapi/Makefile.com2
-rw-r--r--usr/src/lib/krb5/kadm5/clnt/Makefile.com2
-rw-r--r--usr/src/lib/krb5/kadm5/srv/Makefile.com2
-rw-r--r--usr/src/lib/krb5/kdb/Makefile.com2
-rw-r--r--usr/src/lib/krb5/plugins/kdb/db2/Makefile.com2
-rw-r--r--usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com2
-rw-r--r--usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com2
-rw-r--r--usr/src/lib/libadm/Makefile.com2
-rw-r--r--usr/src/lib/libads/Makefile.com2
-rw-r--r--usr/src/lib/libadutils/Makefile.com2
-rw-r--r--usr/src/lib/libast/Makefile.com2
-rw-r--r--usr/src/lib/libbc/sparc/Makefile2
-rw-r--r--usr/src/lib/libbsm/Makefile.com2
-rw-r--r--usr/src/lib/libc/amd64/Makefile2
-rw-r--r--usr/src/lib/libc/i386/Makefile.com2
-rw-r--r--usr/src/lib/libc/inc/thr_inlines.h6
-rw-r--r--usr/src/lib/libc/port/fp/_base_sup.c8
-rw-r--r--usr/src/lib/libc/sparc/Makefile.com4
-rw-r--r--usr/src/lib/libc/sparcv9/Makefile.com4
-rw-r--r--usr/src/lib/libc_db/Makefile.com2
-rw-r--r--usr/src/lib/libcmd/Makefile.com2
-rw-r--r--usr/src/lib/libcpc/Makefile.com2
-rw-r--r--usr/src/lib/libcrypt/Makefile.com2
-rw-r--r--usr/src/lib/libcryptoutil/Makefile.com2
-rw-r--r--usr/src/lib/libctf/Makefile.shared.com2
-rw-r--r--usr/src/lib/libcurses/Makefile.com2
-rw-r--r--usr/src/lib/libdevinfo/Makefile.com2
-rw-r--r--usr/src/lib/libdhcputil/Makefile.com2
-rw-r--r--usr/src/lib/libdisasm/Makefile.com2
-rw-r--r--usr/src/lib/libdiskmgt/Makefile.com2
-rw-r--r--usr/src/lib/libdladm/Makefile.com2
-rw-r--r--usr/src/lib/libdll/Makefile.com2
-rw-r--r--usr/src/lib/libdlpi/Makefile.com2
-rw-r--r--usr/src/lib/libdtrace/Makefile.com2
-rw-r--r--usr/src/lib/libdtrace_jni/Makefile.com2
-rw-r--r--usr/src/lib/libeti/form/Makefile.com2
-rw-r--r--usr/src/lib/libexacct/Makefile.com2
-rw-r--r--usr/src/lib/libexacct/demo/Makefile2
-rw-r--r--usr/src/lib/libfdisk/Makefile.com2
-rw-r--r--usr/src/lib/libfru/libfruraw/Makefile.com2
-rw-r--r--usr/src/lib/libfruutils/Makefile.com2
-rw-r--r--usr/src/lib/libfsmgt/Makefile.com2
-rw-r--r--usr/src/lib/libgen/Makefile.com2
-rw-r--r--usr/src/lib/libgss/Makefile.com2
-rw-r--r--usr/src/lib/libinetsvc/Makefile.com2
-rw-r--r--usr/src/lib/libipadm/Makefile.com2
-rw-r--r--usr/src/lib/libipmi/Makefile.com2
-rw-r--r--usr/src/lib/libipsecutil/Makefile.com2
-rw-r--r--usr/src/lib/libkmf/libkmf/Makefile.com2
-rw-r--r--usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com2
-rw-r--r--usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com2
-rw-r--r--usr/src/lib/libkvm/Makefile.com2
-rw-r--r--usr/src/lib/libldap5/Makefile.com2
-rw-r--r--usr/src/lib/libmapid/Makefile.com2
-rw-r--r--usr/src/lib/libmd/sparc/Makefile2
-rw-r--r--usr/src/lib/libmtmalloc/Makefile.com2
-rw-r--r--usr/src/lib/libndmp/Makefile.com2
-rw-r--r--usr/src/lib/libnisdb/Makefile2
-rw-r--r--usr/src/lib/libnsl/Makefile.com2
-rw-r--r--usr/src/lib/libnvpair/Makefile.com2
-rw-r--r--usr/src/lib/libnwam/Makefile.com2
-rw-r--r--usr/src/lib/libpam/Makefile.com2
-rw-r--r--usr/src/lib/libpcp/Makefile.com2
-rw-r--r--usr/src/lib/libpicltree/Makefile.com2
-rw-r--r--usr/src/lib/libpkg/Makefile.com2
-rw-r--r--usr/src/lib/libpool/Makefile.com2
-rw-r--r--usr/src/lib/libpp/Makefile.com2
-rw-r--r--usr/src/lib/libproc/Makefile.com2
-rw-r--r--usr/src/lib/libproject/Makefile.com2
-rw-r--r--usr/src/lib/libprtdiag/Makefile.com2
-rw-r--r--usr/src/lib/libprtdiag_psr/sparc/Makefile.com2
-rw-r--r--usr/src/lib/libresolv/Makefile2
-rw-r--r--usr/src/lib/librpcsvc/Makefile.com2
-rw-r--r--usr/src/lib/libscf/Makefile.com2
-rw-r--r--usr/src/lib/libsec/Makefile.com2
-rw-r--r--usr/src/lib/libsecdb/Makefile.com2
-rw-r--r--usr/src/lib/libshare/Makefile.com2
-rw-r--r--usr/src/lib/libshare/autofs/Makefile.com2
-rw-r--r--usr/src/lib/libshare/nfs/Makefile.com2
-rw-r--r--usr/src/lib/libshare/smbfs/Makefile.com2
-rw-r--r--usr/src/lib/libshell/Makefile.com2
-rw-r--r--usr/src/lib/libsldap/Makefile.com2
-rw-r--r--usr/src/lib/libslp/Makefile.com2
-rw-r--r--usr/src/lib/libsmbfs/Makefile.com2
-rw-r--r--usr/src/lib/libsocket/Makefile.com2
-rw-r--r--usr/src/lib/libsqlite/Makefile.com2
-rw-r--r--usr/src/lib/libtnfctl/Makefile.com2
-rw-r--r--usr/src/lib/libtnfprobe/Makefile.com2
-rw-r--r--usr/src/lib/libtsnet/Makefile.com2
-rw-r--r--usr/src/lib/libtsol/Makefile.com2
-rw-r--r--usr/src/lib/libv12n/Makefile.com2
-rw-r--r--usr/src/lib/libwrap/Makefile.com2
-rw-r--r--usr/src/lib/libxcurses/Makefile.com2
-rw-r--r--usr/src/lib/libxcurses2/Makefile.com2
-rw-r--r--usr/src/lib/libzonecfg/Makefile.com2
-rw-r--r--usr/src/lib/libzonestat/Makefile.com2
-rw-r--r--usr/src/lib/madv/Makefile.com2
-rw-r--r--usr/src/lib/mpapi/libmpapi/Makefile.com2
-rw-r--r--usr/src/lib/mpss/Makefile.com2
-rw-r--r--usr/src/lib/nsswitch/Makefile.com2
-rw-r--r--usr/src/lib/pam_modules/unix_cred/Makefile.com2
-rw-r--r--usr/src/lib/passwdutil/Makefile.com2
-rw-r--r--usr/src/lib/pkcs11/libpkcs11/Makefile.com2
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile2
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com2
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com2
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile2
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile2
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile2
-rw-r--r--usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com2
-rw-r--r--usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com2
-rw-r--r--usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com2
-rw-r--r--usr/src/lib/print/libipp-listener/Makefile.com2
-rw-r--r--usr/src/lib/print/libpapi-ipp/Makefile.com2
-rw-r--r--usr/src/lib/rpcsec_gss/Makefile.com2
-rw-r--r--usr/src/lib/sasl_plugins/Makefile.com2
-rw-r--r--usr/src/lib/scsi/libses/Makefile.defs2
-rw-r--r--usr/src/lib/scsi/libsmp/Makefile.com2
-rw-r--r--usr/src/lib/smbsrv/libmlsvc/Makefile.com2
-rw-r--r--usr/src/lib/smbsrv/libsmb/Makefile.com2
-rw-r--r--usr/src/lib/smbsrv/libsmbns/Makefile.com2
-rw-r--r--usr/src/lib/smhba/Makefile.com2
-rw-r--r--usr/src/lib/storage/liba5k/Makefile.com2
-rw-r--r--usr/src/lib/storage/libg_fc/Makefile.com2
-rw-r--r--usr/src/lib/udapl/udapl_tavor/Makefile.com2
-rw-r--r--usr/src/psm/stand/boot/Makefile.boot2
-rw-r--r--usr/src/psm/stand/cpr/sparcv9/sun4u/Makefile2
-rw-r--r--usr/src/req.flg3
-rw-r--r--usr/src/stand/lib/fs/Makefile.com2
-rw-r--r--usr/src/stand/lib/inet/Makefile2
-rw-r--r--usr/src/stand/lib/sa/Makefile2
-rw-r--r--usr/src/stand/lib/tcp/Makefile2
-rw-r--r--usr/src/test/libc-tests/tests/regex/Makefile2
-rw-r--r--usr/src/tools/aw/Makefile2
-rw-r--r--usr/src/tools/cscope-fast/Makefile2
-rw-r--r--usr/src/tools/ctf/ctfmerge/Makefile.com2
-rw-r--r--usr/src/tools/ctf/cvt/Makefile.com2
-rw-r--r--usr/src/tools/ctf/stabs/Makefile.com2
-rw-r--r--usr/src/tools/ndrgen/Makefile2
-rw-r--r--usr/src/ucbcmd/mkstr/Makefile2
-rw-r--r--usr/src/ucbcmd/tset/Makefile2
-rw-r--r--usr/src/ucblib/libcurses/Makefile.com2
-rw-r--r--usr/src/ucblib/libdbm/Makefile.com2
-rw-r--r--usr/src/ucblib/librpcsoc/Makefile.com2
-rw-r--r--usr/src/ucblib/libucb/Makefile.com2
-rw-r--r--usr/src/uts/Makefile.uts5
-rw-r--r--usr/src/uts/common/vm/vm_pagelist.c3
-rw-r--r--usr/src/uts/i86pc/acpidev/Makefile2
-rw-r--r--usr/src/uts/i86pc/amd_iommu/Makefile2
-rw-r--r--usr/src/uts/i86pc/cpr/Makefile2
-rw-r--r--usr/src/uts/i86pc/cpudrv/Makefile2
-rw-r--r--usr/src/uts/i86pc/dr/Makefile2
-rw-r--r--usr/src/uts/i86pc/generic_cpu/Makefile2
-rw-r--r--usr/src/uts/i86pc/gfx_private/Makefile2
-rw-r--r--usr/src/uts/i86pc/i86hvm/xpvd/Makefile2
-rw-r--r--usr/src/uts/i86pc/ioat/Makefile2
-rw-r--r--usr/src/uts/i86pc/npe/Makefile2
-rw-r--r--usr/src/uts/i86pc/pci/Makefile2
-rw-r--r--usr/src/uts/i86pc/pcie/Makefile2
-rw-r--r--usr/src/uts/i86pc/ppm/Makefile2
-rw-r--r--usr/src/uts/i86pc/rootnex/Makefile2
-rw-r--r--usr/src/uts/i86pc/tzmon/Makefile2
-rw-r--r--usr/src/uts/i86pc/unix/Makefile2
-rw-r--r--usr/src/uts/i86pc/vm/vm_dep.h7
-rw-r--r--usr/src/uts/i86pc/vm/vm_machdep.c2
-rw-r--r--usr/src/uts/i86pc/xsvc/Makefile2
-rw-r--r--usr/src/uts/i86xpv/generic_cpu/Makefile2
-rw-r--r--usr/src/uts/i86xpv/gfx_private/Makefile2
-rw-r--r--usr/src/uts/i86xpv/ioat/Makefile2
-rw-r--r--usr/src/uts/i86xpv/npe/Makefile2
-rw-r--r--usr/src/uts/i86xpv/pci/Makefile2
-rw-r--r--usr/src/uts/i86xpv/privcmd/Makefile2
-rw-r--r--usr/src/uts/i86xpv/rootnex/Makefile2
-rw-r--r--usr/src/uts/i86xpv/unix/Makefile2
-rw-r--r--usr/src/uts/i86xpv/xdt/Makefile2
-rw-r--r--usr/src/uts/i86xpv/xnb/Makefile2
-rw-r--r--usr/src/uts/i86xpv/xpv_psm/Makefile2
-rw-r--r--usr/src/uts/i86xpv/xpvd/Makefile2
-rw-r--r--usr/src/uts/i86xpv/xsvc/Makefile2
-rw-r--r--usr/src/uts/intel/FSS/Makefile2
-rw-r--r--usr/src/uts/intel/aac/Makefile2
-rw-r--r--usr/src/uts/intel/acpica/Makefile2
-rw-r--r--usr/src/uts/intel/aggr/Makefile2
-rw-r--r--usr/src/uts/intel/ahci/Makefile2
-rw-r--r--usr/src/uts/intel/arcmsr/Makefile2
-rw-r--r--usr/src/uts/intel/arn/Makefile2
-rw-r--r--usr/src/uts/intel/asy/Makefile2
-rw-r--r--usr/src/uts/intel/ata/Makefile2
-rw-r--r--usr/src/uts/intel/atge/Makefile2
-rw-r--r--usr/src/uts/intel/audio/Makefile2
-rw-r--r--usr/src/uts/intel/audiocmi/Makefile2
-rw-r--r--usr/src/uts/intel/audiocmihd/Makefile2
-rw-r--r--usr/src/uts/intel/audioemu10k/Makefile2
-rw-r--r--usr/src/uts/intel/audioens/Makefile2
-rw-r--r--usr/src/uts/intel/audiohd/Makefile2
-rw-r--r--usr/src/uts/intel/audiop16x/Makefile2
-rw-r--r--usr/src/uts/intel/audiopci/Makefile2
-rw-r--r--usr/src/uts/intel/audiosolo/Makefile2
-rw-r--r--usr/src/uts/intel/autofs/Makefile2
-rw-r--r--usr/src/uts/intel/av1394/Makefile2
-rw-r--r--usr/src/uts/intel/bfe/Makefile2
-rw-r--r--usr/src/uts/intel/bge/Makefile2
-rw-r--r--usr/src/uts/intel/blowfish/Makefile2
-rw-r--r--usr/src/uts/intel/bnxe/Makefile2
-rw-r--r--usr/src/uts/intel/bofi/Makefile2
-rw-r--r--usr/src/uts/intel/bpf/Makefile2
-rw-r--r--usr/src/uts/intel/bridge/Makefile2
-rw-r--r--usr/src/uts/intel/bscv/Makefile2
-rw-r--r--usr/src/uts/intel/busra/Makefile2
-rw-r--r--usr/src/uts/intel/c2audit/Makefile2
-rw-r--r--usr/src/uts/intel/cardbus/Makefile2
-rw-r--r--usr/src/uts/intel/cmdk/Makefile2
-rw-r--r--usr/src/uts/intel/cmlb/Makefile2
-rw-r--r--usr/src/uts/intel/core_pcbe/Makefile2
-rw-r--r--usr/src/uts/intel/cryptmod/Makefile2
-rw-r--r--usr/src/uts/intel/crypto/Makefile2
-rw-r--r--usr/src/uts/intel/cryptoadm/Makefile2
-rw-r--r--usr/src/uts/intel/ctf/Makefile2
-rw-r--r--usr/src/uts/intel/daplt/Makefile2
-rw-r--r--usr/src/uts/intel/dcam1394/Makefile2
-rw-r--r--usr/src/uts/intel/dcfs/Makefile2
-rw-r--r--usr/src/uts/intel/des/Makefile2
-rw-r--r--usr/src/uts/intel/dev/Makefile2
-rw-r--r--usr/src/uts/intel/devinfo/Makefile2
-rw-r--r--usr/src/uts/intel/dld/Makefile2
-rw-r--r--usr/src/uts/intel/dls/Makefile2
-rw-r--r--usr/src/uts/intel/dmfe/Makefile2
-rw-r--r--usr/src/uts/intel/dnet/Makefile2
-rw-r--r--usr/src/uts/intel/doorfs/Makefile2
-rw-r--r--usr/src/uts/intel/dscpmk/Makefile2
-rw-r--r--usr/src/uts/intel/dtrace/Makefile2
-rw-r--r--usr/src/uts/intel/e1000g/Makefile2
-rw-r--r--usr/src/uts/intel/ecc/Makefile2
-rw-r--r--usr/src/uts/intel/ecpp/Makefile2
-rw-r--r--usr/src/uts/intel/efe/Makefile2
-rw-r--r--usr/src/uts/intel/ehci/Makefile2
-rw-r--r--usr/src/uts/intel/eibnx/Makefile2
-rw-r--r--usr/src/uts/intel/elfexec/Makefile2
-rw-r--r--usr/src/uts/intel/elxl/Makefile2
-rw-r--r--usr/src/uts/intel/emlxs/Makefile2
-rw-r--r--usr/src/uts/intel/emul64/Makefile2
-rw-r--r--usr/src/uts/intel/eoib/Makefile2
-rw-r--r--usr/src/uts/intel/fasttrap/Makefile2
-rw-r--r--usr/src/uts/intel/fcp/Makefile2
-rw-r--r--usr/src/uts/intel/fcsm/Makefile2
-rw-r--r--usr/src/uts/intel/fct/Makefile2
-rw-r--r--usr/src/uts/intel/fctl/Makefile2
-rw-r--r--usr/src/uts/intel/fd/Makefile2
-rw-r--r--usr/src/uts/intel/flowacct/Makefile2
-rw-r--r--usr/src/uts/intel/fp/Makefile2
-rw-r--r--usr/src/uts/intel/genunix/Makefile2
-rw-r--r--usr/src/uts/intel/gld/Makefile2
-rw-r--r--usr/src/uts/intel/hci1394/Makefile2
-rw-r--r--usr/src/uts/intel/hermon/Makefile2
-rw-r--r--usr/src/uts/intel/hidparser/Makefile2
-rw-r--r--usr/src/uts/intel/hme/Makefile2
-rw-r--r--usr/src/uts/intel/hook/Makefile2
-rw-r--r--usr/src/uts/intel/hpcsvc/Makefile2
-rw-r--r--usr/src/uts/intel/hsfs/Makefile2
-rw-r--r--usr/src/uts/intel/hxge/Makefile2
-rw-r--r--usr/src/uts/intel/ib/Makefile2
-rw-r--r--usr/src/uts/intel/ibcm/Makefile2
-rw-r--r--usr/src/uts/intel/ibdm/Makefile2
-rw-r--r--usr/src/uts/intel/ibmf/Makefile2
-rw-r--r--usr/src/uts/intel/ibp/Makefile2
-rw-r--r--usr/src/uts/intel/ibtl/Makefile2
-rw-r--r--usr/src/uts/intel/idm/Makefile2
-rw-r--r--usr/src/uts/intel/igb/Makefile2
-rw-r--r--usr/src/uts/intel/intel_nb5000/Makefile2
-rw-r--r--usr/src/uts/intel/intel_nhm/Makefile2
-rw-r--r--usr/src/uts/intel/ip/Makefile2
-rw-r--r--usr/src/uts/intel/ipc/Makefile2
-rw-r--r--usr/src/uts/intel/ipf/Makefile2
-rw-r--r--usr/src/uts/intel/ipgpc/Makefile2
-rw-r--r--usr/src/uts/intel/ipsecah/Makefile2
-rw-r--r--usr/src/uts/intel/ipsecesp/Makefile2
-rw-r--r--usr/src/uts/intel/iptun/Makefile2
-rw-r--r--usr/src/uts/intel/ipw/Makefile2
-rw-r--r--usr/src/uts/intel/iscsi/Makefile2
-rw-r--r--usr/src/uts/intel/iscsit/Makefile2
-rw-r--r--usr/src/uts/intel/iser/Makefile2
-rw-r--r--usr/src/uts/intel/iwh/Makefile2
-rw-r--r--usr/src/uts/intel/iwk/Makefile2
-rw-r--r--usr/src/uts/intel/iwp/Makefile2
-rw-r--r--usr/src/uts/intel/ixgbe/Makefile2
-rw-r--r--usr/src/uts/intel/kaio/Makefile2
-rw-r--r--usr/src/uts/intel/kcf/Makefile2
-rw-r--r--usr/src/uts/intel/kgssapi/Makefile2
-rw-r--r--usr/src/uts/intel/kmech_krb5/Makefile2
-rw-r--r--usr/src/uts/intel/kssl/Makefile2
-rw-r--r--usr/src/uts/intel/ksslf/Makefile2
-rw-r--r--usr/src/uts/intel/kstat/Makefile2
-rw-r--r--usr/src/uts/intel/ldterm/Makefile2
-rw-r--r--usr/src/uts/intel/llc1/Makefile2
-rw-r--r--usr/src/uts/intel/lofi/Makefile2
-rw-r--r--usr/src/uts/intel/mac/Makefile2
-rw-r--r--usr/src/uts/intel/mc-amd/Makefile2
-rw-r--r--usr/src/uts/intel/mega_sas/Makefile2
-rw-r--r--usr/src/uts/intel/mii/Makefile2
-rw-r--r--usr/src/uts/intel/mpt_sas/Makefile2
-rw-r--r--usr/src/uts/intel/mr_sas/Makefile2
-rw-r--r--usr/src/uts/intel/msgsys/Makefile2
-rw-r--r--usr/src/uts/intel/mwl/Makefile2
-rw-r--r--usr/src/uts/intel/net80211/Makefile2
-rw-r--r--usr/src/uts/intel/nfs/Makefile2
-rw-r--r--usr/src/uts/intel/nfssrv/Makefile2
-rw-r--r--usr/src/uts/intel/nge/Makefile2
-rw-r--r--usr/src/uts/intel/nv_sata/Makefile2
-rw-r--r--usr/src/uts/intel/nxge/Makefile2
-rw-r--r--usr/src/uts/intel/objfs/Makefile2
-rw-r--r--usr/src/uts/intel/oce/Makefile2
-rw-r--r--usr/src/uts/intel/ohci/Makefile2
-rw-r--r--usr/src/uts/intel/openeepr/Makefile2
-rw-r--r--usr/src/uts/intel/p4_pcbe/Makefile2
-rw-r--r--usr/src/uts/intel/pcfs/Makefile2
-rw-r--r--usr/src/uts/intel/pcic/Makefile2
-rw-r--r--usr/src/uts/intel/pcicfg/Makefile2
-rw-r--r--usr/src/uts/intel/pcmcia/Makefile2
-rw-r--r--usr/src/uts/intel/pm/Makefile2
-rw-r--r--usr/src/uts/intel/pmcs/Makefile2
-rw-r--r--usr/src/uts/intel/poll/Makefile2
-rw-r--r--usr/src/uts/intel/portfs/Makefile2
-rw-r--r--usr/src/uts/intel/pppt/Makefile2
-rw-r--r--usr/src/uts/intel/procfs/Makefile2
-rw-r--r--usr/src/uts/intel/ptem/Makefile2
-rw-r--r--usr/src/uts/intel/qlc/Makefile2
-rw-r--r--usr/src/uts/intel/qlge/Makefile2
-rw-r--r--usr/src/uts/intel/qlt/Makefile2
-rw-r--r--usr/src/uts/intel/rds/Makefile2
-rw-r--r--usr/src/uts/intel/rdsib/Makefile2
-rw-r--r--usr/src/uts/intel/rdsv3/Makefile2
-rw-r--r--usr/src/uts/intel/rge/Makefile2
-rw-r--r--usr/src/uts/intel/rlmod/Makefile2
-rw-r--r--usr/src/uts/intel/rpcib/Makefile2
-rw-r--r--usr/src/uts/intel/rpcmod/Makefile2
-rw-r--r--usr/src/uts/intel/rpcsec/Makefile2
-rw-r--r--usr/src/uts/intel/rsa/Makefile2
-rw-r--r--usr/src/uts/intel/rsm/Makefile2
-rw-r--r--usr/src/uts/intel/rtls/Makefile2
-rw-r--r--usr/src/uts/intel/s1394/Makefile2
-rw-r--r--usr/src/uts/intel/sad/Makefile2
-rw-r--r--usr/src/uts/intel/sata/Makefile2
-rw-r--r--usr/src/uts/intel/scsa1394/Makefile2
-rw-r--r--usr/src/uts/intel/scsa2usb/Makefile2
-rw-r--r--usr/src/uts/intel/scsi/Makefile2
-rw-r--r--usr/src/uts/intel/scsi_vhci/Makefile2
-rw-r--r--usr/src/uts/intel/semsys/Makefile2
-rw-r--r--usr/src/uts/intel/sfe/Makefile2
-rw-r--r--usr/src/uts/intel/sgen/Makefile2
-rw-r--r--usr/src/uts/intel/sha2/Makefile2
-rw-r--r--usr/src/uts/intel/si3124/Makefile2
-rw-r--r--usr/src/uts/intel/smbfs/Makefile2
-rw-r--r--usr/src/uts/intel/sockfs/Makefile2
-rw-r--r--usr/src/uts/intel/sockpfp/Makefile2
-rw-r--r--usr/src/uts/intel/socksctp/Makefile2
-rw-r--r--usr/src/uts/intel/socksdp/Makefile2
-rw-r--r--usr/src/uts/intel/softmac/Makefile2
-rw-r--r--usr/src/uts/intel/sol_ofs/Makefile2
-rw-r--r--usr/src/uts/intel/sol_umad/Makefile2
-rw-r--r--usr/src/uts/intel/spdsock/Makefile2
-rw-r--r--usr/src/uts/intel/specfs/Makefile2
-rw-r--r--usr/src/uts/intel/sppp/Makefile2
-rw-r--r--usr/src/uts/intel/spppcomp/Makefile2
-rw-r--r--usr/src/uts/intel/sppptun/Makefile2
-rw-r--r--usr/src/uts/intel/srn/Makefile2
-rw-r--r--usr/src/uts/intel/st/Makefile2
-rw-r--r--usr/src/uts/intel/stmf/Makefile2
-rw-r--r--usr/src/uts/intel/stmf_sbd/Makefile2
-rw-r--r--usr/src/uts/intel/tavor/Makefile2
-rw-r--r--usr/src/uts/intel/tem/Makefile2
-rw-r--r--usr/src/uts/intel/tl/Makefile2
-rw-r--r--usr/src/uts/intel/tmpfs/Makefile2
-rw-r--r--usr/src/uts/intel/tnf/Makefile2
-rw-r--r--usr/src/uts/intel/trill/Makefile2
-rw-r--r--usr/src/uts/intel/udfs/Makefile2
-rw-r--r--usr/src/uts/intel/ufs/Makefile2
-rw-r--r--usr/src/uts/intel/ugen/Makefile2
-rw-r--r--usr/src/uts/intel/uhci/Makefile2
-rw-r--r--usr/src/uts/intel/urf/Makefile2
-rw-r--r--usr/src/uts/intel/urtw/Makefile2
-rw-r--r--usr/src/uts/intel/usb_ac/Makefile2
-rw-r--r--usr/src/uts/intel/usb_ah/Makefile2
-rw-r--r--usr/src/uts/intel/usbftdi/Makefile2
-rw-r--r--usr/src/uts/intel/usbgem/Makefile2
-rw-r--r--usr/src/uts/intel/usbms/Makefile2
-rw-r--r--usr/src/uts/intel/usbsacm/Makefile2
-rw-r--r--usr/src/uts/intel/usbsksp/Makefile2
-rw-r--r--usr/src/uts/intel/usbsprl/Makefile2
-rw-r--r--usr/src/uts/intel/usbvc/Makefile2
-rw-r--r--usr/src/uts/intel/usbwcm/Makefile2
-rw-r--r--usr/src/uts/intel/vnic/Makefile2
-rw-r--r--usr/src/uts/intel/vr/Makefile2
-rw-r--r--usr/src/uts/intel/vuid2ps2/Makefile2
-rw-r--r--usr/src/uts/intel/vuid3ps2/Makefile2
-rw-r--r--usr/src/uts/intel/vuidm3p/Makefile2
-rw-r--r--usr/src/uts/intel/vuidm4p/Makefile2
-rw-r--r--usr/src/uts/intel/vuidm5p/Makefile2
-rw-r--r--usr/src/uts/intel/wc/Makefile2
-rw-r--r--usr/src/uts/intel/xge/Makefile2
-rw-r--r--usr/src/uts/intel/zut/Makefile2
-rw-r--r--usr/src/uts/intel/zyd/Makefile2
-rw-r--r--usr/src/uts/sparc/FSS/Makefile2
-rw-r--r--usr/src/uts/sparc/aac/Makefile2
-rw-r--r--usr/src/uts/sparc/aggr/Makefile2
-rw-r--r--usr/src/uts/sparc/audio/Makefile2
-rw-r--r--usr/src/uts/sparc/audiocs/Makefile2
-rw-r--r--usr/src/uts/sparc/audioens/Makefile2
-rw-r--r--usr/src/uts/sparc/audiop16x/Makefile2
-rw-r--r--usr/src/uts/sparc/audiopci/Makefile2
-rw-r--r--usr/src/uts/sparc/autofs/Makefile2
-rw-r--r--usr/src/uts/sparc/av1394/Makefile2
-rw-r--r--usr/src/uts/sparc/bge/Makefile2
-rw-r--r--usr/src/uts/sparc/blowfish/Makefile2
-rw-r--r--usr/src/uts/sparc/bnxe/Makefile2
-rw-r--r--usr/src/uts/sparc/bofi/Makefile2
-rw-r--r--usr/src/uts/sparc/bpf/Makefile2
-rw-r--r--usr/src/uts/sparc/bridge/Makefile2
-rw-r--r--usr/src/uts/sparc/busra/Makefile2
-rw-r--r--usr/src/uts/sparc/c2audit/Makefile2
-rw-r--r--usr/src/uts/sparc/cardbus/Makefile2
-rw-r--r--usr/src/uts/sparc/cmlb/Makefile2
-rw-r--r--usr/src/uts/sparc/cryptmod/Makefile2
-rw-r--r--usr/src/uts/sparc/crypto/Makefile2
-rw-r--r--usr/src/uts/sparc/cryptoadm/Makefile2
-rw-r--r--usr/src/uts/sparc/ctf/Makefile2
-rw-r--r--usr/src/uts/sparc/dad/Makefile2
-rw-r--r--usr/src/uts/sparc/daplt/Makefile2
-rw-r--r--usr/src/uts/sparc/dcam1394/Makefile2
-rw-r--r--usr/src/uts/sparc/dcfs/Makefile2
-rw-r--r--usr/src/uts/sparc/des/Makefile2
-rw-r--r--usr/src/uts/sparc/dev/Makefile2
-rw-r--r--usr/src/uts/sparc/devinfo/Makefile2
-rw-r--r--usr/src/uts/sparc/dld/Makefile2
-rw-r--r--usr/src/uts/sparc/dls/Makefile2
-rw-r--r--usr/src/uts/sparc/dmfe/Makefile2
-rw-r--r--usr/src/uts/sparc/doorfs/Makefile2
-rw-r--r--usr/src/uts/sparc/dscpmk/Makefile2
-rw-r--r--usr/src/uts/sparc/dtrace/Makefile2
-rw-r--r--usr/src/uts/sparc/e1000g/Makefile2
-rw-r--r--usr/src/uts/sparc/ecc/Makefile2
-rw-r--r--usr/src/uts/sparc/ecpp/Makefile2
-rw-r--r--usr/src/uts/sparc/efe/Makefile2
-rw-r--r--usr/src/uts/sparc/ehci/Makefile2
-rw-r--r--usr/src/uts/sparc/eibnx/Makefile2
-rw-r--r--usr/src/uts/sparc/elfexec/Makefile2
-rw-r--r--usr/src/uts/sparc/emlxs/Makefile2
-rw-r--r--usr/src/uts/sparc/emul64/Makefile2
-rw-r--r--usr/src/uts/sparc/eoib/Makefile2
-rw-r--r--usr/src/uts/sparc/fas/Makefile2
-rw-r--r--usr/src/uts/sparc/fasttrap/Makefile2
-rw-r--r--usr/src/uts/sparc/fbt/Makefile2
-rw-r--r--usr/src/uts/sparc/fcp/Makefile2
-rw-r--r--usr/src/uts/sparc/fcpci/Makefile2
-rw-r--r--usr/src/uts/sparc/fcsm/Makefile2
-rw-r--r--usr/src/uts/sparc/fct/Makefile2
-rw-r--r--usr/src/uts/sparc/fctl/Makefile2
-rw-r--r--usr/src/uts/sparc/flowacct/Makefile2
-rw-r--r--usr/src/uts/sparc/fp/Makefile2
-rw-r--r--usr/src/uts/sparc/gld/Makefile2
-rw-r--r--usr/src/uts/sparc/hci1394/Makefile2
-rw-r--r--usr/src/uts/sparc/hermon/Makefile2
-rw-r--r--usr/src/uts/sparc/hidparser/Makefile2
-rw-r--r--usr/src/uts/sparc/hme/Makefile2
-rw-r--r--usr/src/uts/sparc/hook/Makefile2
-rw-r--r--usr/src/uts/sparc/hpcsvc/Makefile2
-rw-r--r--usr/src/uts/sparc/hsfs/Makefile2
-rw-r--r--usr/src/uts/sparc/hxge/Makefile2
-rw-r--r--usr/src/uts/sparc/ib/Makefile2
-rw-r--r--usr/src/uts/sparc/ibcm/Makefile2
-rw-r--r--usr/src/uts/sparc/ibdm/Makefile2
-rw-r--r--usr/src/uts/sparc/ibmf/Makefile2
-rw-r--r--usr/src/uts/sparc/ibp/Makefile2
-rw-r--r--usr/src/uts/sparc/ibtl/Makefile2
-rw-r--r--usr/src/uts/sparc/idm/Makefile2
-rw-r--r--usr/src/uts/sparc/igb/Makefile2
-rw-r--r--usr/src/uts/sparc/ip/Makefile2
-rw-r--r--usr/src/uts/sparc/ipc/Makefile2
-rw-r--r--usr/src/uts/sparc/ipf/Makefile2
-rw-r--r--usr/src/uts/sparc/ipgpc/Makefile2
-rw-r--r--usr/src/uts/sparc/ipsecah/Makefile2
-rw-r--r--usr/src/uts/sparc/ipsecesp/Makefile2
-rw-r--r--usr/src/uts/sparc/iptun/Makefile2
-rw-r--r--usr/src/uts/sparc/iscsi/Makefile2
-rw-r--r--usr/src/uts/sparc/iscsit/Makefile2
-rw-r--r--usr/src/uts/sparc/iser/Makefile2
-rw-r--r--usr/src/uts/sparc/ixgbe/Makefile2
-rw-r--r--usr/src/uts/sparc/kaio/Makefile2
-rw-r--r--usr/src/uts/sparc/kb8042/Makefile2
-rw-r--r--usr/src/uts/sparc/kcf/Makefile2
-rw-r--r--usr/src/uts/sparc/kgssapi/Makefile2
-rw-r--r--usr/src/uts/sparc/kmech_krb5/Makefile2
-rw-r--r--usr/src/uts/sparc/kssl/Makefile2
-rw-r--r--usr/src/uts/sparc/ksslf/Makefile2
-rw-r--r--usr/src/uts/sparc/kstat/Makefile2
-rw-r--r--usr/src/uts/sparc/ldterm/Makefile2
-rw-r--r--usr/src/uts/sparc/llc1/Makefile2
-rw-r--r--usr/src/uts/sparc/lofi/Makefile2
-rw-r--r--usr/src/uts/sparc/mac/Makefile2
-rw-r--r--usr/src/uts/sparc/mii/Makefile2
-rw-r--r--usr/src/uts/sparc/mpt_sas/Makefile2
-rw-r--r--usr/src/uts/sparc/mr_sas/Makefile2
-rw-r--r--usr/src/uts/sparc/msgsys/Makefile2
-rw-r--r--usr/src/uts/sparc/nfs/Makefile2
-rw-r--r--usr/src/uts/sparc/nfssrv/Makefile2
-rw-r--r--usr/src/uts/sparc/objfs/Makefile2
-rw-r--r--usr/src/uts/sparc/oce/Makefile2
-rw-r--r--usr/src/uts/sparc/ohci/Makefile2
-rw-r--r--usr/src/uts/sparc/openeepr/Makefile2
-rw-r--r--usr/src/uts/sparc/pcfs/Makefile2
-rw-r--r--usr/src/uts/sparc/pcic/Makefile2
-rw-r--r--usr/src/uts/sparc/pcicfg/Makefile2
-rw-r--r--usr/src/uts/sparc/pcmcia/Makefile2
-rw-r--r--usr/src/uts/sparc/pm/Makefile2
-rw-r--r--usr/src/uts/sparc/pmcs/Makefile2
-rw-r--r--usr/src/uts/sparc/poll/Makefile2
-rw-r--r--usr/src/uts/sparc/portfs/Makefile2
-rw-r--r--usr/src/uts/sparc/pppt/Makefile2
-rw-r--r--usr/src/uts/sparc/procfs/Makefile2
-rw-r--r--usr/src/uts/sparc/ptem/Makefile2
-rw-r--r--usr/src/uts/sparc/qlc/Makefile2
-rw-r--r--usr/src/uts/sparc/qlge/Makefile2
-rw-r--r--usr/src/uts/sparc/qlt/Makefile2
-rw-r--r--usr/src/uts/sparc/rds/Makefile2
-rw-r--r--usr/src/uts/sparc/rdsib/Makefile2
-rw-r--r--usr/src/uts/sparc/rdsv3/Makefile2
-rw-r--r--usr/src/uts/sparc/rge/Makefile2
-rw-r--r--usr/src/uts/sparc/rlmod/Makefile2
-rw-r--r--usr/src/uts/sparc/rpcib/Makefile2
-rw-r--r--usr/src/uts/sparc/rpcmod/Makefile2
-rw-r--r--usr/src/uts/sparc/rpcsec/Makefile2
-rw-r--r--usr/src/uts/sparc/rsa/Makefile2
-rw-r--r--usr/src/uts/sparc/rsm/Makefile2
-rw-r--r--usr/src/uts/sparc/rtls/Makefile2
-rw-r--r--usr/src/uts/sparc/s1394/Makefile2
-rw-r--r--usr/src/uts/sparc/sad/Makefile2
-rw-r--r--usr/src/uts/sparc/sata/Makefile2
-rw-r--r--usr/src/uts/sparc/scsa1394/Makefile2
-rw-r--r--usr/src/uts/sparc/scsa2usb/Makefile2
-rw-r--r--usr/src/uts/sparc/scsi/Makefile2
-rw-r--r--usr/src/uts/sparc/scsi_vhci/Makefile2
-rw-r--r--usr/src/uts/sparc/semsys/Makefile2
-rw-r--r--usr/src/uts/sparc/sfe/Makefile2
-rw-r--r--usr/src/uts/sparc/sgen/Makefile2
-rw-r--r--usr/src/uts/sparc/sha2/Makefile2
-rw-r--r--usr/src/uts/sparc/smbfs/Makefile2
-rw-r--r--usr/src/uts/sparc/socal/Makefile2
-rw-r--r--usr/src/uts/sparc/sockfs/Makefile2
-rw-r--r--usr/src/uts/sparc/sockpfp/Makefile2
-rw-r--r--usr/src/uts/sparc/socksctp/Makefile2
-rw-r--r--usr/src/uts/sparc/socksdp/Makefile2
-rw-r--r--usr/src/uts/sparc/softmac/Makefile2
-rw-r--r--usr/src/uts/sparc/sol_ofs/Makefile2
-rw-r--r--usr/src/uts/sparc/sol_umad/Makefile2
-rw-r--r--usr/src/uts/sparc/spdsock/Makefile2
-rw-r--r--usr/src/uts/sparc/specfs/Makefile2
-rw-r--r--usr/src/uts/sparc/sppp/Makefile2
-rw-r--r--usr/src/uts/sparc/spppcomp/Makefile2
-rw-r--r--usr/src/uts/sparc/sppptun/Makefile2
-rw-r--r--usr/src/uts/sparc/ssd/Makefile2
-rw-r--r--usr/src/uts/sparc/st/Makefile2
-rw-r--r--usr/src/uts/sparc/stmf/Makefile2
-rw-r--r--usr/src/uts/sparc/stmf_sbd/Makefile2
-rw-r--r--usr/src/uts/sparc/tavor/Makefile2
-rw-r--r--usr/src/uts/sparc/tem/Makefile2
-rw-r--r--usr/src/uts/sparc/tl/Makefile2
-rw-r--r--usr/src/uts/sparc/tmpfs/Makefile2
-rw-r--r--usr/src/uts/sparc/tnf/Makefile2
-rw-r--r--usr/src/uts/sparc/trill/Makefile2
-rw-r--r--usr/src/uts/sparc/udfs/Makefile2
-rw-r--r--usr/src/uts/sparc/ufs/Makefile2
-rw-r--r--usr/src/uts/sparc/ugen/Makefile2
-rw-r--r--usr/src/uts/sparc/uhci/Makefile2
-rw-r--r--usr/src/uts/sparc/usb_ac/Makefile2
-rw-r--r--usr/src/uts/sparc/usb_ah/Makefile2
-rw-r--r--usr/src/uts/sparc/usba/Makefile2
-rw-r--r--usr/src/uts/sparc/usbftdi/Makefile2
-rw-r--r--usr/src/uts/sparc/usbms/Makefile2
-rw-r--r--usr/src/uts/sparc/usbsacm/Makefile2
-rw-r--r--usr/src/uts/sparc/usbser/Makefile2
-rw-r--r--usr/src/uts/sparc/usbsksp/Makefile2
-rw-r--r--usr/src/uts/sparc/usbsprl/Makefile2
-rw-r--r--usr/src/uts/sparc/usbvc/Makefile2
-rw-r--r--usr/src/uts/sparc/usbwcm/Makefile2
-rw-r--r--usr/src/uts/sparc/vnic/Makefile2
-rw-r--r--usr/src/uts/sparc/vr/Makefile2
-rw-r--r--usr/src/uts/sparc/vuid3ps2/Makefile2
-rw-r--r--usr/src/uts/sparc/wc/Makefile2
-rw-r--r--usr/src/uts/sparc/xge/Makefile2
-rw-r--r--usr/src/uts/sparc/zut/Makefile2
-rw-r--r--usr/src/uts/sun4/vm/vm_dep.h3
-rw-r--r--usr/src/uts/sun4u/blade/bscv/Makefile2
-rw-r--r--usr/src/uts/sun4u/bootdev/Makefile2
-rw-r--r--usr/src/uts/sun4u/cheetah/Makefile2
-rw-r--r--usr/src/uts/sun4u/cheetahplus/Makefile2
-rw-r--r--usr/src/uts/sun4u/cpr/Makefile2
-rw-r--r--usr/src/uts/sun4u/db21554/Makefile2
-rw-r--r--usr/src/uts/sun4u/des/Makefile2
-rw-r--r--usr/src/uts/sun4u/ebus/Makefile2
-rw-r--r--usr/src/uts/sun4u/excalibur/xcalppm/Makefile2
-rw-r--r--usr/src/uts/sun4u/fd/Makefile2
-rw-r--r--usr/src/uts/sun4u/genunix/Makefile2
-rw-r--r--usr/src/uts/sun4u/hummingbird/Makefile2
-rw-r--r--usr/src/uts/sun4u/jalapeno/Makefile2
-rw-r--r--usr/src/uts/sun4u/javelin/envctrltwo/Makefile2
-rw-r--r--usr/src/uts/sun4u/lw8/ntwdt/Makefile2
-rw-r--r--usr/src/uts/sun4u/lw8/platmod/Makefile2
-rw-r--r--usr/src/uts/sun4u/mc-us3i/Makefile2
-rw-r--r--usr/src/uts/sun4u/nxge/Makefile2
-rw-r--r--usr/src/uts/sun4u/opl/dr/Makefile2
-rw-r--r--usr/src/uts/sun4u/opl/drmach/Makefile2
-rw-r--r--usr/src/uts/sun4u/opl/mc-opl/Makefile2
-rw-r--r--usr/src/uts/sun4u/opl/olympus_c/Makefile2
-rw-r--r--usr/src/uts/sun4u/opl/oplmsu/Makefile2
-rw-r--r--usr/src/uts/sun4u/opl/pcicmu/Makefile2
-rw-r--r--usr/src/uts/sun4u/opl/unix/Makefile2
-rw-r--r--usr/src/uts/sun4u/opl_cfg/Makefile2
-rw-r--r--usr/src/uts/sun4u/pca9556/Makefile2
-rw-r--r--usr/src/uts/sun4u/pcie/Makefile2
-rw-r--r--usr/src/uts/sun4u/pcipsy/Makefile2
-rw-r--r--usr/src/uts/sun4u/pcisch/Makefile2
-rw-r--r--usr/src/uts/sun4u/pmubus/Makefile2
-rw-r--r--usr/src/uts/sun4u/ppm/Makefile2
-rw-r--r--usr/src/uts/sun4u/px/Makefile2
-rw-r--r--usr/src/uts/sun4u/rootnex/Makefile2
-rw-r--r--usr/src/uts/sun4u/sbd/Makefile2
-rw-r--r--usr/src/uts/sun4u/sbus/Makefile2
-rw-r--r--usr/src/uts/sun4u/seeprom/Makefile2
-rw-r--r--usr/src/uts/sun4u/serengeti/cheetah/Makefile2
-rw-r--r--usr/src/uts/sun4u/serengeti/cheetahplus/Makefile2
-rw-r--r--usr/src/uts/sun4u/serengeti/platmod/Makefile2
-rw-r--r--usr/src/uts/sun4u/serengeti/sbdp/Makefile2
-rw-r--r--usr/src/uts/sun4u/serengeti/sgcn/Makefile2
-rw-r--r--usr/src/uts/sun4u/serengeti/sghsc/Makefile2
-rw-r--r--usr/src/uts/sun4u/serengeti/sgsbbc/Makefile2
-rw-r--r--usr/src/uts/sun4u/serengeti/unix/Makefile2
-rw-r--r--usr/src/uts/sun4u/serrano/Makefile2
-rw-r--r--usr/src/uts/sun4u/sf/Makefile2
-rw-r--r--usr/src/uts/sun4u/sha1/Makefile2
-rw-r--r--usr/src/uts/sun4u/spitfire/Makefile2
-rw-r--r--usr/src/uts/sun4u/su/Makefile2
-rw-r--r--usr/src/uts/sun4u/sunfire/ac/Makefile2
-rw-r--r--usr/src/uts/sun4u/sunfire/sysctrl/Makefile2
-rw-r--r--usr/src/uts/sun4u/tazmo/envctrl/Makefile2
-rw-r--r--usr/src/uts/sun4u/todds1287/Makefile2
-rw-r--r--usr/src/uts/sun4u/unix/Makefile2
-rw-r--r--usr/src/uts/sun4u/upa64s/Makefile2
-rw-r--r--usr/src/uts/sun4u/us/Makefile2
-rw-r--r--usr/src/uts/sun4u/vis/Makefile2
-rw-r--r--usr/src/uts/sun4u/zs/Makefile2
-rw-r--r--usr/src/uts/sun4v/bge/Makefile2
-rw-r--r--usr/src/uts/sun4v/bootdev/Makefile2
-rw-r--r--usr/src/uts/sun4v/dr_io/Makefile2
-rw-r--r--usr/src/uts/sun4v/ds/Makefile2
-rw-r--r--usr/src/uts/sun4v/ds_pri/Makefile2
-rw-r--r--usr/src/uts/sun4v/ebus/Makefile2
-rw-r--r--usr/src/uts/sun4v/genunix/Makefile2
-rw-r--r--usr/src/uts/sun4v/ldc/Makefile2
-rw-r--r--usr/src/uts/sun4v/n2rng/Makefile2
-rw-r--r--usr/src/uts/sun4v/niumx/Makefile2
-rw-r--r--usr/src/uts/sun4v/nxge/Makefile2
-rw-r--r--usr/src/uts/sun4v/ontario/tsalarm/Makefile2
-rw-r--r--usr/src/uts/sun4v/pcie/Makefile2
-rw-r--r--usr/src/uts/sun4v/platsvc/Makefile2
-rw-r--r--usr/src/uts/sun4v/px/Makefile2
-rw-r--r--usr/src/uts/sun4v/rootnex/Makefile2
-rw-r--r--usr/src/uts/sun4v/su/Makefile2
-rw-r--r--usr/src/uts/sun4v/unix/Makefile2
-rw-r--r--usr/src/uts/sun4v/vcc/Makefile2
-rw-r--r--usr/src/uts/sun4v/vdc/Makefile2
-rw-r--r--usr/src/uts/sun4v/vds/Makefile2
-rw-r--r--usr/src/uts/sun4v/vis/Makefile2
-rw-r--r--usr/src/uts/sun4v/vnet/Makefile2
-rw-r--r--usr/src/uts/sun4v/vsw/Makefile2
1029 files changed, 1073 insertions, 1287 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 11232d9c47..a2626023fa 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -460,6 +460,10 @@ CERRWARN += -_gcc=-Wno-missing-field-initializers
# Unfortunately, this option can misfire very easily and unfixably.
CERRWARN += -_gcc=-Wno-array-bounds
+# gcc4 lacks -Wno-maybe-uninitialized
+CNOWARN_UNINIT = -_gcc4=-Wno-uninitialized \
+ -_gcc7=-Wno-maybe-uninitialized \
+ -_gcc8=-Wno-maybe-uninitialized
CERRWARN += -_smatch=-p=illumos_user
include $(SRC)/Makefile.smatch
@@ -1248,8 +1252,3 @@ CPPFORPO=$(COMPILE.cpp:\"$(TEXT_DOMAIN)\"=TEXT_DOMAIN)
.xml.xmlchk:
$(MANIFEST_CHECK)
-
-#
-# Include rules to render automated sccs get rules "safe".
-#
-include $(SRC)/Makefile.noget
diff --git a/usr/src/Makefile.noget b/usr/src/Makefile.noget
deleted file mode 100644
index 7e6ef778b2..0000000000
--- a/usr/src/Makefile.noget
+++ /dev/null
@@ -1,236 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-
-#
-# Makefile.noget: disable automated "sccs get" which causes us no end
-# of trouble in as many different ways as possible.
-#
-# Ordinarily, we'd say "$(ONBLD_TOOLS)/bin/sccscheck" here, but make
-# has special knowledge of SCCS and will refuse to run an SCCS rule if
-# the target is a writeable file, for fear that it will be destroying
-# your edits in progress. But with .KEEP_STATE enabled, any change to
-# the command which would have been used to "build" the source file
-# forces the command to be re-run. So if your effective ONBLD_TOOLS
-# changes (for instance, if you do a nightly -t to populate a
-# workspace, and then "ws" into it to check out a file and then do
-# some selective builds, make will notice the change in the full path
-# of the "sccscheck" command, will seek to re-run it, and abort the
-# build because the checked-out file is writeable. So instead, by
-# default, we just use whichever sccscheck happens to be first in
-# $PATH and hope for the best. Those who don't entirely trust this
-# are of course welcome to consistently set SCCSCHECK in their
-# environment to override this.
-#
-SCCSCHECK=sccscheck
-GET=sccscheck
-
-# Deliberately sabotage other attempts to use "sccs get" from makefiles,
-# with flags known not to be accepted by "sccs get" or "get",
-# in the event that one of these rules is overridden elsewhere in the tree.
-SCCSFLAGS=--dont-get-it-now
-SCCSGETFLAGS=--dont-get-it-now
-GFLAGS=--dont-get-it-now
-
-# Disable these targets as well
-.SCCS_GET:
- $(SCCSCHECK) $@
-
-.SCCS_GET_POSIX:
- $(SCCSCHECK) $@
-
-.GET_POSIX:
- $(SCCSCHECK) $@
-
-# The list of ~-suffix rules here was extracted from a copy of
-# /usr/share/lib/make/make.rules
-# which was tagged:
-# "make.rules.file 1.21 03/11/14 SMI"
-#
-# These could be consolidated into a smaller number of targets but
-# are intentionally left as-is to facilitate cross-checking against
-# newer versions of make.rules
-#
-
-.c~:
- $(SCCSCHECK) $<
-
-.c~.o:
- $(SCCSCHECK) $<
-
-.c~.i:
- $(SCCSCHECK) $<
-
-.c~.ln:
- $(SCCSCHECK) $<
-
-.c~.a:
- $(SCCSCHECK) $<
-
-.y~:
- $(SCCSCHECK) $<
-
-.y~.c:
- $(SCCSCHECK) $<
-
-.y~.ln:
- $(SCCSCHECK) $<
-
-.y~.o:
- $(SCCSCHECK) $<
-
-.l~:
- $(SCCSCHECK) $<
-
-.l~.c:
- $(SCCSCHECK) $<
-
-.l~.ln:
- $(SCCSCHECK) $<
-
-.l~.o:
- $(SCCSCHECK) $<
-
-.cc~:
- $(SCCSCHECK) $<
-
-.cc~.o:
- $(SCCSCHECK) $<
-
-.cc~.i:
- $(SCCSCHECK) $<
-
-.cc~.a:
- $(SCCSCHECK) $<
-
-.C~:
- $(SCCSCHECK) $<
-
-.C~.o:
- $(SCCSCHECK) $<
-
-.C~.i:
- $(SCCSCHECK) $<
-
-.C~.a:
- $(SCCSCHECK) $<
-
-.f~:
- $(SCCSCHECK) $<
-
-.f~.o:
- $(SCCSCHECK) $<
-
-.f~.a:
- $(SCCSCHECK) $<
-
-.for~:
- $(SCCSCHECK) $<
-
-.for~.o:
- $(SCCSCHECK) $<
-
-.for~.a:
- $(SCCSCHECK) $<
-
-.F~:
- $(SCCSCHECK) $<
-
-.F~.o:
- $(SCCSCHECK) $<
-
-.F~.a:
- $(SCCSCHECK) $<
-
-.r~:
- $(SCCSCHECK) $<
-
-.r~.o:
- $(SCCSCHECK) $<
-
-.r~.a:
- $(SCCSCHECK) $<
-
-.f90~:
- $(SCCSCHECK) $<
-
-.f90~.o:
- $(SCCSCHECK) $<
-
-.f90~.a:
- $(SCCSCHECK) $<
-
-.ftn~:
- $(SCCSCHECK) $<
-
-.ftn~.o:
- $(SCCSCHECK) $<
-
-.ftn~.a:
- $(SCCSCHECK) $<
-
-.def~.sym:
- $(SCCSCHECK) $<
-
-.mod~:
- $(SCCSCHECK) $<
-
-.mod~.o:
- $(SCCSCHECK) $<
-
-.mod~.a:
- $(SCCSCHECK) $<
-
-.p~:
- $(SCCSCHECK) $<
-
-.p~.o:
- $(SCCSCHECK) $<
-
-.p~.a:
- $(SCCSCHECK) $<
-
-.s~.o:
- $(SCCSCHECK) $<
-
-.s~.a:
- $(SCCSCHECK) $<
-
-.S~.o:
- $(SCCSCHECK) $<
-
-.S~.a:
- $(SCCSCHECK) $<
-
-.sh~:
- $(SCCSCHECK) $<
-
-.cps~.h:
- $(SCCSCHECK) $<
-
-.java~.class:
- $(SCCSCHECK) $<
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
diff --git a/usr/src/lib/abi/apptrace/Makefile.com b/usr/src/lib/abi/apptrace/Makefile.com
index 224209a71d..8f760ac522 100644
--- a/usr/src/lib/abi/apptrace/Makefile.com
+++ b/usr/src/lib/abi/apptrace/Makefile.com
@@ -32,7 +32,7 @@ include ../../Makefile.abi
LIBS = $(DYNLIB)
CPPFLAGS = -I. $(CPPFLAGS.master)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# No mapfile here
MAPFILES =
diff --git a/usr/src/lib/auditd_plugins/syslog/Makefile.com b/usr/src/lib/auditd_plugins/syslog/Makefile.com
index 624707fa3f..57f13b9b3c 100644
--- a/usr/src/lib/auditd_plugins/syslog/Makefile.com
+++ b/usr/src/lib/auditd_plugins/syslog/Makefile.com
@@ -49,7 +49,7 @@ CPPFLAGS += -I$(PRAUDIT)
CPPFLAGS += -I$(LIBBSM)
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
index 242ef383b7..2402984c2e 100644
--- a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
+++ b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
@@ -86,7 +86,7 @@ LDLIBS += -lc -lmapmalloc
LINTFLAGS += -erroff=E_STATIC_UNUSED
LINTFLAGS64 += -erroff=E_STATIC_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(LIBS):= PICS += $(SHAREDOBJS)
diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile.com b/usr/src/lib/cfgadm_plugins/fp/Makefile.com
index e319918c1b..f2cc0b2c64 100644
--- a/usr/src/lib/cfgadm_plugins/fp/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/fp/Makefile.com
@@ -47,7 +47,7 @@ CFLAGS64 += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-address
diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile.com b/usr/src/lib/cfgadm_plugins/ib/Makefile.com
index 97a2a1816b..d027235875 100644
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile.com
@@ -46,7 +46,7 @@ CFLAGS64 += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
# not linted
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile.com b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
index 7abe51ddef..33324f565b 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
@@ -50,7 +50,7 @@ LDLIBS += -lc -ldevice -ldevinfo -lrcm
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile.com b/usr/src/lib/cfgadm_plugins/sata/Makefile.com
index 1526413a4e..6859fdde2a 100644
--- a/usr/src/lib/cfgadm_plugins/sata/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sata/Makefile.com
@@ -45,7 +45,7 @@ CFLAGS64 += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lc -ldevice -ldevinfo -lrcm -lnvpair
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
index 39e160404a..2b8f7f5272 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
@@ -50,7 +50,7 @@ LDLIBS += -lc -lkstat -lnvpair
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
index 0b75b01975..558f0327df 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
@@ -41,7 +41,7 @@ LIBS= $(DYNLIB)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
# not linted
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
index e099697a93..6bd681a4a7 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
@@ -50,7 +50,7 @@ LIBS= $(DYNLIB)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
CERRWARN += -_gcc=-Wno-char-subscripts
diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile.com b/usr/src/lib/cfgadm_plugins/shp/Makefile.com
index 8771bcced3..f870d9c700 100644
--- a/usr/src/lib/cfgadm_plugins/shp/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/shp/Makefile.com
@@ -50,7 +50,7 @@ LDLIBS += -lc -ldevinfo -lhotplug
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
# not linted
diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
index f25d1771d0..8fc548cc33 100644
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
@@ -55,7 +55,7 @@ CPPFLAGS += -I$(ROOT)/usr/platform/$(PLATFORM)/include
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile.com b/usr/src/lib/cfgadm_plugins/usb/Makefile.com
index 833c9a6a6d..d1bb4af578 100644
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile.com
@@ -46,7 +46,7 @@ CFLAGS64 += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
# not linted
diff --git a/usr/src/lib/efcode/Makefile.efcode b/usr/src/lib/efcode/Makefile.efcode
index b88f04d40a..5bf50c353f 100644
--- a/usr/src/lib/efcode/Makefile.efcode
+++ b/usr/src/lib/efcode/Makefile.efcode
@@ -50,7 +50,7 @@ CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
EFCODE64DIR = /usr/lib/efcode/$(MACH64)
diff --git a/usr/src/lib/efcode/interpreter/Makefile b/usr/src/lib/efcode/interpreter/Makefile
index d7475b45bb..24dd12ef3c 100644
--- a/usr/src/lib/efcode/interpreter/Makefile
+++ b/usr/src/lib/efcode/interpreter/Makefile
@@ -35,7 +35,7 @@ ROOTCMDDIR = $(EFCODEDIR64)
CPPFLAGS += -DDEBUG -DFCODE_INTERNAL
CPPFLAGS += -I ../include -I $(ROOT)/usr/platform/sun4u/include
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -R/usr/lib/efcode/$(MACH64) -M mapfile64
LIBS = fcode.so fcdriver.so
diff --git a/usr/src/lib/fm/libfmd_log/Makefile.com b/usr/src/lib/fm/libfmd_log/Makefile.com
index 6a93e83f61..6bdfd3bbe0 100644
--- a/usr/src/lib/fm/libfmd_log/Makefile.com
+++ b/usr/src/lib/fm/libfmd_log/Makefile.com
@@ -40,7 +40,7 @@ SRCDIR = ../common
CPPFLAGS += -I../common -I.
CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lexacct -lnvpair -lgen -lc
LINTFLAGS = -msux
diff --git a/usr/src/lib/fm/libfmd_msg/Makefile.com b/usr/src/lib/fm/libfmd_msg/Makefile.com
index 31c9047656..471a550216 100644
--- a/usr/src/lib/fm/libfmd_msg/Makefile.com
+++ b/usr/src/lib/fm/libfmd_msg/Makefile.com
@@ -42,7 +42,7 @@ CPPFLAGS += -I../common -I.
CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns
diff --git a/usr/src/lib/fm/libfmevent/Makefile.com b/usr/src/lib/fm/libfmevent/Makefile.com
index 4243705988..81352b3076 100644
--- a/usr/src/lib/fm/libfmevent/Makefile.com
+++ b/usr/src/lib/fm/libfmevent/Makefile.com
@@ -61,7 +61,7 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
FMLIBDIR=usr/lib/fm
$(BUILD64)FMLIBDIR64=usr/lib/fm/$(MACH64)
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com
index 4f397a589e..d50d99434d 100644
--- a/usr/src/lib/fm/topo/libtopo/Makefile.com
+++ b/usr/src/lib/fm/topo/libtopo/Makefile.com
@@ -80,7 +80,7 @@ CSTD = $(CSTD_GNU99)
CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin
index 1ec87f6970..bbd7cb76e7 100644
--- a/usr/src/lib/fm/topo/modules/Makefile.plugin
+++ b/usr/src/lib/fm/topo/modules/Makefile.plugin
@@ -58,7 +58,7 @@ ROOTCONF = $($(CLASS)_ROOTCONF)
LINTFLAGS = -msux
LINTFILES = $(MODULESRCS:%.c=%.ln) $(SHAREDSRCS:%.c=%.ln)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
APIMAP = ../../../libtopo/common/topo_mod.map
diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
index 5b71525c9d..5c527bd27d 100644
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
@@ -49,7 +49,7 @@ CPPFLAGS += -I../mech -I../crypto -I$(SRC)/uts/common/gssapi/include
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
index 4e46b287f7..d8f784220a 100644
--- a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
@@ -42,7 +42,7 @@ CPPFLAGS += -I../../libgss -I$(SRC)/uts/common/gssapi/include \
-I$(ROOT)/usr/include/gssapi
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index f73f15c1a5..f60e973d26 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -255,7 +255,7 @@ CPPFLAGS += $(KRB5_DEFS)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-but-set-variable
diff --git a/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/gic_pwd.c b/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/gic_pwd.c
index 150b894870..3b44373a01 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/gic_pwd.c
+++ b/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/gic_pwd.c
@@ -1,6 +1,10 @@
/*
* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. */
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
+
#include "k5-int.h"
#include "com_err.h"
#include <admin.h>
@@ -519,34 +523,34 @@ krb5_error_code krb5int_populate_gic_opt (
{
int i;
krb5_int32 starttime;
- krb5_get_init_creds_opt *opt;
+ krb5_get_init_creds_opt opt;
- krb5_get_init_creds_opt_init(opt);
+ krb5_get_init_creds_opt_init(&opt);
if (addrs)
- krb5_get_init_creds_opt_set_address_list(opt, (krb5_address **) addrs);
+ krb5_get_init_creds_opt_set_address_list(&opt, (krb5_address **) addrs);
if (ktypes) {
for (i=0; ktypes[i]; i++);
if (i)
- krb5_get_init_creds_opt_set_etype_list(opt, ktypes, i);
+ krb5_get_init_creds_opt_set_etype_list(&opt, ktypes, i);
}
if (pre_auth_types) {
for (i=0; pre_auth_types[i]; i++);
if (i)
- krb5_get_init_creds_opt_set_preauth_list(opt, pre_auth_types, i);
+ krb5_get_init_creds_opt_set_preauth_list(&opt, pre_auth_types, i);
}
if (options&KDC_OPT_FORWARDABLE)
- krb5_get_init_creds_opt_set_forwardable(opt, 1);
- else krb5_get_init_creds_opt_set_forwardable(opt, 0);
+ krb5_get_init_creds_opt_set_forwardable(&opt, 1);
+ else krb5_get_init_creds_opt_set_forwardable(&opt, 0);
if (options&KDC_OPT_PROXIABLE)
- krb5_get_init_creds_opt_set_proxiable(opt, 1);
- else krb5_get_init_creds_opt_set_proxiable(opt, 0);
+ krb5_get_init_creds_opt_set_proxiable(&opt, 1);
+ else krb5_get_init_creds_opt_set_proxiable(&opt, 0);
if (creds && creds->times.endtime) {
krb5_timeofday(context, &starttime);
if (creds->times.starttime) starttime = creds->times.starttime;
- krb5_get_init_creds_opt_set_tkt_life(opt, creds->times.endtime - starttime);
+ krb5_get_init_creds_opt_set_tkt_life(&opt, creds->times.endtime - starttime);
}
- return krb5int_gic_opt_to_opte(context, opt, opte, 0,
+ return krb5int_gic_opt_to_opte(context, &opt, opte, 0,
"krb5int_populate_gic_opt");
}
diff --git a/usr/src/lib/hbaapi/Makefile.com b/usr/src/lib/hbaapi/Makefile.com
index cc38763048..936d204b85 100644
--- a/usr/src/lib/hbaapi/Makefile.com
+++ b/usr/src/lib/hbaapi/Makefile.com
@@ -41,7 +41,7 @@ SRCDIR= ../common
INCS += -I$(SRCDIR)
CPPFLAGS += $(INCS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile.com b/usr/src/lib/krb5/kadm5/clnt/Makefile.com
index ba382f0ce9..7d1ba760d9 100644
--- a/usr/src/lib/krb5/kadm5/clnt/Makefile.com
+++ b/usr/src/lib/krb5/kadm5/clnt/Makefile.com
@@ -85,7 +85,7 @@ CFLAGS += $(CCVERBOSE) -I..
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns,indenting,no_if_block
diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile.com b/usr/src/lib/krb5/kadm5/srv/Makefile.com
index 2f5a4eda60..4242c57ff3 100644
--- a/usr/src/lib/krb5/kadm5/srv/Makefile.com
+++ b/usr/src/lib/krb5/kadm5/srv/Makefile.com
@@ -92,7 +92,7 @@ CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns,indenting
diff --git a/usr/src/lib/krb5/kdb/Makefile.com b/usr/src/lib/krb5/kdb/Makefile.com
index 608756d463..bf341da1be 100644
--- a/usr/src/lib/krb5/kdb/Makefile.com
+++ b/usr/src/lib/krb5/kdb/Makefile.com
@@ -85,7 +85,7 @@ CFLAGS += $(CCVERBOSE) -I..
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
SMOFF += indenting,all_func_returns,deref_check,signed
diff --git a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
index e44ff025be..2715dee4aa 100644
--- a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
+++ b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
@@ -68,7 +68,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com
index 0fbc9900e9..21245b1a0a 100644
--- a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com
+++ b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com
@@ -102,7 +102,7 @@ CPPFLAGS += -DHAVE_CONFIG_H \
-I$(SRC)/lib/gss_mechs/mech_krb5/include #for db-ndbm.h
CFLAGS += $(CCVERBOSE) -I..
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
index e7c1936015..bfd7f9aef2 100644
--- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
+++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
@@ -65,7 +65,7 @@ CPPFLAGS += -I$(SRC)/lib/krb5 \
-I$(SRC)/uts/common/gssapi/mechs/krb5/include \
-I$(SRC)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
# not linted
diff --git a/usr/src/lib/libadm/Makefile.com b/usr/src/lib/libadm/Makefile.com
index 9896df06ba..5089dc1829 100644
--- a/usr/src/lib/libadm/Makefile.com
+++ b/usr/src/lib/libadm/Makefile.com
@@ -45,7 +45,7 @@ SRCDIR= ../common
CPPFLAGS += -I ../inc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
# not linted
diff --git a/usr/src/lib/libads/Makefile.com b/usr/src/lib/libads/Makefile.com
index 9fd803cac9..aa5fde985e 100644
--- a/usr/src/lib/libads/Makefile.com
+++ b/usr/src/lib/libads/Makefile.com
@@ -45,7 +45,7 @@ CPPFLAGS += -D_REENTRANT -I$(SRCDIR) -I..
# CPPFLAGS += -I$(SRC)/lib/libldap5/include/ldap
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
.KEEP_STATE:
diff --git a/usr/src/lib/libadutils/Makefile.com b/usr/src/lib/libadutils/Makefile.com
index 4d2f9cd5ae..107734dfdc 100644
--- a/usr/src/lib/libadutils/Makefile.com
+++ b/usr/src/lib/libadutils/Makefile.com
@@ -46,7 +46,7 @@ CPPFLAGS += -D_REENTRANT -I$(SRCDIR)
CPPFLAGS += -I$(SRC)/lib/libldap5/include/ldap
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libast/Makefile.com b/usr/src/lib/libast/Makefile.com
index 46c4dad799..b701451368 100644
--- a/usr/src/lib/libast/Makefile.com
+++ b/usr/src/lib/libast/Makefile.com
@@ -725,7 +725,7 @@ CFLAGS64 += \
$(ASTCFLAGS64)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/lib/libbc/sparc/Makefile b/usr/src/lib/libbc/sparc/Makefile
index 1159628c21..a15a6356b1 100644
--- a/usr/src/lib/libbc/sparc/Makefile
+++ b/usr/src/lib/libbc/sparc/Makefile
@@ -337,7 +337,7 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-extra
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-address
diff --git a/usr/src/lib/libbsm/Makefile.com b/usr/src/lib/libbsm/Makefile.com
index 86449984c6..86c8ebd0fb 100644
--- a/usr/src/lib/libbsm/Makefile.com
+++ b/usr/src/lib/libbsm/Makefile.com
@@ -87,7 +87,7 @@ CFLAGS += $(CCVERBOSE)
LDLIBS += -lsocket -lnsl -lmd -lc -lsecdb -ltsol -linetutil -lscf
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index b981d952c3..d71aebf34a 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -1027,7 +1027,7 @@ CFLAGS64 += -xinline=
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 9ae85be490..4eef3b98b7 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -1075,7 +1075,7 @@ CFLAGS += $(XINLINE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/lib/libc/inc/thr_inlines.h b/usr/src/lib/libc/inc/thr_inlines.h
index f7cdc6a6bd..1259816e63 100644
--- a/usr/src/lib/libc/inc/thr_inlines.h
+++ b/usr/src/lib/libc/inc/thr_inlines.h
@@ -24,6 +24,10 @@
* Use is subject to license terms.
*/
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
+
#ifndef _THR_INLINES_H
#define _THR_INLINES_H
@@ -138,7 +142,7 @@ gethrtime(void) /* note: caller-saved registers are trashed */
extern __GNU_INLINE int
set_lock_byte(volatile uint8_t *__lockp)
{
- int __value;
+ int __value = 0;
#if defined(__x86)
__asm__ __volatile__(
"movl $1, %0\n\t"
diff --git a/usr/src/lib/libc/port/fp/_base_sup.c b/usr/src/lib/libc/port/fp/_base_sup.c
index 52e258d002..eb6a3fde5e 100644
--- a/usr/src/lib/libc/port/fp/_base_sup.c
+++ b/usr/src/lib/libc/port/fp/_base_sup.c
@@ -24,6 +24,10 @@
* Use is subject to license terms.
*/
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
+
#include "lint.h"
#include <sys/types.h>
#include "base_conversion.h"
@@ -88,7 +92,11 @@ __base_conversion_set_exception(fp_exception_field_type ef)
* to leave it for now because it's still used by Sun's old Fortran
* runtime libraries. Today this is a bug; in the days of SunOS 4.x,
* when the relevant design decisions were made, it was a feature.
+ *
+ * Regardless, on 32-bit, 'quadruple' under GCC is not 128 bits, so it
+ * uses uninitialized memory...
*/
+#pragma GCC diagnostic ignored "-Wuninitialized"
enum fp_class_type
__class_quadruple(quadruple *x)
{
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com
index d70057964b..8904d1d49a 100644
--- a/usr/src/lib/libc/sparc/Makefile.com
+++ b/usr/src/lib/libc/sparc/Makefile.com
@@ -21,7 +21,7 @@
#
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2016 Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
# Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2013 Garrett D'Amore <garrett@damore.org>
# Copyright 2018 Nexenta Systems, Inc.
@@ -1104,7 +1104,7 @@ CFLAGS += -xinline=
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com
index c295d8d68f..4256560408 100644
--- a/usr/src/lib/libc/sparcv9/Makefile.com
+++ b/usr/src/lib/libc/sparcv9/Makefile.com
@@ -22,7 +22,7 @@
#
# Copyright 2016 Gary Mills
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2015, Joyent, Inc. All rights reserved.
+# Copyright 2019 Joyent, Inc.
# Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2013 Garrett D'Amore <garrett@damore.org>
# Copyright 2018 Nexenta Systems, Inc.
@@ -1044,7 +1044,7 @@ CFLAGS64 += -xinline=
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/lib/libc_db/Makefile.com b/usr/src/lib/libc_db/Makefile.com
index 9fb18a576c..6dfd7e623a 100644
--- a/usr/src/lib/libc_db/Makefile.com
+++ b/usr/src/lib/libc_db/Makefile.com
@@ -48,7 +48,7 @@ CFLAGS += $(CCVERBOSE)
LDLIBS += -lc
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libcmd/Makefile.com b/usr/src/lib/libcmd/Makefile.com
index d5e09b13c8..0e8f049eef 100644
--- a/usr/src/lib/libcmd/Makefile.com
+++ b/usr/src/lib/libcmd/Makefile.com
@@ -135,7 +135,7 @@ CFLAGS64 += \
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-implicit-function-declaration
diff --git a/usr/src/lib/libcpc/Makefile.com b/usr/src/lib/libcpc/Makefile.com
index 78ed2818ad..096cab7672 100644
--- a/usr/src/lib/libcpc/Makefile.com
+++ b/usr/src/lib/libcpc/Makefile.com
@@ -47,7 +47,7 @@ CPPFLAGS += -D_REENTRANT -I../common
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libcrypt/Makefile.com b/usr/src/lib/libcrypt/Makefile.com
index 8e98a38912..a7f7632667 100644
--- a/usr/src/lib/libcrypt/Makefile.com
+++ b/usr/src/lib/libcrypt/Makefile.com
@@ -47,7 +47,7 @@ CPPFLAGS += -D_REENTRANT -I../inc -I../../common/inc -I../../libgen/inc
LDLIBS += -lgen -lc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/libcryptoutil/Makefile.com b/usr/src/lib/libcryptoutil/Makefile.com
index 79eab46787..ff22edb318 100644
--- a/usr/src/lib/libcryptoutil/Makefile.com
+++ b/usr/src/lib/libcryptoutil/Makefile.com
@@ -53,7 +53,7 @@ CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -I$(SRCDIR)
LINTFLAGS64 += -errchk=longptr64
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libctf/Makefile.shared.com b/usr/src/lib/libctf/Makefile.shared.com
index 3f2603a29a..39100e6831 100644
--- a/usr/src/lib/libctf/Makefile.shared.com
+++ b/usr/src/lib/libctf/Makefile.shared.com
@@ -85,6 +85,6 @@ CPPFLAGS += -I$(SRC)/lib/libctf/common \
-DCTF_OLD_VERSIONS
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com
index b3b7a2da0e..51dce6c5bc 100644
--- a/usr/src/lib/libcurses/Makefile.com
+++ b/usr/src/lib/libcurses/Makefile.com
@@ -150,7 +150,7 @@ CLEANFILES += $(LINTOUT) $(LINTLIB)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# not linted
diff --git a/usr/src/lib/libdevinfo/Makefile.com b/usr/src/lib/libdevinfo/Makefile.com
index 4567bc289f..d27b673721 100644
--- a/usr/src/lib/libdevinfo/Makefile.com
+++ b/usr/src/lib/libdevinfo/Makefile.com
@@ -42,7 +42,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I..
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libdhcputil/Makefile.com b/usr/src/lib/libdhcputil/Makefile.com
index b8e2721122..c3eaa4cf13 100644
--- a/usr/src/lib/libdhcputil/Makefile.com
+++ b/usr/src/lib/libdhcputil/Makefile.com
@@ -46,7 +46,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(COMDIR)
# not linted
diff --git a/usr/src/lib/libdisasm/Makefile.com b/usr/src/lib/libdisasm/Makefile.com
index 3e08026f68..543b8e08cd 100644
--- a/usr/src/lib/libdisasm/Makefile.com
+++ b/usr/src/lib/libdisasm/Makefile.com
@@ -121,7 +121,7 @@ ASFLAGS += -P $(ASFLAGS_$(CURTYPE)) -D_ASM
$(LINTLIB) := SRCS = $(COMDIR)/$(LINTSRC)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libdiskmgt/Makefile.com b/usr/src/lib/libdiskmgt/Makefile.com
index ee8dee6344..76023e5b57 100644
--- a/usr/src/lib/libdiskmgt/Makefile.com
+++ b/usr/src/lib/libdiskmgt/Makefile.com
@@ -62,7 +62,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -D_REENTRANT -I$(SRC)/lib/libdiskmgt/common
# not linted
diff --git a/usr/src/lib/libdladm/Makefile.com b/usr/src/lib/libdladm/Makefile.com
index 5e05ce1713..a5f2785fd2 100644
--- a/usr/src/lib/libdladm/Makefile.com
+++ b/usr/src/lib/libdladm/Makefile.com
@@ -46,7 +46,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(SRCDIR) -D_REENTRANT
# not linted
diff --git a/usr/src/lib/libdll/Makefile.com b/usr/src/lib/libdll/Makefile.com
index 67411c3487..183181c93d 100644
--- a/usr/src/lib/libdll/Makefile.com
+++ b/usr/src/lib/libdll/Makefile.com
@@ -85,7 +85,7 @@ CFLAGS64 += \
$(ASTCFLAGS64)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += all_func_returns,strcpy_overflow
diff --git a/usr/src/lib/libdlpi/Makefile.com b/usr/src/lib/libdlpi/Makefile.com
index 474a349943..aadf9c5fa0 100644
--- a/usr/src/lib/libdlpi/Makefile.com
+++ b/usr/src/lib/libdlpi/Makefile.com
@@ -40,7 +40,7 @@ SRCDIR = ../common
$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(SRCDIR) -D_REENTRANT
.KEEP_STATE:
diff --git a/usr/src/lib/libdtrace/Makefile.com b/usr/src/lib/libdtrace/Makefile.com
index 802afe0142..51cf0002d0 100644
--- a/usr/src/lib/libdtrace/Makefile.com
+++ b/usr/src/lib/libdtrace/Makefile.com
@@ -131,7 +131,7 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# not linted
diff --git a/usr/src/lib/libdtrace_jni/Makefile.com b/usr/src/lib/libdtrace_jni/Makefile.com
index 00813b4442..8e4ca4a49b 100644
--- a/usr/src/lib/libdtrace_jni/Makefile.com
+++ b/usr/src/lib/libdtrace_jni/Makefile.com
@@ -50,7 +50,7 @@ CPPFLAGS += -I../java/native
CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS64)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns
diff --git a/usr/src/lib/libeti/form/Makefile.com b/usr/src/lib/libeti/form/Makefile.com
index 465eddae38..c526d231b3 100644
--- a/usr/src/lib/libeti/form/Makefile.com
+++ b/usr/src/lib/libeti/form/Makefile.com
@@ -76,7 +76,7 @@ CFLAGS += $(CCVERBOSE)
LDLIBS += -lcurses -lc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
.KEEP_STATE:
diff --git a/usr/src/lib/libexacct/Makefile.com b/usr/src/lib/libexacct/Makefile.com
index 0be4ef3c27..59c2b0ced3 100644
--- a/usr/src/lib/libexacct/Makefile.com
+++ b/usr/src/lib/libexacct/Makefile.com
@@ -41,7 +41,7 @@ SRCDIR = ../common
$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -D_FILE_OFFSET_BITS=64
debug := CPPFLAGS += -DLIBEXACCT_DEBUG
diff --git a/usr/src/lib/libexacct/demo/Makefile b/usr/src/lib/libexacct/demo/Makefile
index 76159a4914..3361389127 100644
--- a/usr/src/lib/libexacct/demo/Makefile
+++ b/usr/src/lib/libexacct/demo/Makefile
@@ -31,7 +31,7 @@ include ../../../cmd/Makefile.cmd
LDLIBS += -lexacct -lproject -lsocket -lnsl
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/libfdisk/Makefile.com b/usr/src/lib/libfdisk/Makefile.com
index 27079153c4..64298076cf 100644
--- a/usr/src/lib/libfdisk/Makefile.com
+++ b/usr/src/lib/libfdisk/Makefile.com
@@ -52,7 +52,7 @@ CFLAGS64 += -D_FILE_OFFSET_BITS=64
LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libfru/libfruraw/Makefile.com b/usr/src/lib/libfru/libfruraw/Makefile.com
index 92b14c7756..e4e7e67eab 100644
--- a/usr/src/lib/libfru/libfruraw/Makefile.com
+++ b/usr/src/lib/libfru/libfruraw/Makefile.com
@@ -53,7 +53,7 @@ CPPFLAGS += -I.. \
CPPFLAGS += -D_REENTRANT
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libfruutils/Makefile.com b/usr/src/lib/libfruutils/Makefile.com
index 37c2ba8a6d..c60509e242 100644
--- a/usr/src/lib/libfruutils/Makefile.com
+++ b/usr/src/lib/libfruutils/Makefile.com
@@ -51,7 +51,7 @@ CPPFLAGS += -I.. -D_REENTRANT
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(LINTLIB) := LINTFLAGS = -nvx
$(LINTLIB) := LINTFLAGS64 = -nvx -m64
diff --git a/usr/src/lib/libfsmgt/Makefile.com b/usr/src/lib/libfsmgt/Makefile.com
index 3c2db0f981..c55c93285b 100644
--- a/usr/src/lib/libfsmgt/Makefile.com
+++ b/usr/src/lib/libfsmgt/Makefile.com
@@ -53,7 +53,7 @@ CPPFLAGS += -D_REENTRANT -I$(SRC)/lib/libfsmgt/common \
-I$(SRC)/cmd/fs.d/nfs/lib
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libgen/Makefile.com b/usr/src/lib/libgen/Makefile.com
index 5fbf71233f..f0c3300e80 100644
--- a/usr/src/lib/libgen/Makefile.com
+++ b/usr/src/lib/libgen/Makefile.com
@@ -45,7 +45,7 @@ CPPFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -I../inc -I../../common/inc
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libgss/Makefile.com b/usr/src/lib/libgss/Makefile.com
index fa824b1cb8..fd3ea535db 100644
--- a/usr/src/lib/libgss/Makefile.com
+++ b/usr/src/lib/libgss/Makefile.com
@@ -108,7 +108,7 @@ CPPFLAGS += -I$(GSSCRED_DIR) -I$(SRC)/uts/common/gssapi/include \
-DHAVE_STDLIB_H
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-empty-body
diff --git a/usr/src/lib/libinetsvc/Makefile.com b/usr/src/lib/libinetsvc/Makefile.com
index 9505796f00..1fb0e2b7fa 100644
--- a/usr/src/lib/libinetsvc/Makefile.com
+++ b/usr/src/lib/libinetsvc/Makefile.com
@@ -42,7 +42,7 @@ $(RELEASE_BUILD)CPPFLAGS += -DNDEBUG
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libipadm/Makefile.com b/usr/src/lib/libipadm/Makefile.com
index c2671ea571..40665eed6d 100644
--- a/usr/src/lib/libipadm/Makefile.com
+++ b/usr/src/lib/libipadm/Makefile.com
@@ -43,7 +43,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(SRCDIR) -D_REENTRANT
# not linted
diff --git a/usr/src/lib/libipmi/Makefile.com b/usr/src/lib/libipmi/Makefile.com
index 0942455097..3ba226cabb 100644
--- a/usr/src/lib/libipmi/Makefile.com
+++ b/usr/src/lib/libipmi/Makefile.com
@@ -58,7 +58,7 @@ LDLIBS += -lc -lm -lnvpair -lsocket -lnsl
CPPFLAGS += $(INCS)
CSTD = $(CSTD_GNU99)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libipsecutil/Makefile.com b/usr/src/lib/libipsecutil/Makefile.com
index 9e828a0476..33ff1b99d4 100644
--- a/usr/src/lib/libipsecutil/Makefile.com
+++ b/usr/src/lib/libipsecutil/Makefile.com
@@ -45,7 +45,7 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRCDIR) -I$(BERDIR)
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += shift_to_zero
diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com
index 1ac577ab76..e860567e48 100644
--- a/usr/src/lib/libkmf/libkmf/Makefile.com
+++ b/usr/src/lib/libkmf/libkmf/Makefile.com
@@ -70,7 +70,7 @@ CPPFLAGS += -I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
index 79eb757e56..4a7fbbc270 100644
--- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
@@ -56,7 +56,7 @@ LINTFLAGS64 += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-value
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
index 839d261128..31867e3d2d 100644
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
@@ -56,7 +56,7 @@ CPPFLAGS += -D_REENTRANT $(KMFINC) \
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-value
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libkvm/Makefile.com b/usr/src/lib/libkvm/Makefile.com
index 41e4c80071..b89bde5d03 100644
--- a/usr/src/lib/libkvm/Makefile.com
+++ b/usr/src/lib/libkvm/Makefile.com
@@ -47,7 +47,7 @@ LDLIBS += -lelf -lc
CPPFLAGS = -D_KMEMUSER -D_LARGEFILE64_SOURCE=1 -I.. $(CPPFLAGS.master)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += signed
diff --git a/usr/src/lib/libldap5/Makefile.com b/usr/src/lib/libldap5/Makefile.com
index e0cb907335..d7da0b4f09 100644
--- a/usr/src/lib/libldap5/Makefile.com
+++ b/usr/src/lib/libldap5/Makefile.com
@@ -114,7 +114,7 @@ CFLAGS += $(CCVERBOSE) $(LOCFLAGS)
CFLAGS64 += $(LOCFLAGS)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/lib/libmapid/Makefile.com b/usr/src/lib/libmapid/Makefile.com
index 2d7c9e55ca..3384c98518 100644
--- a/usr/src/lib/libmapid/Makefile.com
+++ b/usr/src/lib/libmapid/Makefile.com
@@ -56,7 +56,7 @@ CPPFLAGS += -I$(SRCDIR) -I$(SMF_DIR) -D_REENTRANT
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns
diff --git a/usr/src/lib/libmd/sparc/Makefile b/usr/src/lib/libmd/sparc/Makefile
index da93c328ca..9283791fe3 100644
--- a/usr/src/lib/libmd/sparc/Makefile
+++ b/usr/src/lib/libmd/sparc/Makefile
@@ -39,7 +39,7 @@ EXTPICS = ../capabilities/sun4u/sparc/pics/symcap.o \
../capabilities/sun4v/sparc/pics/symcap.o
# Suppress error for edonr.c __asm__ code
-pics/edonr.o := CERRWARN += -_gcc=-Wno-uninitialized
+pics/edonr.o := CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/libmtmalloc/Makefile.com b/usr/src/lib/libmtmalloc/Makefile.com
index ae66153665..ef87819122 100644
--- a/usr/src/lib/libmtmalloc/Makefile.com
+++ b/usr/src/lib/libmtmalloc/Makefile.com
@@ -44,7 +44,7 @@ DYNFLAGS += $(ZINTERPOSE)
$(LINTLIB) lint := LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
$(LINTLIB) lint := LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/libndmp/Makefile.com b/usr/src/lib/libndmp/Makefile.com
index e96223b3ec..39609c3e7e 100644
--- a/usr/src/lib/libndmp/Makefile.com
+++ b/usr/src/lib/libndmp/Makefile.com
@@ -53,7 +53,7 @@ LDLIBS += -lc -lscf
CPPFLAGS += $(INCS) -D_REENTRANT
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SRCS= $(OBJECTS:%.o=$(SRCDIR)/%.c)
$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libnisdb/Makefile b/usr/src/lib/libnisdb/Makefile
index 66fbf91865..95d5cea6b7 100644
--- a/usr/src/lib/libnisdb/Makefile
+++ b/usr/src/lib/libnisdb/Makefile
@@ -162,7 +162,7 @@ pics/map_ctrl.o
$(UVAR_PICS) := CERRWARN += -_gcc=-Wno-unused-variable
# Correcting these might alter logic
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# not linted
diff --git a/usr/src/lib/libnsl/Makefile.com b/usr/src/lib/libnsl/Makefile.com
index 5260a7bc81..e3ba39ddc9 100644
--- a/usr/src/lib/libnsl/Makefile.com
+++ b/usr/src/lib/libnsl/Makefile.com
@@ -197,7 +197,7 @@ CCFLAGS64 += -_CC=-features=conststrings
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-empty-body
diff --git a/usr/src/lib/libnvpair/Makefile.com b/usr/src/lib/libnvpair/Makefile.com
index 029dff2b7f..3a58a7e630 100644
--- a/usr/src/lib/libnvpair/Makefile.com
+++ b/usr/src/lib/libnvpair/Makefile.com
@@ -69,7 +69,7 @@ LINTFLAGS64 += -erroff=E_CONSTANT_CONDITION
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -D_REENTRANT
diff --git a/usr/src/lib/libnwam/Makefile.com b/usr/src/lib/libnwam/Makefile.com
index db26d0d23f..d793239a44 100644
--- a/usr/src/lib/libnwam/Makefile.com
+++ b/usr/src/lib/libnwam/Makefile.com
@@ -55,7 +55,7 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRCDIR) -D_REENTRANT
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libpam/Makefile.com b/usr/src/lib/libpam/Makefile.com
index 3eb16f8baf..d96ba001ee 100644
--- a/usr/src/lib/libpam/Makefile.com
+++ b/usr/src/lib/libpam/Makefile.com
@@ -39,7 +39,7 @@ LDLIBS += -lc
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I $(SRCDIR)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/libpcp/Makefile.com b/usr/src/lib/libpcp/Makefile.com
index a90f67ec90..65ba8001d7 100644
--- a/usr/src/lib/libpcp/Makefile.com
+++ b/usr/src/lib/libpcp/Makefile.com
@@ -47,7 +47,7 @@ LINKED_LIBPCP1_DIR = \
LIBS = $(DYNLIB) $(LINTLIB)
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lc -lumem -ldevinfo
PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib
INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so.1 $@
diff --git a/usr/src/lib/libpicltree/Makefile.com b/usr/src/lib/libpicltree/Makefile.com
index 1707ecebc6..9fe3266a50 100644
--- a/usr/src/lib/libpicltree/Makefile.com
+++ b/usr/src/lib/libpicltree/Makefile.com
@@ -37,7 +37,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CPPFLAGS += -D_REENTRANT -I.. -I../../libpicl -I$(SRC)/cmd/picl/plugins/inc
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libpkg/Makefile.com b/usr/src/lib/libpkg/Makefile.com
index e3f93d3959..227b3833d8 100644
--- a/usr/src/lib/libpkg/Makefile.com
+++ b/usr/src/lib/libpkg/Makefile.com
@@ -65,7 +65,7 @@ LDLIBS += -lc -lscf -ladm
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-switch
diff --git a/usr/src/lib/libpool/Makefile.com b/usr/src/lib/libpool/Makefile.com
index d1c3972cae..51a3e7a5a6 100644
--- a/usr/src/lib/libpool/Makefile.com
+++ b/usr/src/lib/libpool/Makefile.com
@@ -54,7 +54,7 @@ CPPFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 \
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libpp/Makefile.com b/usr/src/lib/libpp/Makefile.com
index 2710fe8873..0ea3146862 100644
--- a/usr/src/lib/libpp/Makefile.com
+++ b/usr/src/lib/libpp/Makefile.com
@@ -100,7 +100,7 @@ CFLAGS64 += \
$(ASTCFLAGS64)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-empty-body
CERRWARN += -_gcc=-Wno-unused-value
diff --git a/usr/src/lib/libproc/Makefile.com b/usr/src/lib/libproc/Makefile.com
index bb72f8dc17..7ed72f97ed 100644
--- a/usr/src/lib/libproc/Makefile.com
+++ b/usr/src/lib/libproc/Makefile.com
@@ -95,7 +95,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRCDIR)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/lib/libproject/Makefile.com b/usr/src/lib/libproject/Makefile.com
index 9f5984e877..333dc5fcf7 100644
--- a/usr/src/lib/libproject/Makefile.com
+++ b/usr/src/lib/libproject/Makefile.com
@@ -49,7 +49,7 @@ CLEANFILES += $(LINTOUT) $(LINTLIB)
CPPFLAGS += -D_REENTRANT
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lc -lsecdb -lproc -lpool
$(LINTLIB) := SRCS = ../common/llib-lproject
diff --git a/usr/src/lib/libprtdiag/Makefile.com b/usr/src/lib/libprtdiag/Makefile.com
index b0fb2b65bb..6994883b47 100644
--- a/usr/src/lib/libprtdiag/Makefile.com
+++ b/usr/src/lib/libprtdiag/Makefile.com
@@ -45,7 +45,7 @@ IFLAGS += -I $(UTSBASE)/sun4u/serengeti
CPPFLAGS = $(IFLAGS) $(CPPFLAGS.master)
CFLAGS += $(CCVERBOSE)
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/lib/libprtdiag_psr/sparc/Makefile.com b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
index cc52a6ef2c..af44a80223 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
+++ b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
@@ -54,7 +54,7 @@ CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-address
IFLAGS += -I $(UTSBASE)/sun4u
IFLAGS += -I $(UTSCLOSED)/sun4u
diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile
index fe94b16c25..890a36db45 100644
--- a/usr/src/lib/libresolv/Makefile
+++ b/usr/src/lib/libresolv/Makefile
@@ -59,7 +59,7 @@ LDLIBS += -lsocket -lnsl -lc
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/librpcsvc/Makefile.com b/usr/src/lib/librpcsvc/Makefile.com
index 15b6c6cb48..d8c1a5e0fb 100644
--- a/usr/src/lib/librpcsvc/Makefile.com
+++ b/usr/src/lib/librpcsvc/Makefile.com
@@ -51,7 +51,7 @@ CPPFLAGS += -DYP
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libscf/Makefile.com b/usr/src/lib/libscf/Makefile.com
index 071818bef9..a534abf962 100644
--- a/usr/src/lib/libscf/Makefile.com
+++ b/usr/src/lib/libscf/Makefile.com
@@ -61,7 +61,7 @@ CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libsec/Makefile.com b/usr/src/lib/libsec/Makefile.com
index 58834e08f1..47fcc11acb 100644
--- a/usr/src/lib/libsec/Makefile.com
+++ b/usr/src/lib/libsec/Makefile.com
@@ -48,7 +48,7 @@ CPPFLAGS += -I$(SRCDIR) -I. -I../../../common/acl
LDLIBS += -lc -lavl -lidmap
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/lib/libsecdb/Makefile.com b/usr/src/lib/libsecdb/Makefile.com
index 1c2076cdc7..aa027f0efa 100644
--- a/usr/src/lib/libsecdb/Makefile.com
+++ b/usr/src/lib/libsecdb/Makefile.com
@@ -45,7 +45,7 @@ LINTFLAGS += -DPIC
LINTFLAGS64 += -DPIC
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com
index 3628432a6a..efc6613377 100644
--- a/usr/src/lib/libshare/Makefile.com
+++ b/usr/src/lib/libshare/Makefile.com
@@ -46,7 +46,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
CFLAGS += $(CCVERBOSE)
CSTD += $(CSTD_GNU99)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# not linted
diff --git a/usr/src/lib/libshare/autofs/Makefile.com b/usr/src/lib/libshare/autofs/Makefile.com
index 0123923ddb..30c604222b 100644
--- a/usr/src/lib/libshare/autofs/Makefile.com
+++ b/usr/src/lib/libshare/autofs/Makefile.com
@@ -48,7 +48,7 @@ LDLIBS += -lshare -lscf -lumem -lc -lxml2
CFLAGS += $(CCVERBOSE)
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/lib/libshare/nfs/Makefile.com b/usr/src/lib/libshare/nfs/Makefile.com
index f6675414cf..e6e9ca01b4 100644
--- a/usr/src/lib/libshare/nfs/Makefile.com
+++ b/usr/src/lib/libshare/nfs/Makefile.com
@@ -50,7 +50,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \
-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR)/../common
diff --git a/usr/src/lib/libshare/smbfs/Makefile.com b/usr/src/lib/libshare/smbfs/Makefile.com
index 36b4875560..c07e975163 100644
--- a/usr/src/lib/libshare/smbfs/Makefile.com
+++ b/usr/src/lib/libshare/smbfs/Makefile.com
@@ -42,7 +42,7 @@ LDLIBS += -lshare -lscf -lumem -luuid -lc -lxml2 -lsmbfs
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
-I$(SRCDIR)/../common -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common
diff --git a/usr/src/lib/libshell/Makefile.com b/usr/src/lib/libshell/Makefile.com
index b904c0fe5f..b185d93851 100644
--- a/usr/src/lib/libshell/Makefile.com
+++ b/usr/src/lib/libshell/Makefile.com
@@ -158,7 +158,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-char-subscripts
diff --git a/usr/src/lib/libsldap/Makefile.com b/usr/src/lib/libsldap/Makefile.com
index 4854275b4b..1404a24572 100644
--- a/usr/src/lib/libsldap/Makefile.com
+++ b/usr/src/lib/libsldap/Makefile.com
@@ -54,7 +54,7 @@ LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libslp/Makefile.com b/usr/src/lib/libslp/Makefile.com
index 0e8f4f70c0..23e7d1f0c5 100644
--- a/usr/src/lib/libslp/Makefile.com
+++ b/usr/src/lib/libslp/Makefile.com
@@ -46,7 +46,7 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS += -D_REENTRANT -I../clib -I$(JAVA_ROOT)/include \
-I$(JAVA_ROOT)/include/solaris
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# not linted
diff --git a/usr/src/lib/libsmbfs/Makefile.com b/usr/src/lib/libsmbfs/Makefile.com
index be5ad05c42..71a0d83728 100644
--- a/usr/src/lib/libsmbfs/Makefile.com
+++ b/usr/src/lib/libsmbfs/Makefile.com
@@ -95,7 +95,7 @@ LDLIBS += -lsocket -lnsl -lc -lmd -lpkcs11 -lkrb5 -lsec -lidmap -lscf -luuid
# normal warnings...
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
# not linted
diff --git a/usr/src/lib/libsocket/Makefile.com b/usr/src/lib/libsocket/Makefile.com
index f4b4ac28e6..bc51201190 100644
--- a/usr/src/lib/libsocket/Makefile.com
+++ b/usr/src/lib/libsocket/Makefile.com
@@ -57,7 +57,7 @@ CPPFLAGS += -DSYSV -D_REENTRANT -I../../common/inc
%/rcmd.o := CPPFLAGS += -DNIS
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/lib/libsqlite/Makefile.com b/usr/src/lib/libsqlite/Makefile.com
index 5e1f3d8072..8dd20a4ce9 100644
--- a/usr/src/lib/libsqlite/Makefile.com
+++ b/usr/src/lib/libsqlite/Makefile.com
@@ -97,7 +97,7 @@ MYCPPFLAGS = -D_REENTRANT -DTHREADSAFE=1 -DHAVE_USLEEP=1 -I. -I.. -I$(SRCDIR)
CPPFLAGS += $(MYCPPFLAGS)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/lib/libtnfctl/Makefile.com b/usr/src/lib/libtnfctl/Makefile.com
index b9392268ce..47d3ca9527 100644
--- a/usr/src/lib/libtnfctl/Makefile.com
+++ b/usr/src/lib/libtnfctl/Makefile.com
@@ -75,7 +75,7 @@ CPPFLAGS += -I$(SRC)/lib/libtnfprobe -D_REENTRANT -I$(SRC)/cmd/sgs/include
LINTFLAGS += -y
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-empty-body
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/lib/libtnfprobe/Makefile.com b/usr/src/lib/libtnfprobe/Makefile.com
index bfdceac994..5dbde86c95 100644
--- a/usr/src/lib/libtnfprobe/Makefile.com
+++ b/usr/src/lib/libtnfprobe/Makefile.com
@@ -65,7 +65,7 @@ LINTFLAGS += -y
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/lib/libtsnet/Makefile.com b/usr/src/lib/libtsnet/Makefile.com
index 4eb55a843f..a929254ab1 100644
--- a/usr/src/lib/libtsnet/Makefile.com
+++ b/usr/src/lib/libtsnet/Makefile.com
@@ -47,7 +47,7 @@ LDLIBS += -lsocket -lnsl -lc -lsecdb -ltsol
LIBTSOLINC = $(SRC)/lib/libtsol/common
CPPFLAGS += -D_REENTRANT -I$(LIBTSOLINC)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/libtsol/Makefile.com b/usr/src/lib/libtsol/Makefile.com
index 5028745796..478376427c 100644
--- a/usr/src/lib/libtsol/Makefile.com
+++ b/usr/src/lib/libtsol/Makefile.com
@@ -60,7 +60,7 @@ CPPFLAGS += -D_REENTRANT -I$(SRCDIR) -I$(COMMONDIR)
LINTFLAGS64 += -m64
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/libv12n/Makefile.com b/usr/src/lib/libv12n/Makefile.com
index e8321c0a6b..72ec120aee 100644
--- a/usr/src/lib/libv12n/Makefile.com
+++ b/usr/src/lib/libv12n/Makefile.com
@@ -39,7 +39,7 @@ SRCS = $(MACHCOBJS:%.o=../$(MACH)/%.c)
CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(LINTLIB) := SRCS = ../common/llib-lv12n
diff --git a/usr/src/lib/libwrap/Makefile.com b/usr/src/lib/libwrap/Makefile.com
index 40e2f11d0a..b5fb0e21be 100644
--- a/usr/src/lib/libwrap/Makefile.com
+++ b/usr/src/lib/libwrap/Makefile.com
@@ -59,7 +59,7 @@ CERRWARN += -erroff=E_OLD_STYLE_DECL_HIDES_PROTO
CERRWARN += -_gcc=-Wno-return-type
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/lib/libxcurses/Makefile.com b/usr/src/lib/libxcurses/Makefile.com
index 1449690433..d60e9683ab 100644
--- a/usr/src/lib/libxcurses/Makefile.com
+++ b/usr/src/lib/libxcurses/Makefile.com
@@ -114,7 +114,7 @@ ROOTLIBS= $(LIBS:%=$(ROOTLIBDIR)/%)
$(LINTLIB):= SRCS=../src/libc/llib-lcurses
$(LINTLIB):= CPPFLAGS += -D_XOPEN_SOURCE_EXTENDED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/lib/libxcurses2/Makefile.com b/usr/src/lib/libxcurses2/Makefile.com
index 41235cf283..12a063c414 100644
--- a/usr/src/lib/libxcurses2/Makefile.com
+++ b/usr/src/lib/libxcurses2/Makefile.com
@@ -97,7 +97,7 @@ LINTSRC= $(LINTLIB:%.ln=%)
LDLIBS += -lc
CPPFLAGS = -I../h -I../src/libc/xcurses $(CPPFLAGS.master)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
# not linted
diff --git a/usr/src/lib/libzonecfg/Makefile.com b/usr/src/lib/libzonecfg/Makefile.com
index 880abfcc97..38a30b3446 100644
--- a/usr/src/lib/libzonecfg/Makefile.com
+++ b/usr/src/lib/libzonecfg/Makefile.com
@@ -36,7 +36,7 @@ $(DYNLIB) := LDLIBS += -lxml2
SRCDIR = ../common
CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libzonestat/Makefile.com b/usr/src/lib/libzonestat/Makefile.com
index ca7b710a18..1efc7bf720 100644
--- a/usr/src/lib/libzonestat/Makefile.com
+++ b/usr/src/lib/libzonestat/Makefile.com
@@ -36,7 +36,7 @@ SRCDIR = ../common
CPPFLAGS += -I../common -mt -D_POSIX_PTHREAD_SEMANTICS
$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/madv/Makefile.com b/usr/src/lib/madv/Makefile.com
index 955c8287e1..877c35517f 100644
--- a/usr/src/lib/madv/Makefile.com
+++ b/usr/src/lib/madv/Makefile.com
@@ -41,7 +41,7 @@ CPPFLAGS += -D_REENTRANT
DYNFLAGS += $(ZNOVERSION) $(ZINTERPOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/mpapi/libmpapi/Makefile.com b/usr/src/lib/mpapi/libmpapi/Makefile.com
index d62912f592..cc109f0534 100644
--- a/usr/src/lib/mpapi/libmpapi/Makefile.com
+++ b/usr/src/lib/mpapi/libmpapi/Makefile.com
@@ -46,7 +46,7 @@ DYNFLAGS += -z initarray=InitLibrary
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/mpss/Makefile.com b/usr/src/lib/mpss/Makefile.com
index 6988a90742..9d54dff9ab 100644
--- a/usr/src/lib/mpss/Makefile.com
+++ b/usr/src/lib/mpss/Makefile.com
@@ -41,7 +41,7 @@ CPPFLAGS += -D_REENTRANT
DYNFLAGS += $(BLOCAL) $(ZNOVERSION)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/lib/nsswitch/Makefile.com b/usr/src/lib/nsswitch/Makefile.com
index 570ae3a035..f10f086315 100644
--- a/usr/src/lib/nsswitch/Makefile.com
+++ b/usr/src/lib/nsswitch/Makefile.com
@@ -37,7 +37,7 @@ LINTOUT = lint.out
CPPFLAGS += -D_REENTRANT
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-address
diff --git a/usr/src/lib/pam_modules/unix_cred/Makefile.com b/usr/src/lib/pam_modules/unix_cred/Makefile.com
index 45c444f9b2..80e273840f 100644
--- a/usr/src/lib/pam_modules/unix_cred/Makefile.com
+++ b/usr/src/lib/pam_modules/unix_cred/Makefile.com
@@ -31,7 +31,7 @@ include ../../Makefile.pam_modules
LDLIBS += -lbsm -lpam -lsecdb -lproject -lc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
all: $(LIBS)
diff --git a/usr/src/lib/passwdutil/Makefile.com b/usr/src/lib/passwdutil/Makefile.com
index d62fa7963d..84d02df746 100644
--- a/usr/src/lib/passwdutil/Makefile.com
+++ b/usr/src/lib/passwdutil/Makefile.com
@@ -58,7 +58,7 @@ CPPFLAGS += -DENABLE_SUNOS_AGING -D_REENTRANT \
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
# not linted
diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile.com b/usr/src/lib/pkcs11/libpkcs11/Makefile.com
index 7c8d79737a..cb9dcf89bd 100644
--- a/usr/src/lib/pkcs11/libpkcs11/Makefile.com
+++ b/usr/src/lib/pkcs11/libpkcs11/Makefile.com
@@ -77,7 +77,7 @@ CPPFLAGS += -I$(INCDIR) -I$(SRCDIR) -D_REENTRANT
LINTFLAGS64 += -errchk=longptr64
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
index 5fdac2dd0c..848a6b55b2 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
@@ -40,7 +40,7 @@ include $(SRC)/lib/Makefile.lib.64
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com
index 1bb12a3b2f..510beb92b6 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com
+++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com
@@ -42,7 +42,7 @@ AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH)
ASFLAGS += $(AS_PICFLAGS) -P
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CPPFLAGS += -D$(PLATFORM) -I$(CRYPTODIR) -I$(UTSDIR) \
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com
index ad19150a23..a8b0e7db18 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com
+++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com
@@ -36,7 +36,7 @@ AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH)
ASFLAGS += $(AS_PICFLAGS) -P
CFLAGS += $(CCVERBOSE) -xO5 -xbuiltin=%all -dalign
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CPPFLAGS += -D$(PLATFORM) -I$(CRYPTODIR) -I$(UTSDIR) \
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
index 4968174065..11c2507cee 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
@@ -33,7 +33,7 @@ include $(SRC)/lib/Makefile.lib
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile
index deea108eac..398c8265dc 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile
@@ -44,7 +44,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS
LDLIBS += -lcryptoutil -lc
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile
index 8bde047675..d90a6125f0 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile
@@ -45,7 +45,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS
LDLIBS += -lcryptoutil -lc
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
index d29e303e77..9cf7027144 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
@@ -86,7 +86,7 @@ LDLIBS += -lc -lcryptoutil -lmd
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
# not linted
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
index c571c0b278..a837802e81 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
@@ -130,7 +130,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-empty-body
diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
index d09d2012f0..244d460f5e 100644
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
@@ -95,7 +95,7 @@ CSTD= $(CSTD_GNU99)
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/lib/print/libipp-listener/Makefile.com b/usr/src/lib/print/libipp-listener/Makefile.com
index a111a471e0..158935f9f1 100644
--- a/usr/src/lib/print/libipp-listener/Makefile.com
+++ b/usr/src/lib/print/libipp-listener/Makefile.com
@@ -53,7 +53,7 @@ CPPFLAGS += -I../../libpapi-common/common
CPPFLAGS += -I../../libipp-core/common
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/print/libpapi-ipp/Makefile.com b/usr/src/lib/print/libpapi-ipp/Makefile.com
index b96b6fef71..90cf130adb 100644
--- a/usr/src/lib/print/libpapi-ipp/Makefile.com
+++ b/usr/src/lib/print/libpapi-ipp/Makefile.com
@@ -53,7 +53,7 @@ CPPFLAGS += -I../../libhttp-core/common
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/rpcsec_gss/Makefile.com b/usr/src/lib/rpcsec_gss/Makefile.com
index 2dca6fe9e2..ea159a6692 100644
--- a/usr/src/lib/rpcsec_gss/Makefile.com
+++ b/usr/src/lib/rpcsec_gss/Makefile.com
@@ -38,7 +38,7 @@ CPPFLAGS += -D_REENTRANT -I$(SRC)/uts/common/gssapi/include \
CFLAGS += $(XFFLAG)
CFLAGS64 += $(XFFLAG)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# not linted
diff --git a/usr/src/lib/sasl_plugins/Makefile.com b/usr/src/lib/sasl_plugins/Makefile.com
index 09eb2bd2bd..af5b810455 100644
--- a/usr/src/lib/sasl_plugins/Makefile.com
+++ b/usr/src/lib/sasl_plugins/Makefile.com
@@ -31,7 +31,7 @@ include $(SRC)/lib/Makefile.lib
CPPFLAGS += -I$(SRC)/lib/libsasl/include
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/scsi/libses/Makefile.defs b/usr/src/lib/scsi/libses/Makefile.defs
index 32f6075d32..a8b5669944 100644
--- a/usr/src/lib/scsi/libses/Makefile.defs
+++ b/usr/src/lib/scsi/libses/Makefile.defs
@@ -31,7 +31,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
SMOFF += all_func_returns
diff --git a/usr/src/lib/scsi/libsmp/Makefile.com b/usr/src/lib/scsi/libsmp/Makefile.com
index 13760167b9..748963db4e 100644
--- a/usr/src/lib/scsi/libsmp/Makefile.com
+++ b/usr/src/lib/scsi/libsmp/Makefile.com
@@ -43,7 +43,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMOFF += all_func_returns
diff --git a/usr/src/lib/smbsrv/libmlsvc/Makefile.com b/usr/src/lib/smbsrv/libmlsvc/Makefile.com
index b0a3f80560..a3c41456f4 100644
--- a/usr/src/lib/smbsrv/libmlsvc/Makefile.com
+++ b/usr/src/lib/smbsrv/libmlsvc/Makefile.com
@@ -93,7 +93,7 @@ CPPFLAGS += -Dsyslog=smb_syslog
$(ENABLE_SMB_PRINTING) CPPFLAGS += -DHAVE_CUPS
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/smbsrv/libsmb/Makefile.com b/usr/src/lib/smbsrv/libsmb/Makefile.com
index fc3c4e0b6b..39af0ff072 100644
--- a/usr/src/lib/smbsrv/libsmb/Makefile.com
+++ b/usr/src/lib/smbsrv/libsmb/Makefile.com
@@ -86,7 +86,7 @@ LDLIBS += -lsec -lidmap -lreparse -lcmdutils -lavl
LDLIBS += -lnvpair -lresolv -lsocket -lnsl -lc
CPPFLAGS += $(INCS) -D_REENTRANT
CPPFLAGS += -Dsyslog=smb_syslog
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-switch
diff --git a/usr/src/lib/smbsrv/libsmbns/Makefile.com b/usr/src/lib/smbsrv/libsmbns/Makefile.com
index 8011d3305a..4d7fff71ad 100644
--- a/usr/src/lib/smbsrv/libsmbns/Makefile.com
+++ b/usr/src/lib/smbsrv/libsmbns/Makefile.com
@@ -55,7 +55,7 @@ LDLIBS += -lsmb -lads -lgss -lcmdutils -lldap \
CPPFLAGS += -D_REENTRANT
CPPFLAGS += -Dsyslog=smb_syslog
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/lib/smhba/Makefile.com b/usr/src/lib/smhba/Makefile.com
index d512f5b80a..296cc8949a 100644
--- a/usr/src/lib/smhba/Makefile.com
+++ b/usr/src/lib/smhba/Makefile.com
@@ -47,7 +47,7 @@ CPPFLAGS += $(INCS)
CPPFLAGS += -DPOSIX_THREADS
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
SMOFF += indenting,all_func_returns
diff --git a/usr/src/lib/storage/liba5k/Makefile.com b/usr/src/lib/storage/liba5k/Makefile.com
index 202c11bdfd..91c40ddda7 100644
--- a/usr/src/lib/storage/liba5k/Makefile.com
+++ b/usr/src/lib/storage/liba5k/Makefile.com
@@ -45,7 +45,7 @@ LINTFLAGS += $(COMMON_LINTFLAGS)
LINTFLAGS64 += $(COMMON_LINTFLAGS)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDLIBS += -lc -ldevice -lg_fc
diff --git a/usr/src/lib/storage/libg_fc/Makefile.com b/usr/src/lib/storage/libg_fc/Makefile.com
index 2b8c54f021..41a7abbac5 100644
--- a/usr/src/lib/storage/libg_fc/Makefile.com
+++ b/usr/src/lib/storage/libg_fc/Makefile.com
@@ -50,7 +50,7 @@ LINTFLAGS += $(COMMON_LINTFLAGS)
LINTFLAGS64 += $(COMMON_LINTFLAGS)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/udapl/udapl_tavor/Makefile.com b/usr/src/lib/udapl/udapl_tavor/Makefile.com
index 60ff446a17..e6276a203d 100644
--- a/usr/src/lib/udapl/udapl_tavor/Makefile.com
+++ b/usr/src/lib/udapl/udapl_tavor/Makefile.com
@@ -150,7 +150,7 @@ LINTFLAGS += -DDAPL_DBG
LINTFLAGS64 += -DDAPL_DBG
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
$(NOT_RELEASE_BUILD)CPPFLAGS += -DDAPL_DBG
diff --git a/usr/src/psm/stand/boot/Makefile.boot b/usr/src/psm/stand/boot/Makefile.boot
index 8c9a50381a..548a0c5441 100644
--- a/usr/src/psm/stand/boot/Makefile.boot
+++ b/usr/src/psm/stand/boot/Makefile.boot
@@ -65,5 +65,5 @@ LINTFLAGS = -nmsF -erroff=E_BAD_PTR_CAST_ALIGN \
-erroff=E_NAME_DECL_NOT_USED_DEF2 -erroff=E_NAME_DEF_NOT_USED2
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
diff --git a/usr/src/psm/stand/cpr/sparcv9/sun4u/Makefile b/usr/src/psm/stand/cpr/sparcv9/sun4u/Makefile
index 5ae3235236..2f1eb595b0 100644
--- a/usr/src/psm/stand/cpr/sparcv9/sun4u/Makefile
+++ b/usr/src/psm/stand/cpr/sparcv9/sun4u/Makefile
@@ -49,7 +49,7 @@ ALL = cprboot
include ../../common/Makefile.com
include $(TOPDIR)/psm/Makefile.psm.64
CFLAGS64 += -xchip=ultra $(CCABS32)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/req.flg b/usr/src/req.flg
index 83e2936a36..9c992b1120 100644
--- a/usr/src/req.flg
+++ b/usr/src/req.flg
@@ -23,11 +23,12 @@
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
+# Copyright 2019 Joyent, Inc.
+#
echo_file usr/src/Makefile
echo_file usr/src/Targetdirs
echo_file usr/src/Makefile.master
-echo_file usr/src/Makefile.noget
echo_file usr/src/Makefile.master.64
echo_file usr/src/Makefile.msg.targ
echo_file usr/src/Makefile.psm
diff --git a/usr/src/stand/lib/fs/Makefile.com b/usr/src/stand/lib/fs/Makefile.com
index f434526f78..422c4a5c8a 100644
--- a/usr/src/stand/lib/fs/Makefile.com
+++ b/usr/src/stand/lib/fs/Makefile.com
@@ -36,6 +36,6 @@ lint lintcheck := LINTFLAGS += -y
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-char-subscripts
diff --git a/usr/src/stand/lib/inet/Makefile b/usr/src/stand/lib/inet/Makefile
index 37f8dd9db2..50255192d6 100644
--- a/usr/src/stand/lib/inet/Makefile
+++ b/usr/src/stand/lib/inet/Makefile
@@ -37,6 +37,6 @@ LDLIBS += -lsock
CPPFLAGS += $(SOCKCPPFLAGS) -I$(TOPDIR)/psm/stand
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
include ../Makefile.targ
diff --git a/usr/src/stand/lib/sa/Makefile b/usr/src/stand/lib/sa/Makefile
index 9bc49adbf3..9c9788f4c1 100644
--- a/usr/src/stand/lib/sa/Makefile
+++ b/usr/src/stand/lib/sa/Makefile
@@ -57,7 +57,7 @@ LDLIBS += -lsock
CPPFLAGS += $(SOCKCPPFLAGS)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
objs/%.o: $(MACH)/%.s
$(COMPILE.s) -o $@ $<
diff --git a/usr/src/stand/lib/tcp/Makefile b/usr/src/stand/lib/tcp/Makefile
index 6ea216557f..30ad308f52 100644
--- a/usr/src/stand/lib/tcp/Makefile
+++ b/usr/src/stand/lib/tcp/Makefile
@@ -34,6 +34,6 @@ LDLIBS += -linet
CPPFLAGS += -I../inet $(SOCKCPPFLAGS)
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
include ../Makefile.targ
diff --git a/usr/src/test/libc-tests/tests/regex/Makefile b/usr/src/test/libc-tests/tests/regex/Makefile
index a6b3ac8377..f1b2ce45ac 100644
--- a/usr/src/test/libc-tests/tests/regex/Makefile
+++ b/usr/src/test/libc-tests/tests/regex/Makefile
@@ -34,7 +34,7 @@ DATA= basic.dat basic.out \
include $(SRC)/cmd/Makefile.cmd
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
# needs work
diff --git a/usr/src/tools/aw/Makefile b/usr/src/tools/aw/Makefile
index 746cdbcbe2..4944efcaf6 100644
--- a/usr/src/tools/aw/Makefile
+++ b/usr/src/tools/aw/Makefile
@@ -30,7 +30,7 @@ PROG = aw
include ../Makefile.tools
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/tools/cscope-fast/Makefile b/usr/src/tools/cscope-fast/Makefile
index 513534747f..1cf70de8f4 100644
--- a/usr/src/tools/cscope-fast/Makefile
+++ b/usr/src/tools/cscope-fast/Makefile
@@ -49,7 +49,7 @@ CFLAGS += -DPATLEN=$(PATLEN) -DSTMTMAX=$(STMTMAX) -DYYLMAX=$(YYLMAX)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/tools/ctf/ctfmerge/Makefile.com b/usr/src/tools/ctf/ctfmerge/Makefile.com
index 2702fa9d13..a073007cb4 100644
--- a/usr/src/tools/ctf/ctfmerge/Makefile.com
+++ b/usr/src/tools/ctf/ctfmerge/Makefile.com
@@ -23,7 +23,7 @@ LDFLAGS += \
CPPFLAGS += -include ../../common/ctf_headers.h
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
OBJS = $(SRCS:%.c=%.o)
diff --git a/usr/src/tools/ctf/cvt/Makefile.com b/usr/src/tools/ctf/cvt/Makefile.com
index 052cf02cc4..1771505c9e 100644
--- a/usr/src/tools/ctf/cvt/Makefile.com
+++ b/usr/src/tools/ctf/cvt/Makefile.com
@@ -81,7 +81,7 @@ CFLAGS += $(CTF_FLAGS)
LINTFLAGS += -mnux
CERRWARN += -_gcc=-Wno-unused
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CSTD = $(CSTD_GNU99)
diff --git a/usr/src/tools/ctf/stabs/Makefile.com b/usr/src/tools/ctf/stabs/Makefile.com
index 6703c34f06..97d9cddb77 100644
--- a/usr/src/tools/ctf/stabs/Makefile.com
+++ b/usr/src/tools/ctf/stabs/Makefile.com
@@ -44,7 +44,7 @@ OBJS = $(SRCS:%.c=%.o)
LINTFILES = $(SRCS:%.c=%.ln)
LINTFLAGS = -mnux -L$(ROOT)/usr/lib
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused
.NO_PARALLEL:
diff --git a/usr/src/tools/ndrgen/Makefile b/usr/src/tools/ndrgen/Makefile
index 49d57e237a..22fe8f87e8 100644
--- a/usr/src/tools/ndrgen/Makefile
+++ b/usr/src/tools/ndrgen/Makefile
@@ -34,7 +34,7 @@ SRCS= $(OBJS:%.o=%.c)
include ../Makefile.tools
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused
CLEANFILES += $(OBJS) y.tab.c y.tab.h
diff --git a/usr/src/ucbcmd/mkstr/Makefile b/usr/src/ucbcmd/mkstr/Makefile
index 212f945731..d4a73d44f2 100644
--- a/usr/src/ucbcmd/mkstr/Makefile
+++ b/usr/src/ucbcmd/mkstr/Makefile
@@ -31,7 +31,7 @@ include ../Makefile.ucbcmd
# For messaging
XGETFLAGS += -a -x mkstr.xcl
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/ucbcmd/tset/Makefile b/usr/src/ucbcmd/tset/Makefile
index 36baf6432f..50dc7c0409 100644
--- a/usr/src/ucbcmd/tset/Makefile
+++ b/usr/src/ucbcmd/tset/Makefile
@@ -36,7 +36,7 @@ CPPFLAGS = -I$(SRC)/ucbhead $(CPPFLAGS.master)
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# missing prototypes
SMATCH=off
diff --git a/usr/src/ucblib/libcurses/Makefile.com b/usr/src/ucblib/libcurses/Makefile.com
index 3e018e1cfa..3e2b27dfc8 100644
--- a/usr/src/ucblib/libcurses/Makefile.com
+++ b/usr/src/ucblib/libcurses/Makefile.com
@@ -88,7 +88,7 @@ CPPFLAGS = -I$(SRC)/ucbhead -I../../../lib/libc/inc $(CPPFLAGS.master)
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/ucblib/libdbm/Makefile.com b/usr/src/ucblib/libdbm/Makefile.com
index e3d5c9e10a..385526055b 100644
--- a/usr/src/ucblib/libdbm/Makefile.com
+++ b/usr/src/ucblib/libdbm/Makefile.com
@@ -41,7 +41,7 @@ LDLIBS += -lc
CPPFLAGS = -I$(SRC)/ucbhead $(CPPFLAGS.master)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/ucblib/librpcsoc/Makefile.com b/usr/src/ucblib/librpcsoc/Makefile.com
index a99827f813..173b6730ba 100644
--- a/usr/src/ucblib/librpcsoc/Makefile.com
+++ b/usr/src/ucblib/librpcsoc/Makefile.com
@@ -50,7 +50,7 @@ ROOTLIBDIR64= $(ROOT)/usr/ucblib/$(MACH64)
CPPFLAGS = -I$(SRC)/ucbhead -I../../../lib/libc/inc $(CPPFLAGS.master)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
diff --git a/usr/src/ucblib/libucb/Makefile.com b/usr/src/ucblib/libucb/Makefile.com
index 94c24fe097..304a385512 100644
--- a/usr/src/ucblib/libucb/Makefile.com
+++ b/usr/src/ucblib/libucb/Makefile.com
@@ -21,7 +21,7 @@
#
# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
# Copyright 2019 Peter Tribble.
#
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts
index 6d2a64c157..5fe9959e65 100644
--- a/usr/src/uts/Makefile.uts
+++ b/usr/src/uts/Makefile.uts
@@ -222,6 +222,11 @@ CERRWARN += -_gcc=-Wno-unknown-pragmas
CERRWARN += -_gcc=-Wno-unused-parameter
CERRWARN += -_gcc=-Wno-missing-field-initializers
+# gcc4 lacks -Wno-maybe-uninitialized
+CNOWARN_UNINIT = -_gcc4=-Wno-uninitialized \
+ -_gcc7=-Wno-maybe-uninitialized \
+ -_gcc8=-Wno-maybe-uninitialized
+
# DEBUG v. -nd make for frequent unused variables, empty conditions, etc. in
# -nd builds
$(RELEASE_BUILD)CERRWARN += -_gcc=-Wno-unused
diff --git a/usr/src/uts/common/vm/vm_pagelist.c b/usr/src/uts/common/vm/vm_pagelist.c
index 0f481b423d..f494c3d2b4 100644
--- a/usr/src/uts/common/vm/vm_pagelist.c
+++ b/usr/src/uts/common/vm/vm_pagelist.c
@@ -4179,8 +4179,7 @@ page_get_replacement_page(page_t *orig_like_pp, struct lgrp *lgrp_target,
if (PP_ISKAS(like_pp))
pgrflags |= PGR_SAMESZC;
- /* LINTED */
- MTYPE_PGR_INIT(mtype, flags, like_pp, page_mnode, npgs);
+ MTYPE_PGR_INIT(mtype, flags, like_pp, npgs);
while (npgs) {
pplist = NULL;
diff --git a/usr/src/uts/i86pc/acpidev/Makefile b/usr/src/uts/i86pc/acpidev/Makefile
index f8d6280dc9..cb27b9311e 100644
--- a/usr/src/uts/i86pc/acpidev/Makefile
+++ b/usr/src/uts/i86pc/acpidev/Makefile
@@ -61,7 +61,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
LDFLAGS += -dy -N misc/acpica
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/uts/i86pc/amd_iommu/Makefile b/usr/src/uts/i86pc/amd_iommu/Makefile
index 225f0c1f77..975efd5ef3 100644
--- a/usr/src/uts/i86pc/amd_iommu/Makefile
+++ b/usr/src/uts/i86pc/amd_iommu/Makefile
@@ -57,7 +57,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
LDFLAGS += -dy -Nmisc/iommulib -Nmisc/acpica
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86pc/cpr/Makefile b/usr/src/uts/i86pc/cpr/Makefile
index 2ecad49a61..787bb64645 100644
--- a/usr/src/uts/i86pc/cpr/Makefile
+++ b/usr/src/uts/i86pc/cpr/Makefile
@@ -69,7 +69,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
$(OBJS_DIR)/cpr_impl.o := CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86pc/cpudrv/Makefile b/usr/src/uts/i86pc/cpudrv/Makefile
index 590f8704bc..4caaf0aaea 100644
--- a/usr/src/uts/i86pc/cpudrv/Makefile
+++ b/usr/src/uts/i86pc/cpudrv/Makefile
@@ -52,7 +52,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86pc/dr/Makefile b/usr/src/uts/i86pc/dr/Makefile
index d91a421993..d73182731f 100644
--- a/usr/src/uts/i86pc/dr/Makefile
+++ b/usr/src/uts/i86pc/dr/Makefile
@@ -62,7 +62,7 @@ ALL_BUILDS = $(ALL_BUILDS64)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-empty-body
# needs work
diff --git a/usr/src/uts/i86pc/generic_cpu/Makefile b/usr/src/uts/i86pc/generic_cpu/Makefile
index d474c3a9da..72bbfca250 100644
--- a/usr/src/uts/i86pc/generic_cpu/Makefile
+++ b/usr/src/uts/i86pc/generic_cpu/Makefile
@@ -43,7 +43,7 @@ ROOTMODULE = $(ROOT_PSM_CPU_DIR)/$(MODULE)
include ../cpu/Makefile.cpu
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/i86pc/gfx_private/Makefile b/usr/src/uts/i86pc/gfx_private/Makefile
index f3f654c9d6..1281195fbd 100644
--- a/usr/src/uts/i86pc/gfx_private/Makefile
+++ b/usr/src/uts/i86pc/gfx_private/Makefile
@@ -65,7 +65,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# to investigate and remove these for maximum coverage.
# Please do not carry these forward to new Makefiles.
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/i86pc/i86hvm/xpvd/Makefile b/usr/src/uts/i86pc/i86hvm/xpvd/Makefile
index 9766da5078..98885f4507 100644
--- a/usr/src/uts/i86pc/i86hvm/xpvd/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/xpvd/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
CPPFLAGS += -DHVMPV_XPVD_VERS=1
LDFLAGS += -dy -Ndrv/xpv
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/i86pc/ioat/Makefile b/usr/src/uts/i86pc/ioat/Makefile
index f73619635c..4cf0bae58a 100644
--- a/usr/src/uts/i86pc/ioat/Makefile
+++ b/usr/src/uts/i86pc/ioat/Makefile
@@ -57,7 +57,7 @@ ALL_TARGET = $(BINARY) $(SRC_CONFILE)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Dependency
diff --git a/usr/src/uts/i86pc/npe/Makefile b/usr/src/uts/i86pc/npe/Makefile
index a5a66a00f8..34f38a787f 100644
--- a/usr/src/uts/i86pc/npe/Makefile
+++ b/usr/src/uts/i86pc/npe/Makefile
@@ -75,7 +75,7 @@ CFLAGS += -D_MODULE_NAME="\"$(MODULE)\""
# to investigate and remove these for maximum coverage.
# Please do not carry these forward to new Makefiles.
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86pc/pci/Makefile b/usr/src/uts/i86pc/pci/Makefile
index 96e9380af9..fadba51d81 100644
--- a/usr/src/uts/i86pc/pci/Makefile
+++ b/usr/src/uts/i86pc/pci/Makefile
@@ -73,7 +73,7 @@ CFLAGS += -D_MODULE_NAME="\"$(MODULE)\""
# Please do not carry these forward to new Makefiles.
#
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
#
diff --git a/usr/src/uts/i86pc/pcie/Makefile b/usr/src/uts/i86pc/pcie/Makefile
index b72a3772dc..c69c8f36e4 100644
--- a/usr/src/uts/i86pc/pcie/Makefile
+++ b/usr/src/uts/i86pc/pcie/Makefile
@@ -57,7 +57,7 @@ ALL_TARGET = $(BINARY)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CERRWARN += -_gcc=-Wno-unused-value
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function # safe
diff --git a/usr/src/uts/i86pc/ppm/Makefile b/usr/src/uts/i86pc/ppm/Makefile
index 59ce4a85ea..4f9ae61a49 100644
--- a/usr/src/uts/i86pc/ppm/Makefile
+++ b/usr/src/uts/i86pc/ppm/Makefile
@@ -62,7 +62,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
#
diff --git a/usr/src/uts/i86pc/rootnex/Makefile b/usr/src/uts/i86pc/rootnex/Makefile
index d618a53590..9824f9dd54 100644
--- a/usr/src/uts/i86pc/rootnex/Makefile
+++ b/usr/src/uts/i86pc/rootnex/Makefile
@@ -64,7 +64,7 @@ LDFLAGS += -dy -N misc/iommulib -N misc/acpica
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/immu_qinv.o := SMOFF += index_overflow
diff --git a/usr/src/uts/i86pc/tzmon/Makefile b/usr/src/uts/i86pc/tzmon/Makefile
index cbbef0eb0c..48468e0131 100644
--- a/usr/src/uts/i86pc/tzmon/Makefile
+++ b/usr/src/uts/i86pc/tzmon/Makefile
@@ -70,7 +70,7 @@ LDFLAGS += -dy -N misc/acpica
# to investigate and remove these for maximum coverage.
# Please do not carry these forward to new Makefiles.
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/i86pc/unix/Makefile b/usr/src/uts/i86pc/unix/Makefile
index fbd7976548..933b36a938 100644
--- a/usr/src/uts/i86pc/unix/Makefile
+++ b/usr/src/uts/i86pc/unix/Makefile
@@ -129,7 +129,7 @@ CFLAGS += -DDIS_MEM
# Please do not carry these forward to new Makefiles.
#
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86pc/vm/vm_dep.h b/usr/src/uts/i86pc/vm/vm_dep.h
index 07e277cedf..e1f04fd5d7 100644
--- a/usr/src/uts/i86pc/vm/vm_dep.h
+++ b/usr/src/uts/i86pc/vm/vm_dep.h
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2019 Joyent, Inc.
*/
/*
* Copyright (c) 2010, Intel Corporation.
@@ -305,9 +306,9 @@ extern int mtype_init(vnode_t *, caddr_t, uint_t *, size_t);
} \
}
-extern int mtype_pgr_init(int *, page_t *, int, pgcnt_t);
-#define MTYPE_PGR_INIT(mtype, flags, pp, mnode, pgcnt) \
- (mtype = mtype_pgr_init(&flags, pp, mnode, pgcnt))
+extern int mtype_pgr_init(int *, page_t *, pgcnt_t);
+#define MTYPE_PGR_INIT(mtype, flags, pp, pgcnt) \
+ (mtype = mtype_pgr_init(&flags, pp, pgcnt))
#define MNODE_PGCNT(mnode) mnode_pgcnt(mnode)
diff --git a/usr/src/uts/i86pc/vm/vm_machdep.c b/usr/src/uts/i86pc/vm/vm_machdep.c
index 28a5887d75..c1326a6643 100644
--- a/usr/src/uts/i86pc/vm/vm_machdep.c
+++ b/usr/src/uts/i86pc/vm/vm_machdep.c
@@ -1621,7 +1621,7 @@ mtype_init(vnode_t *vp, caddr_t vaddr, uint_t *flags, size_t pgsz)
/* mtype init for page_get_replacement_page */
/*ARGSUSED*/
int
-mtype_pgr_init(int *flags, page_t *pp, int mnode, pgcnt_t pgcnt)
+mtype_pgr_init(int *flags, page_t *pp, pgcnt_t pgcnt)
{
int mtype = mtypetop;
#if !defined(__xpv)
diff --git a/usr/src/uts/i86pc/xsvc/Makefile b/usr/src/uts/i86pc/xsvc/Makefile
index be21b26687..95deb601bc 100644
--- a/usr/src/uts/i86pc/xsvc/Makefile
+++ b/usr/src/uts/i86pc/xsvc/Makefile
@@ -67,7 +67,7 @@ LDFLAGS += -dy
MODSTUBS_DIR = $(OBJS_DIR)
CLEANFILES += $(MODSTUBS_O)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/i86xpv/generic_cpu/Makefile b/usr/src/uts/i86xpv/generic_cpu/Makefile
index d5503c572b..cb5182ddad 100644
--- a/usr/src/uts/i86xpv/generic_cpu/Makefile
+++ b/usr/src/uts/i86xpv/generic_cpu/Makefile
@@ -45,7 +45,7 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv
include $(UTSBASE)/i86pc/cpu/Makefile.files
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
#
diff --git a/usr/src/uts/i86xpv/gfx_private/Makefile b/usr/src/uts/i86xpv/gfx_private/Makefile
index 2415000d91..b2627ac283 100644
--- a/usr/src/uts/i86xpv/gfx_private/Makefile
+++ b/usr/src/uts/i86xpv/gfx_private/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_STATIC_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/i86xpv/ioat/Makefile b/usr/src/uts/i86xpv/ioat/Makefile
index b1c1f1553c..880c968740 100644
--- a/usr/src/uts/i86xpv/ioat/Makefile
+++ b/usr/src/uts/i86xpv/ioat/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Dependency
diff --git a/usr/src/uts/i86xpv/npe/Makefile b/usr/src/uts/i86xpv/npe/Makefile
index 0a3ed67eb1..5bcbb397dd 100644
--- a/usr/src/uts/i86xpv/npe/Makefile
+++ b/usr/src/uts/i86xpv/npe/Makefile
@@ -74,7 +74,7 @@ LINTFLAGS += -D_MODULE_NAME="\"$(MODULE)\""
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86xpv/pci/Makefile b/usr/src/uts/i86xpv/pci/Makefile
index e032aa6018..ee10c510b8 100644
--- a/usr/src/uts/i86xpv/pci/Makefile
+++ b/usr/src/uts/i86xpv/pci/Makefile
@@ -72,7 +72,7 @@ LINTFLAGS += -D_MODULE_NAME="\"$(MODULE)\""
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86xpv/privcmd/Makefile b/usr/src/uts/i86xpv/privcmd/Makefile
index 8c5ce59e10..5c01fdfc79 100644
--- a/usr/src/uts/i86xpv/privcmd/Makefile
+++ b/usr/src/uts/i86xpv/privcmd/Makefile
@@ -58,7 +58,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/i86xpv/rootnex/Makefile b/usr/src/uts/i86xpv/rootnex/Makefile
index 125f0c25f6..9b966d99ad 100644
--- a/usr/src/uts/i86xpv/rootnex/Makefile
+++ b/usr/src/uts/i86xpv/rootnex/Makefile
@@ -65,7 +65,7 @@ LDFLAGS += -dy
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-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/uts/i86xpv/unix/Makefile b/usr/src/uts/i86xpv/unix/Makefile
index 3528ca44f1..43f3a6dd37 100644
--- a/usr/src/uts/i86xpv/unix/Makefile
+++ b/usr/src/uts/i86xpv/unix/Makefile
@@ -140,7 +140,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86xpv/xdt/Makefile b/usr/src/uts/i86xpv/xdt/Makefile
index e3d3f987db..7a5cf0844e 100644
--- a/usr/src/uts/i86xpv/xdt/Makefile
+++ b/usr/src/uts/i86xpv/xdt/Makefile
@@ -40,7 +40,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
LDFLAGS += -dy -Ndrv/dtrace
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/uts/i86xpv/xnb/Makefile b/usr/src/uts/i86xpv/xnb/Makefile
index 59d6c55882..f8ee1c9fd4 100644
--- a/usr/src/uts/i86xpv/xnb/Makefile
+++ b/usr/src/uts/i86xpv/xnb/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += signed
diff --git a/usr/src/uts/i86xpv/xpv_psm/Makefile b/usr/src/uts/i86xpv/xpv_psm/Makefile
index f971123f53..1c40f8790b 100644
--- a/usr/src/uts/i86xpv/xpv_psm/Makefile
+++ b/usr/src/uts/i86xpv/xpv_psm/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-empty-body
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/i86xpv/xpvd/Makefile b/usr/src/uts/i86xpv/xpvd/Makefile
index 83359e9cfe..3acabb2c10 100644
--- a/usr/src/uts/i86xpv/xpvd/Makefile
+++ b/usr/src/uts/i86xpv/xpvd/Makefile
@@ -58,7 +58,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/i86xpv/xsvc/Makefile b/usr/src/uts/i86xpv/xsvc/Makefile
index 8414445dc1..ae3deaeb48 100644
--- a/usr/src/uts/i86xpv/xsvc/Makefile
+++ b/usr/src/uts/i86xpv/xsvc/Makefile
@@ -66,7 +66,7 @@ LDFLAGS += -dy
MODSTUBS_DIR = $(OBJS_DIR)
CLEANFILES += $(MODSTUBS_O)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/FSS/Makefile b/usr/src/uts/intel/FSS/Makefile
index dd4ea315d6..1b6c91519a 100644
--- a/usr/src/uts/intel/FSS/Makefile
+++ b/usr/src/uts/intel/FSS/Makefile
@@ -63,7 +63,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/fss.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/aac/Makefile b/usr/src/uts/intel/aac/Makefile
index dc832d136e..c058765408 100644
--- a/usr/src/uts/intel/aac/Makefile
+++ b/usr/src/uts/intel/aac/Makefile
@@ -66,7 +66,7 @@ LDFLAGS += -dy -Nmisc/scsi
# Overrides
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/intel/acpica/Makefile b/usr/src/uts/intel/acpica/Makefile
index e9ae57ab4c..f6e16ea479 100644
--- a/usr/src/uts/intel/acpica/Makefile
+++ b/usr/src/uts/intel/acpica/Makefile
@@ -63,7 +63,7 @@ LINTFLAGS += -errwarn=%none
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
#
diff --git a/usr/src/uts/intel/aggr/Makefile b/usr/src/uts/intel/aggr/Makefile
index c1acf014c7..424dab4a53 100644
--- a/usr/src/uts/intel/aggr/Makefile
+++ b/usr/src/uts/intel/aggr/Makefile
@@ -64,7 +64,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/ahci/Makefile b/usr/src/uts/intel/ahci/Makefile
index be7d89e485..14d99eaa97 100644
--- a/usr/src/uts/intel/ahci/Makefile
+++ b/usr/src/uts/intel/ahci/Makefile
@@ -70,7 +70,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
#
diff --git a/usr/src/uts/intel/arcmsr/Makefile b/usr/src/uts/intel/arcmsr/Makefile
index d389365c10..6f986864e5 100644
--- a/usr/src/uts/intel/arcmsr/Makefile
+++ b/usr/src/uts/intel/arcmsr/Makefile
@@ -45,7 +45,7 @@ include $(UTSBASE)/intel/Makefile.intel
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/arcmsr.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/arn/Makefile b/usr/src/uts/intel/arn/Makefile
index f25a80418f..95a5ace322 100644
--- a/usr/src/uts/intel/arn/Makefile
+++ b/usr/src/uts/intel/arn/Makefile
@@ -63,7 +63,7 @@ LDFLAGS += -dy -Nmisc/mac -Nmisc/net80211
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
# various issues
diff --git a/usr/src/uts/intel/asy/Makefile b/usr/src/uts/intel/asy/Makefile
index fc51587b26..5766f59ad7 100644
--- a/usr/src/uts/intel/asy/Makefile
+++ b/usr/src/uts/intel/asy/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/ata/Makefile b/usr/src/uts/intel/ata/Makefile
index c0c0584bf2..4dde927f6a 100644
--- a/usr/src/uts/intel/ata/Makefile
+++ b/usr/src/uts/intel/ata/Makefile
@@ -73,7 +73,7 @@ INC_PATH += -I$(UTSBASE)/intel/io/dktp/hba/ghd
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Depends on scsi
diff --git a/usr/src/uts/intel/atge/Makefile b/usr/src/uts/intel/atge/Makefile
index dc5fb963d0..b9a1123efb 100644
--- a/usr/src/uts/intel/atge/Makefile
+++ b/usr/src/uts/intel/atge/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# Overrides
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
#
diff --git a/usr/src/uts/intel/audio/Makefile b/usr/src/uts/intel/audio/Makefile
index 6b9547d4b5..3a7a1d6c21 100644
--- a/usr/src/uts/intel/audio/Makefile
+++ b/usr/src/uts/intel/audio/Makefile
@@ -45,7 +45,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/audio/impl
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/audio_grc3.o := SMOFF += index_overflow
diff --git a/usr/src/uts/intel/audiocmi/Makefile b/usr/src/uts/intel/audiocmi/Makefile
index d173c0442e..e8ac905821 100644
--- a/usr/src/uts/intel/audiocmi/Makefile
+++ b/usr/src/uts/intel/audiocmi/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/audiocmihd/Makefile b/usr/src/uts/intel/audiocmihd/Makefile
index fa3a3c43f6..21df6124ed 100644
--- a/usr/src/uts/intel/audiocmihd/Makefile
+++ b/usr/src/uts/intel/audiocmihd/Makefile
@@ -57,7 +57,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio -Nmisc/ac97
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/audioemu10k/Makefile b/usr/src/uts/intel/audioemu10k/Makefile
index c115cc4024..fe92af6169 100644
--- a/usr/src/uts/intel/audioemu10k/Makefile
+++ b/usr/src/uts/intel/audioemu10k/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio -Nmisc/ac97
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/audioens/Makefile b/usr/src/uts/intel/audioens/Makefile
index 8170620e89..31dc4428b3 100644
--- a/usr/src/uts/intel/audioens/Makefile
+++ b/usr/src/uts/intel/audioens/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio -Nmisc/ac97
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/audiohd/Makefile b/usr/src/uts/intel/audiohd/Makefile
index 11b5ae03fb..2342e05ed0 100644
--- a/usr/src/uts/intel/audiohd/Makefile
+++ b/usr/src/uts/intel/audiohd/Makefile
@@ -62,7 +62,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Ndrv/audio
diff --git a/usr/src/uts/intel/audiop16x/Makefile b/usr/src/uts/intel/audiop16x/Makefile
index e493e02fa5..5dfc4ef69b 100644
--- a/usr/src/uts/intel/audiop16x/Makefile
+++ b/usr/src/uts/intel/audiop16x/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio -Nmisc/ac97
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/audiopci/Makefile b/usr/src/uts/intel/audiopci/Makefile
index f33f56c260..046cdb639c 100644
--- a/usr/src/uts/intel/audiopci/Makefile
+++ b/usr/src/uts/intel/audiopci/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/audiosolo/Makefile b/usr/src/uts/intel/audiosolo/Makefile
index cc3e29e1ca..a0f5be43d3 100644
--- a/usr/src/uts/intel/audiosolo/Makefile
+++ b/usr/src/uts/intel/audiosolo/Makefile
@@ -53,7 +53,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += assign_vs_compare
diff --git a/usr/src/uts/intel/autofs/Makefile b/usr/src/uts/intel/autofs/Makefile
index 13744bab48..2c016535d7 100644
--- a/usr/src/uts/intel/autofs/Makefile
+++ b/usr/src/uts/intel/autofs/Makefile
@@ -74,7 +74,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/av1394/Makefile b/usr/src/uts/intel/av1394/Makefile
index acf063f91e..6aec73ec41 100644
--- a/usr/src/uts/intel/av1394/Makefile
+++ b/usr/src/uts/intel/av1394/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/uts/intel/bfe/Makefile b/usr/src/uts/intel/bfe/Makefile
index da2b8f55c5..1037153846 100644
--- a/usr/src/uts/intel/bfe/Makefile
+++ b/usr/src/uts/intel/bfe/Makefile
@@ -69,7 +69,7 @@ CPPFLAGS += $(VFLAGS) $(AFLAGS) $(DFLAGS) $(CFGFLAGS) $(CCVERBOSE) \
CFLAGS += $(CPPFLAGS)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Driver depends on MAC & IP
diff --git a/usr/src/uts/intel/bge/Makefile b/usr/src/uts/intel/bge/Makefile
index eedd8c38c6..456cbc9043 100644
--- a/usr/src/uts/intel/bge/Makefile
+++ b/usr/src/uts/intel/bge/Makefile
@@ -65,7 +65,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/blowfish/Makefile b/usr/src/uts/intel/blowfish/Makefile
index dd40e59c1e..a80406a6f1 100644
--- a/usr/src/uts/intel/blowfish/Makefile
+++ b/usr/src/uts/intel/blowfish/Makefile
@@ -75,7 +75,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/bnxe/Makefile b/usr/src/uts/intel/bnxe/Makefile
index 0c3441c161..9e686ee522 100644
--- a/usr/src/uts/intel/bnxe/Makefile
+++ b/usr/src/uts/intel/bnxe/Makefile
@@ -86,7 +86,7 @@ CPPFLAGS += -DLM_RXPKT_NON_CONTIGUOUS \
LDFLAGS += -dy -r -Ndrv/ip -Nmisc/mac
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-value
diff --git a/usr/src/uts/intel/bofi/Makefile b/usr/src/uts/intel/bofi/Makefile
index e419840e5f..5cd82b9879 100644
--- a/usr/src/uts/intel/bofi/Makefile
+++ b/usr/src/uts/intel/bofi/Makefile
@@ -69,7 +69,7 @@ CLEANFILES += $(MODSTUBS_O)
CPPFLAGS += -I../../sun4
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/bofi.o := SMOFF += signed_integer_overflow_check,deref_check
diff --git a/usr/src/uts/intel/bpf/Makefile b/usr/src/uts/intel/bpf/Makefile
index e96a03d04b..6b65e989db 100644
--- a/usr/src/uts/intel/bpf/Makefile
+++ b/usr/src/uts/intel/bpf/Makefile
@@ -73,7 +73,7 @@ INC_PATH += -I$(UTSBASE)/common/io/bpf
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/bpf.o := SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/bridge/Makefile b/usr/src/uts/intel/bridge/Makefile
index 65b7f28ee8..c93ac30992 100644
--- a/usr/src/uts/intel/bridge/Makefile
+++ b/usr/src/uts/intel/bridge/Makefile
@@ -57,7 +57,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/intel/bscv/Makefile b/usr/src/uts/intel/bscv/Makefile
index d450f08475..6a61281ca9 100644
--- a/usr/src/uts/intel/bscv/Makefile
+++ b/usr/src/uts/intel/bscv/Makefile
@@ -67,7 +67,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
#
diff --git a/usr/src/uts/intel/busra/Makefile b/usr/src/uts/intel/busra/Makefile
index 9bb7ea39ec..c0b0aef680 100644
--- a/usr/src/uts/intel/busra/Makefile
+++ b/usr/src/uts/intel/busra/Makefile
@@ -52,7 +52,7 @@ ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE)
include $(UTSBASE)/intel/Makefile.intel
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/intel/c2audit/Makefile b/usr/src/uts/intel/c2audit/Makefile
index 0afbc9383c..a0b21d0b52 100644
--- a/usr/src/uts/intel/c2audit/Makefile
+++ b/usr/src/uts/intel/c2audit/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/cardbus/Makefile b/usr/src/uts/intel/cardbus/Makefile
index a6eba6f056..f2576aba6b 100644
--- a/usr/src/uts/intel/cardbus/Makefile
+++ b/usr/src/uts/intel/cardbus/Makefile
@@ -81,7 +81,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/cmdk/Makefile b/usr/src/uts/intel/cmdk/Makefile
index 05532fd7b2..8de577e243 100644
--- a/usr/src/uts/intel/cmdk/Makefile
+++ b/usr/src/uts/intel/cmdk/Makefile
@@ -67,7 +67,7 @@ LDFLAGS += -dy -Nmisc/dadk -Nmisc/strategy -Nmisc/cmlb
CPPFLAGS += -D_EXTVTOC
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/uts/intel/cmlb/Makefile b/usr/src/uts/intel/cmlb/Makefile
index 8e09b5c030..05c03ff23d 100644
--- a/usr/src/uts/intel/cmlb/Makefile
+++ b/usr/src/uts/intel/cmlb/Makefile
@@ -75,7 +75,7 @@ CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/cmlb.o := SMOFF += signed
diff --git a/usr/src/uts/intel/core_pcbe/Makefile b/usr/src/uts/intel/core_pcbe/Makefile
index 2834b97621..e2c8499fde 100644
--- a/usr/src/uts/intel/core_pcbe/Makefile
+++ b/usr/src/uts/intel/core_pcbe/Makefile
@@ -118,7 +118,7 @@ ROOTSOFTLINKS = $(SOFTLINKS:%=$(USR_PCBE_DIR)/%)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CPPFLAGS += -I$(UTSBASE)/intel/core_pcbe
diff --git a/usr/src/uts/intel/cryptmod/Makefile b/usr/src/uts/intel/cryptmod/Makefile
index 4e9e2d5d41..57be67a788 100644
--- a/usr/src/uts/intel/cryptmod/Makefile
+++ b/usr/src/uts/intel/cryptmod/Makefile
@@ -65,7 +65,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/crypto/Makefile b/usr/src/uts/intel/crypto/Makefile
index adbd33bbc4..0ed9d0bd9a 100644
--- a/usr/src/uts/intel/crypto/Makefile
+++ b/usr/src/uts/intel/crypto/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
LDFLAGS += -dy -Nmisc/kcf
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/cryptoadm/Makefile b/usr/src/uts/intel/cryptoadm/Makefile
index 34917c1339..ddc0ad351b 100644
--- a/usr/src/uts/intel/cryptoadm/Makefile
+++ b/usr/src/uts/intel/cryptoadm/Makefile
@@ -66,7 +66,7 @@ LDFLAGS += -dy -Nmisc/kcf
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ctf/Makefile b/usr/src/uts/intel/ctf/Makefile
index 97457d0c0c..d3a359cb79 100644
--- a/usr/src/uts/intel/ctf/Makefile
+++ b/usr/src/uts/intel/ctf/Makefile
@@ -52,7 +52,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/uts/intel/daplt/Makefile b/usr/src/uts/intel/daplt/Makefile
index ef99701369..69e2435778 100644
--- a/usr/src/uts/intel/daplt/Makefile
+++ b/usr/src/uts/intel/daplt/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/daplt.o := SMOFF += all_func_returns,deref_check
diff --git a/usr/src/uts/intel/dcam1394/Makefile b/usr/src/uts/intel/dcam1394/Makefile
index c043878082..0b5f343a84 100644
--- a/usr/src/uts/intel/dcam1394/Makefile
+++ b/usr/src/uts/intel/dcam1394/Makefile
@@ -65,7 +65,7 @@ LDFLAGS += -dy -Nmisc/s1394
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# Default build targets.
#
diff --git a/usr/src/uts/intel/dcfs/Makefile b/usr/src/uts/intel/dcfs/Makefile
index ab0738de9c..8efff46405 100644
--- a/usr/src/uts/intel/dcfs/Makefile
+++ b/usr/src/uts/intel/dcfs/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/des/Makefile b/usr/src/uts/intel/des/Makefile
index 2c8045b380..1807a56139 100644
--- a/usr/src/uts/intel/des/Makefile
+++ b/usr/src/uts/intel/des/Makefile
@@ -80,7 +80,7 @@ LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/dev/Makefile b/usr/src/uts/intel/dev/Makefile
index c34feb9c18..6cc3fda6cd 100644
--- a/usr/src/uts/intel/dev/Makefile
+++ b/usr/src/uts/intel/dev/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/devinfo/Makefile b/usr/src/uts/intel/devinfo/Makefile
index 98219434c6..39790aed0c 100644
--- a/usr/src/uts/intel/devinfo/Makefile
+++ b/usr/src/uts/intel/devinfo/Makefile
@@ -62,7 +62,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
CPPFLAGS += -I$(SRC)/common
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/uts/intel/dld/Makefile b/usr/src/uts/intel/dld/Makefile
index a46b6046e9..0f22fea581 100644
--- a/usr/src/uts/intel/dld/Makefile
+++ b/usr/src/uts/intel/dld/Makefile
@@ -68,7 +68,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/intel/dls/Makefile b/usr/src/uts/intel/dls/Makefile
index 8a267c7a1a..0f67bd35b7 100644
--- a/usr/src/uts/intel/dls/Makefile
+++ b/usr/src/uts/intel/dls/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/dls_link.o := SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/dmfe/Makefile b/usr/src/uts/intel/dmfe/Makefile
index 1bef101854..8fbef4c1e6 100644
--- a/usr/src/uts/intel/dmfe/Makefile
+++ b/usr/src/uts/intel/dmfe/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# extra link arguments
diff --git a/usr/src/uts/intel/dnet/Makefile b/usr/src/uts/intel/dnet/Makefile
index ea395c5f63..1fbfc68ee1 100644
--- a/usr/src/uts/intel/dnet/Makefile
+++ b/usr/src/uts/intel/dnet/Makefile
@@ -61,7 +61,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/dnet.o := SMOFF += index_overflow
diff --git a/usr/src/uts/intel/doorfs/Makefile b/usr/src/uts/intel/doorfs/Makefile
index 289992ea9f..c130144226 100644
--- a/usr/src/uts/intel/doorfs/Makefile
+++ b/usr/src/uts/intel/doorfs/Makefile
@@ -75,7 +75,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/door_sys.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/dscpmk/Makefile b/usr/src/uts/intel/dscpmk/Makefile
index 5d5ed6d3b5..be0c768aa4 100644
--- a/usr/src/uts/intel/dscpmk/Makefile
+++ b/usr/src/uts/intel/dscpmk/Makefile
@@ -68,7 +68,7 @@ LDFLAGS += -dy -Ndrv/ip
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/dtrace/Makefile b/usr/src/uts/intel/dtrace/Makefile
index b3b5dd18ad..0462d6bd34 100644
--- a/usr/src/uts/intel/dtrace/Makefile
+++ b/usr/src/uts/intel/dtrace/Makefile
@@ -48,7 +48,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/dtrace.o := SMOFF += signed_integer_overflow_check,deref_check
diff --git a/usr/src/uts/intel/e1000g/Makefile b/usr/src/uts/intel/e1000g/Makefile
index d48b8f77a0..bf933f9b7e 100644
--- a/usr/src/uts/intel/e1000g/Makefile
+++ b/usr/src/uts/intel/e1000g/Makefile
@@ -58,7 +58,7 @@ CFLAGS_CPP_COMMENTS = -xCC
CFLAGS += $(CFLAGS_CPP_COMMENTS)
-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/uts/intel/ecc/Makefile b/usr/src/uts/intel/ecc/Makefile
index 04db887bcc..cfc6b066b2 100644
--- a/usr/src/uts/intel/ecc/Makefile
+++ b/usr/src/uts/intel/ecc/Makefile
@@ -66,7 +66,7 @@ LINTFLAGS += -I$(COM1_DIR) -I$(COM2_DIR)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-empty-body
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/ecpp/Makefile b/usr/src/uts/intel/ecpp/Makefile
index 9352ae18bf..6a847a8bc2 100644
--- a/usr/src/uts/intel/ecpp/Makefile
+++ b/usr/src/uts/intel/ecpp/Makefile
@@ -64,7 +64,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/efe/Makefile b/usr/src/uts/intel/efe/Makefile
index 687ffc28a0..3e53fa8aea 100644
--- a/usr/src/uts/intel/efe/Makefile
+++ b/usr/src/uts/intel/efe/Makefile
@@ -40,7 +40,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -N misc/mac -N misc/mii
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ehci/Makefile b/usr/src/uts/intel/ehci/Makefile
index acae04f03c..8c2192261e 100644
--- a/usr/src/uts/intel/ehci/Makefile
+++ b/usr/src/uts/intel/ehci/Makefile
@@ -43,7 +43,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/usb/hcd/ehci
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# needs work
diff --git a/usr/src/uts/intel/eibnx/Makefile b/usr/src/uts/intel/eibnx/Makefile
index 417c96518d..85d5ea3310 100644
--- a/usr/src/uts/intel/eibnx/Makefile
+++ b/usr/src/uts/intel/eibnx/Makefile
@@ -76,7 +76,7 @@ LDFLAGS += -dy -Nmisc/ibcm -Nmisc/ibtl
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/enx_ibt.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/elfexec/Makefile b/usr/src/uts/intel/elfexec/Makefile
index 44b43721f9..4444623960 100644
--- a/usr/src/uts/intel/elfexec/Makefile
+++ b/usr/src/uts/intel/elfexec/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/elxl/Makefile b/usr/src/uts/intel/elxl/Makefile
index 22f578c91d..0928deefb8 100644
--- a/usr/src/uts/intel/elxl/Makefile
+++ b/usr/src/uts/intel/elxl/Makefile
@@ -61,7 +61,7 @@ LDFLAGS += -dy -N misc/mac -N misc/mii
#
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
#
diff --git a/usr/src/uts/intel/emlxs/Makefile b/usr/src/uts/intel/emlxs/Makefile
index e29f1762ca..a59e9cdaa9 100644
--- a/usr/src/uts/intel/emlxs/Makefile
+++ b/usr/src/uts/intel/emlxs/Makefile
@@ -81,7 +81,7 @@ LDFLAGS += -Nmisc/bignum -Nmisc/fctl
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += indenting,deref_check,all_func_returns,index_overflow
diff --git a/usr/src/uts/intel/emul64/Makefile b/usr/src/uts/intel/emul64/Makefile
index f7fdba6865..4b40975a0e 100644
--- a/usr/src/uts/intel/emul64/Makefile
+++ b/usr/src/uts/intel/emul64/Makefile
@@ -69,7 +69,7 @@ CFLAGS += $(CCVERBOSE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += indenting,shift_to_zero
diff --git a/usr/src/uts/intel/eoib/Makefile b/usr/src/uts/intel/eoib/Makefile
index f9097dfa01..b91672cc9a 100644
--- a/usr/src/uts/intel/eoib/Makefile
+++ b/usr/src/uts/intel/eoib/Makefile
@@ -65,7 +65,7 @@ CPPFLAGS += -DEIB_DEBUG
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/eib_ibt.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/fasttrap/Makefile b/usr/src/uts/intel/fasttrap/Makefile
index f464ee90a9..259a685067 100644
--- a/usr/src/uts/intel/fasttrap/Makefile
+++ b/usr/src/uts/intel/fasttrap/Makefile
@@ -43,7 +43,7 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRC)/common
LDFLAGS += -dy -Ndrv/dtrace
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/uts/intel/fcp/Makefile b/usr/src/uts/intel/fcp/Makefile
index 1dfb19035f..0707670f06 100644
--- a/usr/src/uts/intel/fcp/Makefile
+++ b/usr/src/uts/intel/fcp/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
SMATCH=off
diff --git a/usr/src/uts/intel/fcsm/Makefile b/usr/src/uts/intel/fcsm/Makefile
index 042e429b0b..159d41efed 100644
--- a/usr/src/uts/intel/fcsm/Makefile
+++ b/usr/src/uts/intel/fcsm/Makefile
@@ -71,7 +71,7 @@ LDFLAGS += -dy -Nmisc/fctl
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/fct/Makefile b/usr/src/uts/intel/fct/Makefile
index ba4aa67b61..ffdcf940b6 100644
--- a/usr/src/uts/intel/fct/Makefile
+++ b/usr/src/uts/intel/fct/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_IF_ELSE_ANNOTATION
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += strcpy_overflow
diff --git a/usr/src/uts/intel/fctl/Makefile b/usr/src/uts/intel/fctl/Makefile
index 5d6dd01b08..d590e8cf19 100644
--- a/usr/src/uts/intel/fctl/Makefile
+++ b/usr/src/uts/intel/fctl/Makefile
@@ -63,7 +63,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/fctl.o := SMOFF += all_func_returns,deref_check
diff --git a/usr/src/uts/intel/fd/Makefile b/usr/src/uts/intel/fd/Makefile
index fd08395482..18a0e03594 100644
--- a/usr/src/uts/intel/fd/Makefile
+++ b/usr/src/uts/intel/fd/Makefile
@@ -65,7 +65,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/fd.o := SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/flowacct/Makefile b/usr/src/uts/intel/flowacct/Makefile
index 0b9f291825..5918b997d3 100644
--- a/usr/src/uts/intel/flowacct/Makefile
+++ b/usr/src/uts/intel/flowacct/Makefile
@@ -66,7 +66,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/fp/Makefile b/usr/src/uts/intel/fp/Makefile
index 63bb075df0..a102ee87ab 100644
--- a/usr/src/uts/intel/fp/Makefile
+++ b/usr/src/uts/intel/fp/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
LINTTAGS += -erroff=E_STATIC_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
# needs work
diff --git a/usr/src/uts/intel/genunix/Makefile b/usr/src/uts/intel/genunix/Makefile
index 58a50d801a..570674f903 100644
--- a/usr/src/uts/intel/genunix/Makefile
+++ b/usr/src/uts/intel/genunix/Makefile
@@ -85,7 +85,7 @@ CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-empty-body
diff --git a/usr/src/uts/intel/gld/Makefile b/usr/src/uts/intel/gld/Makefile
index 53869c40df..3b88451670 100644
--- a/usr/src/uts/intel/gld/Makefile
+++ b/usr/src/uts/intel/gld/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/intel/hci1394/Makefile b/usr/src/uts/intel/hci1394/Makefile
index 18c4f5ed6b..87902a5970 100644
--- a/usr/src/uts/intel/hci1394/Makefile
+++ b/usr/src/uts/intel/hci1394/Makefile
@@ -80,7 +80,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/intel/hermon/Makefile b/usr/src/uts/intel/hermon/Makefile
index bfcc27f547..b580f00b55 100644
--- a/usr/src/uts/intel/hermon/Makefile
+++ b/usr/src/uts/intel/hermon/Makefile
@@ -71,7 +71,7 @@ CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/hidparser/Makefile b/usr/src/uts/intel/hidparser/Makefile
index fa8db67f73..9aedf5edd7 100644
--- a/usr/src/uts/intel/hidparser/Makefile
+++ b/usr/src/uts/intel/hidparser/Makefile
@@ -46,7 +46,7 @@ ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/intel/hme/Makefile b/usr/src/uts/intel/hme/Makefile
index d84a20ab87..8f18f7c77d 100644
--- a/usr/src/uts/intel/hme/Makefile
+++ b/usr/src/uts/intel/hme/Makefile
@@ -60,7 +60,7 @@ LDFLAGS += -dy -Nmisc/mii -Nmisc/mac
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/hme.o := SMOFF += indenting,deref_check
diff --git a/usr/src/uts/intel/hook/Makefile b/usr/src/uts/intel/hook/Makefile
index ab9f0b8e04..c7e3804b3d 100644
--- a/usr/src/uts/intel/hook/Makefile
+++ b/usr/src/uts/intel/hook/Makefile
@@ -51,7 +51,7 @@ ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/hook.o := SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/hpcsvc/Makefile b/usr/src/uts/intel/hpcsvc/Makefile
index 0a219218ce..a2a6e5e134 100644
--- a/usr/src/uts/intel/hpcsvc/Makefile
+++ b/usr/src/uts/intel/hpcsvc/Makefile
@@ -57,7 +57,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
DEBUG_FLGS =
DEBUG_DEFS += $(DEBUG_FLGS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/hpcsvc.o := SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/hsfs/Makefile b/usr/src/uts/intel/hsfs/Makefile
index 10452c9754..88d4ecbbb0 100644
--- a/usr/src/uts/intel/hsfs/Makefile
+++ b/usr/src/uts/intel/hsfs/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-switch
diff --git a/usr/src/uts/intel/hxge/Makefile b/usr/src/uts/intel/hxge/Makefile
index 18e7597c86..911a3cecdf 100644
--- a/usr/src/uts/intel/hxge/Makefile
+++ b/usr/src/uts/intel/hxge/Makefile
@@ -83,7 +83,7 @@ LINTTAGS += -erroff=E_FALSE_LOGICAL_EXPR
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
SMOFF += deref_check,logical_instead_of_bitwise
diff --git a/usr/src/uts/intel/ib/Makefile b/usr/src/uts/intel/ib/Makefile
index 48b58d2c5f..8b3939c04b 100644
--- a/usr/src/uts/intel/ib/Makefile
+++ b/usr/src/uts/intel/ib/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
# Overrides.
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# lint pass one enforcement
diff --git a/usr/src/uts/intel/ibcm/Makefile b/usr/src/uts/intel/ibcm/Makefile
index 38b6520778..43db7246bc 100644
--- a/usr/src/uts/intel/ibcm/Makefile
+++ b/usr/src/uts/intel/ibcm/Makefile
@@ -63,7 +63,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
# needs work
diff --git a/usr/src/uts/intel/ibdm/Makefile b/usr/src/uts/intel/ibdm/Makefile
index 0dca661c45..644cbeca3c 100644
--- a/usr/src/uts/intel/ibdm/Makefile
+++ b/usr/src/uts/intel/ibdm/Makefile
@@ -75,7 +75,7 @@ LDFLAGS += -dy -Nmisc/ibtl -Nmisc/ibmf
LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ibmf/Makefile b/usr/src/uts/intel/ibmf/Makefile
index 8fe06342ed..d2271a55b9 100644
--- a/usr/src/uts/intel/ibmf/Makefile
+++ b/usr/src/uts/intel/ibmf/Makefile
@@ -69,7 +69,7 @@ CFLAGS += $(CCVERBOSE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/ibp/Makefile b/usr/src/uts/intel/ibp/Makefile
index 536aae0c8f..c1755b165f 100644
--- a/usr/src/uts/intel/ibp/Makefile
+++ b/usr/src/uts/intel/ibp/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# needs work
diff --git a/usr/src/uts/intel/ibtl/Makefile b/usr/src/uts/intel/ibtl/Makefile
index 7d0343b89c..4d01e0f362 100644
--- a/usr/src/uts/intel/ibtl/Makefile
+++ b/usr/src/uts/intel/ibtl/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-value
diff --git a/usr/src/uts/intel/idm/Makefile b/usr/src/uts/intel/idm/Makefile
index 703ca57dd3..d8c9b38121 100644
--- a/usr/src/uts/intel/idm/Makefile
+++ b/usr/src/uts/intel/idm/Makefile
@@ -60,7 +60,7 @@ LDFLAGS += -dy -Nfs/sockfs -Nmisc/ksocket
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/igb/Makefile b/usr/src/uts/intel/igb/Makefile
index 1f6864efbe..72d4b205b3 100644
--- a/usr/src/uts/intel/igb/Makefile
+++ b/usr/src/uts/intel/igb/Makefile
@@ -49,7 +49,7 @@ LINTFLAGS += \
-I$(UTSBASE)/common/io/e1000api
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_cc=-erroff=E_STATEMENT_NOT_REACHED
# needs work
diff --git a/usr/src/uts/intel/intel_nb5000/Makefile b/usr/src/uts/intel/intel_nb5000/Makefile
index 54c012824e..5d469b5ee9 100644
--- a/usr/src/uts/intel/intel_nb5000/Makefile
+++ b/usr/src/uts/intel/intel_nb5000/Makefile
@@ -62,7 +62,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
LDFLAGS += -dy -N drv/smbios
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/intel_nhm/Makefile b/usr/src/uts/intel/intel_nhm/Makefile
index 73e594c92f..9c72a19c02 100644
--- a/usr/src/uts/intel/intel_nhm/Makefile
+++ b/usr/src/uts/intel/intel_nhm/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
CPPFLAGS += -I$(UTSBASE)/i86pc
LDFLAGS += -dy -N drv/smbios
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ip/Makefile b/usr/src/uts/intel/ip/Makefile
index e9a8a88ba6..009a644393 100644
--- a/usr/src/uts/intel/ip/Makefile
+++ b/usr/src/uts/intel/ip/Makefile
@@ -66,7 +66,7 @@ CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
# false positives
diff --git a/usr/src/uts/intel/ipc/Makefile b/usr/src/uts/intel/ipc/Makefile
index 8bf9b9a67c..03969a22ad 100644
--- a/usr/src/uts/intel/ipc/Makefile
+++ b/usr/src/uts/intel/ipc/Makefile
@@ -64,7 +64,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ipf/Makefile b/usr/src/uts/intel/ipf/Makefile
index 78cd65310f..fc47a8db23 100644
--- a/usr/src/uts/intel/ipf/Makefile
+++ b/usr/src/uts/intel/ipf/Makefile
@@ -69,7 +69,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-empty-body
# needs work
diff --git a/usr/src/uts/intel/ipgpc/Makefile b/usr/src/uts/intel/ipgpc/Makefile
index 6de28b7aed..8c298cdf71 100644
--- a/usr/src/uts/intel/ipgpc/Makefile
+++ b/usr/src/uts/intel/ipgpc/Makefile
@@ -71,7 +71,7 @@ LDFLAGS += -dy -Ndrv/ip
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/filters.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/ipsecah/Makefile b/usr/src/uts/intel/ipsecah/Makefile
index 1111d5fe5d..d744c131f1 100644
--- a/usr/src/uts/intel/ipsecah/Makefile
+++ b/usr/src/uts/intel/ipsecah/Makefile
@@ -75,7 +75,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/ipsecahddi.o := SMOFF += index_overflow
diff --git a/usr/src/uts/intel/ipsecesp/Makefile b/usr/src/uts/intel/ipsecesp/Makefile
index 7e779dd409..713ad82d7c 100644
--- a/usr/src/uts/intel/ipsecesp/Makefile
+++ b/usr/src/uts/intel/ipsecesp/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/ipsecespddi.o := SMOFF += index_overflow
diff --git a/usr/src/uts/intel/iptun/Makefile b/usr/src/uts/intel/iptun/Makefile
index 24fb7f9fe8..a592222f04 100644
--- a/usr/src/uts/intel/iptun/Makefile
+++ b/usr/src/uts/intel/iptun/Makefile
@@ -61,7 +61,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ipw/Makefile b/usr/src/uts/intel/ipw/Makefile
index 8b29857bda..1301d081d3 100644
--- a/usr/src/uts/intel/ipw/Makefile
+++ b/usr/src/uts/intel/ipw/Makefile
@@ -51,7 +51,7 @@ include $(UTSBASE)/intel/Makefile.intel
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/ipw2100.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/iscsi/Makefile b/usr/src/uts/intel/iscsi/Makefile
index a9f2dc2140..9a71674dfa 100644
--- a/usr/src/uts/intel/iscsi/Makefile
+++ b/usr/src/uts/intel/iscsi/Makefile
@@ -73,7 +73,7 @@ CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/iscsit/Makefile b/usr/src/uts/intel/iscsit/Makefile
index 94bb0e9091..a35f7fc362 100644
--- a/usr/src/uts/intel/iscsit/Makefile
+++ b/usr/src/uts/intel/iscsit/Makefile
@@ -60,7 +60,7 @@ LDFLAGS += -dy -Ndrv/stmf -Nmisc/idm -Nfs/sockfs -Nmisc/md5 -Nmisc/ksocket
C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
# needs work
diff --git a/usr/src/uts/intel/iser/Makefile b/usr/src/uts/intel/iser/Makefile
index 0a8f4a2e2f..6245ad5be0 100644
--- a/usr/src/uts/intel/iser/Makefile
+++ b/usr/src/uts/intel/iser/Makefile
@@ -45,7 +45,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/iser
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/iser_ib.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/iwh/Makefile b/usr/src/uts/intel/iwh/Makefile
index 89a2dde869..ee7e3d9fcf 100644
--- a/usr/src/uts/intel/iwh/Makefile
+++ b/usr/src/uts/intel/iwh/Makefile
@@ -60,7 +60,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I. -D_KERNEL
diff --git a/usr/src/uts/intel/iwk/Makefile b/usr/src/uts/intel/iwk/Makefile
index 9cb38a51b0..12c4766c98 100644
--- a/usr/src/uts/intel/iwk/Makefile
+++ b/usr/src/uts/intel/iwk/Makefile
@@ -65,7 +65,7 @@ CPPFLAGS += -I. -D_KERNEL -DIWL=4965
LDFLAGS += -dy -Nmisc/mac -Nmisc/net80211 -Ndrv/random -Ndrv/ip
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/iwk2.o := SMOFF += precedence
diff --git a/usr/src/uts/intel/iwp/Makefile b/usr/src/uts/intel/iwp/Makefile
index c0c086d685..faaa67e7af 100644
--- a/usr/src/uts/intel/iwp/Makefile
+++ b/usr/src/uts/intel/iwp/Makefile
@@ -64,7 +64,7 @@ CPPFLAGS += -I. -D_KERNEL
LDFLAGS += -dy -Nmisc/mac -Nmisc/net80211 -Ndrv/random -Ndrv/ip
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ixgbe/Makefile b/usr/src/uts/intel/ixgbe/Makefile
index f19f151d60..27c747535a 100644
--- a/usr/src/uts/intel/ixgbe/Makefile
+++ b/usr/src/uts/intel/ixgbe/Makefile
@@ -57,7 +57,7 @@ INC_PATH += -I$(UTSBASE)/common/io/ixgbe/core
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_cc=-erroff=E_STATEMENT_NOT_REACHED
diff --git a/usr/src/uts/intel/kaio/Makefile b/usr/src/uts/intel/kaio/Makefile
index 4e2c736c9d..7e0c59ca89 100644
--- a/usr/src/uts/intel/kaio/Makefile
+++ b/usr/src/uts/intel/kaio/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/kcf/Makefile b/usr/src/uts/intel/kcf/Makefile
index 3ce1d9720c..bb758d8fd5 100644
--- a/usr/src/uts/intel/kcf/Makefile
+++ b/usr/src/uts/intel/kcf/Makefile
@@ -66,7 +66,7 @@ AS_CPPFLAGS += -I../../$(PLATFORM)
LINTTAGS += -I$(COM_DIR)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/intel/kgssapi/Makefile b/usr/src/uts/intel/kgssapi/Makefile
index ff27600ef6..936b08b18c 100644
--- a/usr/src/uts/intel/kgssapi/Makefile
+++ b/usr/src/uts/intel/kgssapi/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/gssd_clnt_stubs.o := SMOFF += indenting,deref_check
diff --git a/usr/src/uts/intel/kmech_krb5/Makefile b/usr/src/uts/intel/kmech_krb5/Makefile
index 27b311c000..718cb78994 100644
--- a/usr/src/uts/intel/kmech_krb5/Makefile
+++ b/usr/src/uts/intel/kmech_krb5/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/kssl/Makefile b/usr/src/uts/intel/kssl/Makefile
index 27c4519f62..5a9096e243 100644
--- a/usr/src/uts/intel/kssl/Makefile
+++ b/usr/src/uts/intel/kssl/Makefile
@@ -68,7 +68,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ksslf/Makefile b/usr/src/uts/intel/ksslf/Makefile
index 569a6666bb..575af1dbb5 100644
--- a/usr/src/uts/intel/ksslf/Makefile
+++ b/usr/src/uts/intel/ksslf/Makefile
@@ -68,7 +68,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/kstat/Makefile b/usr/src/uts/intel/kstat/Makefile
index c0321693a0..c4816b6a5c 100644
--- a/usr/src/uts/intel/kstat/Makefile
+++ b/usr/src/uts/intel/kstat/Makefile
@@ -64,7 +64,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/ldterm/Makefile b/usr/src/uts/intel/ldterm/Makefile
index 9911d74a04..0eea144a40 100644
--- a/usr/src/uts/intel/ldterm/Makefile
+++ b/usr/src/uts/intel/ldterm/Makefile
@@ -67,7 +67,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/llc1/Makefile b/usr/src/uts/intel/llc1/Makefile
index 1ad058e06c..ca5af56e24 100644
--- a/usr/src/uts/intel/llc1/Makefile
+++ b/usr/src/uts/intel/llc1/Makefile
@@ -67,7 +67,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/llc1.o := SMOFF += no_if_block,deref_check
diff --git a/usr/src/uts/intel/lofi/Makefile b/usr/src/uts/intel/lofi/Makefile
index 13b0bef650..c8d7e11770 100644
--- a/usr/src/uts/intel/lofi/Makefile
+++ b/usr/src/uts/intel/lofi/Makefile
@@ -49,7 +49,7 @@ include $(UTSBASE)/intel/Makefile.intel
#
INC_PATH += -I$(SRC)/common/lzma
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/intel/mac/Makefile b/usr/src/uts/intel/mac/Makefile
index 652e90aa67..6821a77c5f 100644
--- a/usr/src/uts/intel/mac/Makefile
+++ b/usr/src/uts/intel/mac/Makefile
@@ -60,7 +60,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/mc-amd/Makefile b/usr/src/uts/intel/mc-amd/Makefile
index e075b30b81..b9fdbc0b22 100644
--- a/usr/src/uts/intel/mc-amd/Makefile
+++ b/usr/src/uts/intel/mc-amd/Makefile
@@ -62,7 +62,7 @@ CLEANFILES += $(MCAMD_OFF_H)
CLOBBERFILES += $(MCAMD_OFF_H)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/mega_sas/Makefile b/usr/src/uts/intel/mega_sas/Makefile
index 916b2350ab..0290183544 100644
--- a/usr/src/uts/intel/mega_sas/Makefile
+++ b/usr/src/uts/intel/mega_sas/Makefile
@@ -53,7 +53,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
LDFLAGS += -dy -Nmisc/scsi
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/megaraid_sas.o := SMOFF += snprintf_overflow,all_func_returns,index_overflow
diff --git a/usr/src/uts/intel/mii/Makefile b/usr/src/uts/intel/mii/Makefile
index cd987a3a31..0c54b575c7 100644
--- a/usr/src/uts/intel/mii/Makefile
+++ b/usr/src/uts/intel/mii/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -N misc/mac
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/mpt_sas/Makefile b/usr/src/uts/intel/mpt_sas/Makefile
index 53e66fc2f2..38b7b55634 100644
--- a/usr/src/uts/intel/mpt_sas/Makefile
+++ b/usr/src/uts/intel/mpt_sas/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/mptsas_raid.o := SMOFF += index_overflow
diff --git a/usr/src/uts/intel/mr_sas/Makefile b/usr/src/uts/intel/mr_sas/Makefile
index d2771c91c9..338da74946 100644
--- a/usr/src/uts/intel/mr_sas/Makefile
+++ b/usr/src/uts/intel/mr_sas/Makefile
@@ -58,7 +58,7 @@ LDFLAGS += -dy -Nmisc/scsi
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/msgsys/Makefile b/usr/src/uts/intel/msgsys/Makefile
index bdf25b708b..160cfaa10f 100644
--- a/usr/src/uts/intel/msgsys/Makefile
+++ b/usr/src/uts/intel/msgsys/Makefile
@@ -67,7 +67,7 @@ LDFLAGS += -dy -Nmisc/ipc
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/mwl/Makefile b/usr/src/uts/intel/mwl/Makefile
index 3606a28511..65ac0b1348 100644
--- a/usr/src/uts/intel/mwl/Makefile
+++ b/usr/src/uts/intel/mwl/Makefile
@@ -65,7 +65,7 @@ LDFLAGS += -dy -Nmisc/mac -Nmisc/net80211
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
# needs work
diff --git a/usr/src/uts/intel/net80211/Makefile b/usr/src/uts/intel/net80211/Makefile
index 525570481e..7bb82ef58c 100644
--- a/usr/src/uts/intel/net80211/Makefile
+++ b/usr/src/uts/intel/net80211/Makefile
@@ -67,7 +67,7 @@ LDFLAGS += -dy -Nmisc/mac -Nmac/mac_wifi -Ndrv/ip
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/nfs/Makefile b/usr/src/uts/intel/nfs/Makefile
index c7eb9b02a1..b5ec5bcddd 100644
--- a/usr/src/uts/intel/nfs/Makefile
+++ b/usr/src/uts/intel/nfs/Makefile
@@ -80,7 +80,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-type-limits
-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/uts/intel/nfssrv/Makefile b/usr/src/uts/intel/nfssrv/Makefile
index 5b2d459a8f..d8c93d684b 100644
--- a/usr/src/uts/intel/nfssrv/Makefile
+++ b/usr/src/uts/intel/nfssrv/Makefile
@@ -80,7 +80,7 @@ CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
# needs work
diff --git a/usr/src/uts/intel/nge/Makefile b/usr/src/uts/intel/nge/Makefile
index fbca64a4cb..35c262905a 100644
--- a/usr/src/uts/intel/nge/Makefile
+++ b/usr/src/uts/intel/nge/Makefile
@@ -70,7 +70,7 @@ LDFLAGS += -dy -N misc/mac
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/nv_sata/Makefile b/usr/src/uts/intel/nv_sata/Makefile
index df6a1b50fd..fa7ff76189 100644
--- a/usr/src/uts/intel/nv_sata/Makefile
+++ b/usr/src/uts/intel/nv_sata/Makefile
@@ -75,7 +75,7 @@ LDFLAGS += -dy -N misc/sata
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/nv_sata.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/nxge/Makefile b/usr/src/uts/intel/nxge/Makefile
index 61e3982ef5..f344535e90 100644
--- a/usr/src/uts/intel/nxge/Makefile
+++ b/usr/src/uts/intel/nxge/Makefile
@@ -87,7 +87,7 @@ LINTTAGS += -erroff=E_FALSE_LOGICAL_EXPR
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
# needs work
diff --git a/usr/src/uts/intel/objfs/Makefile b/usr/src/uts/intel/objfs/Makefile
index fad14923da..552be404bc 100644
--- a/usr/src/uts/intel/objfs/Makefile
+++ b/usr/src/uts/intel/objfs/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/objfs_vfs.o := SMOFF += signed_integer_overflow_check
diff --git a/usr/src/uts/intel/oce/Makefile b/usr/src/uts/intel/oce/Makefile
index 5725f7676a..e3df59db66 100644
--- a/usr/src/uts/intel/oce/Makefile
+++ b/usr/src/uts/intel/oce/Makefile
@@ -58,7 +58,7 @@ LDFLAGS += -dy -Nmisc/mac
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/intel/ohci/Makefile b/usr/src/uts/intel/ohci/Makefile
index 39068183bc..30503428a2 100644
--- a/usr/src/uts/intel/ohci/Makefile
+++ b/usr/src/uts/intel/ohci/Makefile
@@ -64,7 +64,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/openeepr/Makefile b/usr/src/uts/intel/openeepr/Makefile
index 1f7608e4ec..eeb42523f6 100644
--- a/usr/src/uts/intel/openeepr/Makefile
+++ b/usr/src/uts/intel/openeepr/Makefile
@@ -67,7 +67,7 @@ LDFLAGS += -dy -Ndacf/consconfig_dacf
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/openprom.o := SMOFF += cast_assign,strcpy_overflow
diff --git a/usr/src/uts/intel/p4_pcbe/Makefile b/usr/src/uts/intel/p4_pcbe/Makefile
index 07689646c1..8100d759b4 100644
--- a/usr/src/uts/intel/p4_pcbe/Makefile
+++ b/usr/src/uts/intel/p4_pcbe/Makefile
@@ -60,7 +60,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/pcfs/Makefile b/usr/src/uts/intel/pcfs/Makefile
index a9e4f7b085..6a8ac0136f 100644
--- a/usr/src/uts/intel/pcfs/Makefile
+++ b/usr/src/uts/intel/pcfs/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
# needs work
diff --git a/usr/src/uts/intel/pcic/Makefile b/usr/src/uts/intel/pcic/Makefile
index 5312ac7c21..7b7da2a471 100644
--- a/usr/src/uts/intel/pcic/Makefile
+++ b/usr/src/uts/intel/pcic/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += no_if_block,indenting,all_func_returns
diff --git a/usr/src/uts/intel/pcicfg/Makefile b/usr/src/uts/intel/pcicfg/Makefile
index 68e00c9d1f..dbec8ad429 100644
--- a/usr/src/uts/intel/pcicfg/Makefile
+++ b/usr/src/uts/intel/pcicfg/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/pcicfg.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/pcmcia/Makefile b/usr/src/uts/intel/pcmcia/Makefile
index d48374ff64..ef5bd91de6 100644
--- a/usr/src/uts/intel/pcmcia/Makefile
+++ b/usr/src/uts/intel/pcmcia/Makefile
@@ -81,7 +81,7 @@ LDFLAGS += -dy -Nmisc/busra -Nmisc/pci_autoconfig
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/pm/Makefile b/usr/src/uts/intel/pm/Makefile
index 66acca85d2..b7dd6fa040 100644
--- a/usr/src/uts/intel/pm/Makefile
+++ b/usr/src/uts/intel/pm/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/pmcs/Makefile b/usr/src/uts/intel/pmcs/Makefile
index 62243ffa9f..6c779a76d1 100644
--- a/usr/src/uts/intel/pmcs/Makefile
+++ b/usr/src/uts/intel/pmcs/Makefile
@@ -63,7 +63,7 @@ CPPFLAGS += $(PMCS_DRV_FLGS) \
-DPMCS_FIRMWARE_VERSION_STRING=\"${PMCS_FW_VERSION_STRING}\"
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/intel/poll/Makefile b/usr/src/uts/intel/poll/Makefile
index b4be5deb63..e89e52d63b 100644
--- a/usr/src/uts/intel/poll/Makefile
+++ b/usr/src/uts/intel/poll/Makefile
@@ -49,7 +49,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# It's unfortunate that we have to disable this; however, it's lint's fault. We
diff --git a/usr/src/uts/intel/portfs/Makefile b/usr/src/uts/intel/portfs/Makefile
index 2d784dcb70..162a152398 100644
--- a/usr/src/uts/intel/portfs/Makefile
+++ b/usr/src/uts/intel/portfs/Makefile
@@ -74,7 +74,7 @@ CLEANFILES += $(MODSTUBS_O)
#
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/pppt/Makefile b/usr/src/uts/intel/pppt/Makefile
index f492a4d1b0..d4d4dcbdbf 100644
--- a/usr/src/uts/intel/pppt/Makefile
+++ b/usr/src/uts/intel/pppt/Makefile
@@ -63,7 +63,7 @@ LDFLAGS += -dy -Ndrv/stmf
C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/procfs/Makefile b/usr/src/uts/intel/procfs/Makefile
index 1e5fc27935..ce2c05dcbe 100644
--- a/usr/src/uts/intel/procfs/Makefile
+++ b/usr/src/uts/intel/procfs/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/prsubr.o := SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/ptem/Makefile b/usr/src/uts/intel/ptem/Makefile
index 55cec27bcd..639f8d7797 100644
--- a/usr/src/uts/intel/ptem/Makefile
+++ b/usr/src/uts/intel/ptem/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/qlc/Makefile b/usr/src/uts/intel/qlc/Makefile
index 22661960b6..c165f33852 100644
--- a/usr/src/uts/intel/qlc/Makefile
+++ b/usr/src/uts/intel/qlc/Makefile
@@ -78,7 +78,7 @@ FWIMAGES += 8100
FWMODULES = $(FWIMAGES:%=$(MODULE)_fw_%)
FWMODULES_SRC = $(FWIMAGES:%=$(CONF_SRCDIR)/ql_fw_%.c)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/intel/qlge/Makefile b/usr/src/uts/intel/qlge/Makefile
index 425923a037..ad10aadb72 100644
--- a/usr/src/uts/intel/qlge/Makefile
+++ b/usr/src/uts/intel/qlge/Makefile
@@ -65,7 +65,7 @@ LDFLAGS += -dy -Nmisc/mac -Ndrv/ip
C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/qlge.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/qlt/Makefile b/usr/src/uts/intel/qlt/Makefile
index 6285b973eb..9098c57c59 100644
--- a/usr/src/uts/intel/qlt/Makefile
+++ b/usr/src/uts/intel/qlt/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/rds/Makefile b/usr/src/uts/intel/rds/Makefile
index c70ffa30ad..71446fe7a0 100644
--- a/usr/src/uts/intel/rds/Makefile
+++ b/usr/src/uts/intel/rds/Makefile
@@ -42,7 +42,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/rds
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/intel/rdsib/Makefile b/usr/src/uts/intel/rdsib/Makefile
index 72d81caa89..6213028921 100644
--- a/usr/src/uts/intel/rdsib/Makefile
+++ b/usr/src/uts/intel/rdsib/Makefile
@@ -43,7 +43,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/rds
include $(UTSBASE)/intel/Makefile.intel
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/intel/rdsv3/Makefile b/usr/src/uts/intel/rdsv3/Makefile
index 7ef904de97..c389402f37 100644
--- a/usr/src/uts/intel/rdsv3/Makefile
+++ b/usr/src/uts/intel/rdsv3/Makefile
@@ -63,7 +63,7 @@ LINTTAGS += -erroff=E_FUNC_SET_NOT_USED
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/rge/Makefile b/usr/src/uts/intel/rge/Makefile
index 51ade3de5b..fb9a8da37e 100644
--- a/usr/src/uts/intel/rge/Makefile
+++ b/usr/src/uts/intel/rge/Makefile
@@ -66,7 +66,7 @@ LDFLAGS += -dy -N misc/mac -N drv/ip
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# looks like a real bug in rge_phy_update() !
$(OBJS_DIR)/rge_chip.o := SMOFF += indenting
diff --git a/usr/src/uts/intel/rlmod/Makefile b/usr/src/uts/intel/rlmod/Makefile
index c517b8ea5d..a1b90ed1de 100644
--- a/usr/src/uts/intel/rlmod/Makefile
+++ b/usr/src/uts/intel/rlmod/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/rpcib/Makefile b/usr/src/uts/intel/rpcib/Makefile
index ce04217815..016dce38e9 100644
--- a/usr/src/uts/intel/rpcib/Makefile
+++ b/usr/src/uts/intel/rpcib/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/rpcmod/Makefile b/usr/src/uts/intel/rpcmod/Makefile
index db4e739b07..6833fdd7c1 100644
--- a/usr/src/uts/intel/rpcmod/Makefile
+++ b/usr/src/uts/intel/rpcmod/Makefile
@@ -84,7 +84,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/intel/rpcsec/Makefile b/usr/src/uts/intel/rpcsec/Makefile
index 843d7dc880..ff8178bfb9 100644
--- a/usr/src/uts/intel/rpcsec/Makefile
+++ b/usr/src/uts/intel/rpcsec/Makefile
@@ -67,7 +67,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/auth_des.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/rsa/Makefile b/usr/src/uts/intel/rsa/Makefile
index cf9ba78959..4e61a69ad2 100644
--- a/usr/src/uts/intel/rsa/Makefile
+++ b/usr/src/uts/intel/rsa/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/rsm/Makefile b/usr/src/uts/intel/rsm/Makefile
index c828628870..172022c0ad 100644
--- a/usr/src/uts/intel/rsm/Makefile
+++ b/usr/src/uts/intel/rsm/Makefile
@@ -79,7 +79,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/rtls/Makefile b/usr/src/uts/intel/rtls/Makefile
index c688f5e940..aea726b2af 100644
--- a/usr/src/uts/intel/rtls/Makefile
+++ b/usr/src/uts/intel/rtls/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# Overrides
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Driver depends on Mac
diff --git a/usr/src/uts/intel/s1394/Makefile b/usr/src/uts/intel/s1394/Makefile
index f7f8fd3299..2968cc45d4 100644
--- a/usr/src/uts/intel/s1394/Makefile
+++ b/usr/src/uts/intel/s1394/Makefile
@@ -80,7 +80,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
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/uts/intel/sad/Makefile b/usr/src/uts/intel/sad/Makefile
index 5220e4999c..d9c67f0357 100644
--- a/usr/src/uts/intel/sad/Makefile
+++ b/usr/src/uts/intel/sad/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/sata/Makefile b/usr/src/uts/intel/sata/Makefile
index 03a67ad97c..436c53f4a3 100644
--- a/usr/src/uts/intel/sata/Makefile
+++ b/usr/src/uts/intel/sata/Makefile
@@ -90,7 +90,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-empty-body
# needs work
diff --git a/usr/src/uts/intel/scsa1394/Makefile b/usr/src/uts/intel/scsa1394/Makefile
index 2545171295..9e8573e82d 100644
--- a/usr/src/uts/intel/scsa1394/Makefile
+++ b/usr/src/uts/intel/scsa1394/Makefile
@@ -65,7 +65,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/sbp2_driver.o := SMOFF += indenting
diff --git a/usr/src/uts/intel/scsa2usb/Makefile b/usr/src/uts/intel/scsa2usb/Makefile
index 342cc1f0fa..3542ef25de 100644
--- a/usr/src/uts/intel/scsa2usb/Makefile
+++ b/usr/src/uts/intel/scsa2usb/Makefile
@@ -72,7 +72,7 @@ LDFLAGS += -dy -Nmisc/usba -Nmisc/scsi
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/scsa2usb.o := SMOFF += deref_check
diff --git a/usr/src/uts/intel/scsi/Makefile b/usr/src/uts/intel/scsi/Makefile
index 60577c36d7..f29902c748 100644
--- a/usr/src/uts/intel/scsi/Makefile
+++ b/usr/src/uts/intel/scsi/Makefile
@@ -74,7 +74,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/scsi_vhci/Makefile b/usr/src/uts/intel/scsi_vhci/Makefile
index 80191c40e0..f42501361b 100644
--- a/usr/src/uts/intel/scsi_vhci/Makefile
+++ b/usr/src/uts/intel/scsi_vhci/Makefile
@@ -50,7 +50,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/scsi/adapters/scsi_vhci
include $(UTSBASE)/intel/Makefile.intel
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
# needs work
diff --git a/usr/src/uts/intel/semsys/Makefile b/usr/src/uts/intel/semsys/Makefile
index 4691fd01dd..02c21c77b7 100644
--- a/usr/src/uts/intel/semsys/Makefile
+++ b/usr/src/uts/intel/semsys/Makefile
@@ -70,7 +70,7 @@ LDFLAGS += -dy -Nmisc/ipc
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/sfe/Makefile b/usr/src/uts/intel/sfe/Makefile
index e0b2b5e461..2df44c6a42 100644
--- a/usr/src/uts/intel/sfe/Makefile
+++ b/usr/src/uts/intel/sfe/Makefile
@@ -78,7 +78,7 @@ CFLAGS += $(CPPFLAGS)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/sgen/Makefile b/usr/src/uts/intel/sgen/Makefile
index 39e2c07e44..2fd9d9cd80 100644
--- a/usr/src/uts/intel/sgen/Makefile
+++ b/usr/src/uts/intel/sgen/Makefile
@@ -69,7 +69,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/sha2/Makefile b/usr/src/uts/intel/sha2/Makefile
index 320d5700eb..bad616925f 100644
--- a/usr/src/uts/intel/sha2/Makefile
+++ b/usr/src/uts/intel/sha2/Makefile
@@ -68,7 +68,7 @@ CFLAGS += -I$(COMDIR)
LINTFLAGS += -I$(COMDIR)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/si3124/Makefile b/usr/src/uts/intel/si3124/Makefile
index b778602e28..78fe0d92bc 100644
--- a/usr/src/uts/intel/si3124/Makefile
+++ b/usr/src/uts/intel/si3124/Makefile
@@ -64,7 +64,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
DEBUG_FLGS =
DEBUG_DEFS += $(DEBUG_FLGS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# lint pass one enforcement
diff --git a/usr/src/uts/intel/smbfs/Makefile b/usr/src/uts/intel/smbfs/Makefile
index 5a23cf0c54..8fc37428c3 100644
--- a/usr/src/uts/intel/smbfs/Makefile
+++ b/usr/src/uts/intel/smbfs/Makefile
@@ -64,7 +64,7 @@ LDFLAGS += -dy -Ndrv/nsmb
# Until CR 4994570 is fixed...
LINTTAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += all_func_returns,signed,deref_check
diff --git a/usr/src/uts/intel/sockfs/Makefile b/usr/src/uts/intel/sockfs/Makefile
index a62b4eaf0a..7ca35b6e67 100644
--- a/usr/src/uts/intel/sockfs/Makefile
+++ b/usr/src/uts/intel/sockfs/Makefile
@@ -92,7 +92,7 @@ CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/sockpfp/Makefile b/usr/src/uts/intel/sockpfp/Makefile
index 2179fd50ff..cd2b1a0232 100644
--- a/usr/src/uts/intel/sockpfp/Makefile
+++ b/usr/src/uts/intel/sockpfp/Makefile
@@ -64,7 +64,7 @@ INC_PATH += -I$(UTSBASE)/common/inet/sockmods -I$(UTSBASE)/common/io/bpf
#
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
# needs work
diff --git a/usr/src/uts/intel/socksctp/Makefile b/usr/src/uts/intel/socksctp/Makefile
index 31efabc0d0..00e6ee4b75 100644
--- a/usr/src/uts/intel/socksctp/Makefile
+++ b/usr/src/uts/intel/socksctp/Makefile
@@ -69,7 +69,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/socksdp/Makefile b/usr/src/uts/intel/socksdp/Makefile
index 17cda95dce..32248ae0a6 100644
--- a/usr/src/uts/intel/socksdp/Makefile
+++ b/usr/src/uts/intel/socksdp/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Nfs/sockfs -Ndrv/ip -Ndrv/sdpib
diff --git a/usr/src/uts/intel/softmac/Makefile b/usr/src/uts/intel/softmac/Makefile
index 347b1bdc7a..5fe4962f88 100644
--- a/usr/src/uts/intel/softmac/Makefile
+++ b/usr/src/uts/intel/softmac/Makefile
@@ -62,7 +62,7 @@ LDFLAGS += -dy -Ndrv/dld -Nmisc/mac -Nmisc/strplumb -Nmisc/dls
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
#
diff --git a/usr/src/uts/intel/sol_ofs/Makefile b/usr/src/uts/intel/sol_ofs/Makefile
index 133af5c292..ab17e465ad 100644
--- a/usr/src/uts/intel/sol_ofs/Makefile
+++ b/usr/src/uts/intel/sol_ofs/Makefile
@@ -60,7 +60,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_CONST_TRUNCATED_BY_ASSIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/sol_umad/Makefile b/usr/src/uts/intel/sol_umad/Makefile
index 2d76f118a1..0d99bc8fb1 100644
--- a/usr/src/uts/intel/sol_umad/Makefile
+++ b/usr/src/uts/intel/sol_umad/Makefile
@@ -42,7 +42,7 @@ LDFLAGS += -dy -Nmisc/sol_ofs -Nmisc/ibmf -Nmisc/ibtl
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/intel/spdsock/Makefile b/usr/src/uts/intel/spdsock/Makefile
index 63a2aeb834..fdc5ffad05 100644
--- a/usr/src/uts/intel/spdsock/Makefile
+++ b/usr/src/uts/intel/spdsock/Makefile
@@ -67,7 +67,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/spdsockddi.o := SMOFF += index_overflow
diff --git a/usr/src/uts/intel/specfs/Makefile b/usr/src/uts/intel/specfs/Makefile
index ea18e2e9b7..77e6bf92d8 100644
--- a/usr/src/uts/intel/specfs/Makefile
+++ b/usr/src/uts/intel/specfs/Makefile
@@ -74,7 +74,7 @@ LDFLAGS += -dy -Nfs/fifofs
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/specvnops.o := SMOFF += signed
diff --git a/usr/src/uts/intel/sppp/Makefile b/usr/src/uts/intel/sppp/Makefile
index eafe63dc5d..7f57d575e5 100644
--- a/usr/src/uts/intel/sppp/Makefile
+++ b/usr/src/uts/intel/sppp/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/spppcomp/Makefile b/usr/src/uts/intel/spppcomp/Makefile
index 30f6bb387f..f02988bdbf 100644
--- a/usr/src/uts/intel/spppcomp/Makefile
+++ b/usr/src/uts/intel/spppcomp/Makefile
@@ -62,7 +62,7 @@ CPPFLAGS += -DINTERNAL_BUILD -DSOL2 -DMUX_FRAME
INC_PATH += -I$(UTSBASE)/common/io/ppp/common
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += indenting,index_overflow
diff --git a/usr/src/uts/intel/sppptun/Makefile b/usr/src/uts/intel/sppptun/Makefile
index 6bb25046bc..827c7e896f 100644
--- a/usr/src/uts/intel/sppptun/Makefile
+++ b/usr/src/uts/intel/sppptun/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/srn/Makefile b/usr/src/uts/intel/srn/Makefile
index 37e7df0aec..7eca930ebf 100644
--- a/usr/src/uts/intel/srn/Makefile
+++ b/usr/src/uts/intel/srn/Makefile
@@ -50,7 +50,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/intel/st/Makefile b/usr/src/uts/intel/st/Makefile
index 7dbef2c9db..b4da8fff9f 100644
--- a/usr/src/uts/intel/st/Makefile
+++ b/usr/src/uts/intel/st/Makefile
@@ -69,7 +69,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMATCH=off
diff --git a/usr/src/uts/intel/stmf/Makefile b/usr/src/uts/intel/stmf/Makefile
index 32eb938f7b..351d4b5781 100644
--- a/usr/src/uts/intel/stmf/Makefile
+++ b/usr/src/uts/intel/stmf/Makefile
@@ -69,7 +69,7 @@ C99LMODE= -Xc99=%all
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_STATIC_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/stmf_sbd/Makefile b/usr/src/uts/intel/stmf_sbd/Makefile
index 4259f16b69..bbee85d605 100644
--- a/usr/src/uts/intel/stmf_sbd/Makefile
+++ b/usr/src/uts/intel/stmf_sbd/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/tavor/Makefile b/usr/src/uts/intel/tavor/Makefile
index 397e2c3f5f..57d416e606 100644
--- a/usr/src/uts/intel/tavor/Makefile
+++ b/usr/src/uts/intel/tavor/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
# needs work
diff --git a/usr/src/uts/intel/tem/Makefile b/usr/src/uts/intel/tem/Makefile
index bfeecb298b..9eca2e7d98 100644
--- a/usr/src/uts/intel/tem/Makefile
+++ b/usr/src/uts/intel/tem/Makefile
@@ -63,7 +63,7 @@ LDFLAGS += -dy -Ndacf/consconfig_dacf
LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/tl/Makefile b/usr/src/uts/intel/tl/Makefile
index c820c5b179..f49cc7746c 100644
--- a/usr/src/uts/intel/tl/Makefile
+++ b/usr/src/uts/intel/tl/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/tmpfs/Makefile b/usr/src/uts/intel/tmpfs/Makefile
index bfc9769c6d..97a59fdb1a 100644
--- a/usr/src/uts/intel/tmpfs/Makefile
+++ b/usr/src/uts/intel/tmpfs/Makefile
@@ -67,7 +67,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
# needs work
diff --git a/usr/src/uts/intel/tnf/Makefile b/usr/src/uts/intel/tnf/Makefile
index de264140d0..583f831a7f 100644
--- a/usr/src/uts/intel/tnf/Makefile
+++ b/usr/src/uts/intel/tnf/Makefile
@@ -68,7 +68,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/tnf_writer.o := SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/trill/Makefile b/usr/src/uts/intel/trill/Makefile
index bc9f9ed05f..f3aa9d2178 100644
--- a/usr/src/uts/intel/trill/Makefile
+++ b/usr/src/uts/intel/trill/Makefile
@@ -44,7 +44,7 @@ ROOTMODULE = $(ROOT_SOCK_DIR)/$(MODULE)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += all_func_returns
diff --git a/usr/src/uts/intel/udfs/Makefile b/usr/src/uts/intel/udfs/Makefile
index 244123e4f3..91b5c1cc87 100644
--- a/usr/src/uts/intel/udfs/Makefile
+++ b/usr/src/uts/intel/udfs/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
# needs work
diff --git a/usr/src/uts/intel/ufs/Makefile b/usr/src/uts/intel/ufs/Makefile
index 0264031fcd..8faca5b49d 100644
--- a/usr/src/uts/intel/ufs/Makefile
+++ b/usr/src/uts/intel/ufs/Makefile
@@ -79,7 +79,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/intel/ugen/Makefile b/usr/src/uts/intel/ugen/Makefile
index 9c910827f1..9f128da034 100644
--- a/usr/src/uts/intel/ugen/Makefile
+++ b/usr/src/uts/intel/ugen/Makefile
@@ -47,7 +47,7 @@ ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/intel/uhci/Makefile b/usr/src/uts/intel/uhci/Makefile
index c8b5992927..687ef09254 100644
--- a/usr/src/uts/intel/uhci/Makefile
+++ b/usr/src/uts/intel/uhci/Makefile
@@ -71,7 +71,7 @@ LDFLAGS += -dy -Nmisc/usba
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/urf/Makefile b/usr/src/uts/intel/urf/Makefile
index 93b6b1aafb..a9f2f815e8 100644
--- a/usr/src/uts/intel/urf/Makefile
+++ b/usr/src/uts/intel/urf/Makefile
@@ -34,7 +34,7 @@ include $(UTSBASE)/intel/Makefile.intel
CPPFLAGS += -I$(UTSBASE)/common/io/usbgem
CPPFLAGS += -DVERSION=\"2.0.0\"
CPPFLAGS += -DUSBGEM_CONFIG_GLDv3
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -N misc/mac -N drv/ip -N misc/usba -N misc/usbgem
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/intel/urtw/Makefile b/usr/src/uts/intel/urtw/Makefile
index 76d86130c7..12c20b148c 100644
--- a/usr/src/uts/intel/urtw/Makefile
+++ b/usr/src/uts/intel/urtw/Makefile
@@ -63,7 +63,7 @@ LDFLAGS += -dy -Nmisc/mac -Nmisc/net80211 -Nmisc/usba
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check,no_if_block,all_func_returns
diff --git a/usr/src/uts/intel/usb_ac/Makefile b/usr/src/uts/intel/usb_ac/Makefile
index 43e880c9ee..a4cf979a15 100644
--- a/usr/src/uts/intel/usb_ac/Makefile
+++ b/usr/src/uts/intel/usb_ac/Makefile
@@ -62,7 +62,7 @@ CLEANFILES += $(MODSTUBS_O)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
$(OBJS_DIR)/usb_ac.o := SMOFF += deref_check,indenting,testing_index_after_use
diff --git a/usr/src/uts/intel/usb_ah/Makefile b/usr/src/uts/intel/usb_ah/Makefile
index a9984f9399..aac32060a4 100644
--- a/usr/src/uts/intel/usb_ah/Makefile
+++ b/usr/src/uts/intel/usb_ah/Makefile
@@ -72,7 +72,7 @@ LDFLAGS += -dy -Nmisc/usba -Nmisc/hidparser -Ndrv/usb_ac
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/usbftdi/Makefile b/usr/src/uts/intel/usbftdi/Makefile
index 4f9da61490..8eb47fb6a8 100644
--- a/usr/src/uts/intel/usbftdi/Makefile
+++ b/usr/src/uts/intel/usbftdi/Makefile
@@ -46,7 +46,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/usb/clients/usbser/usbftdi
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Nmisc/usba -Nmisc/usbser
diff --git a/usr/src/uts/intel/usbgem/Makefile b/usr/src/uts/intel/usbgem/Makefile
index 3d9bfe6e6e..6afc012974 100644
--- a/usr/src/uts/intel/usbgem/Makefile
+++ b/usr/src/uts/intel/usbgem/Makefile
@@ -42,7 +42,7 @@ CPPFLAGS += \
-DUSBGEM_CONFIG_MAC_PROP \
-DVERSION=\"1.6\"
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/intel/usbms/Makefile b/usr/src/uts/intel/usbms/Makefile
index 0a184975d0..e6819d37a6 100644
--- a/usr/src/uts/intel/usbms/Makefile
+++ b/usr/src/uts/intel/usbms/Makefile
@@ -69,7 +69,7 @@ LDFLAGS += -dy -Nmisc/usba -Nmisc/hidparser
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/usbsacm/Makefile b/usr/src/uts/intel/usbsacm/Makefile
index 09cc016b1f..3d17fc199e 100644
--- a/usr/src/uts/intel/usbsacm/Makefile
+++ b/usr/src/uts/intel/usbsacm/Makefile
@@ -45,7 +45,7 @@ include $(UTSBASE)/intel/Makefile.intel
LDFLAGS += -dy -Nmisc/usba -Nmisc/usbser
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/usbsksp/Makefile b/usr/src/uts/intel/usbsksp/Makefile
index 695d340f46..b34c75efe5 100644
--- a/usr/src/uts/intel/usbsksp/Makefile
+++ b/usr/src/uts/intel/usbsksp/Makefile
@@ -80,4 +80,4 @@ install: $(INSTALL_DEPS)
#
include $(UTSBASE)/intel/Makefile.targ
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/uts/intel/usbsprl/Makefile b/usr/src/uts/intel/usbsprl/Makefile
index a2fe99fea9..7e0e3d9539 100644
--- a/usr/src/uts/intel/usbsprl/Makefile
+++ b/usr/src/uts/intel/usbsprl/Makefile
@@ -45,7 +45,7 @@ ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Nmisc/usba -Nmisc/usbser
diff --git a/usr/src/uts/intel/usbvc/Makefile b/usr/src/uts/intel/usbvc/Makefile
index 364d5f3139..5a641fc43a 100644
--- a/usr/src/uts/intel/usbvc/Makefile
+++ b/usr/src/uts/intel/usbvc/Makefile
@@ -73,7 +73,7 @@ LDFLAGS += -dy -Nmisc/usba
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/usbwcm/Makefile b/usr/src/uts/intel/usbwcm/Makefile
index 5202f40f6f..bf0e3c9f00 100644
--- a/usr/src/uts/intel/usbwcm/Makefile
+++ b/usr/src/uts/intel/usbwcm/Makefile
@@ -71,7 +71,7 @@ LDFLAGS += -dy -Nmisc/usba
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/vnic/Makefile b/usr/src/uts/intel/vnic/Makefile
index 357600fa72..199e85fa5d 100644
--- a/usr/src/uts/intel/vnic/Makefile
+++ b/usr/src/uts/intel/vnic/Makefile
@@ -57,7 +57,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Ndrv/dld -Nmisc/mac -Nmisc/dls
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/vr/Makefile b/usr/src/uts/intel/vr/Makefile
index 05f33305b7..2a74aa40b4 100644
--- a/usr/src/uts/intel/vr/Makefile
+++ b/usr/src/uts/intel/vr/Makefile
@@ -58,7 +58,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += array_condition
diff --git a/usr/src/uts/intel/vuid2ps2/Makefile b/usr/src/uts/intel/vuid2ps2/Makefile
index 47f7c4fcd7..031574dc37 100644
--- a/usr/src/uts/intel/vuid2ps2/Makefile
+++ b/usr/src/uts/intel/vuid2ps2/Makefile
@@ -51,7 +51,7 @@ ROOTMODULE = $(ROOT_STRMOD_DIR)/$(MODULE)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/vuid3ps2/Makefile b/usr/src/uts/intel/vuid3ps2/Makefile
index 28664ccd9e..941929e64e 100644
--- a/usr/src/uts/intel/vuid3ps2/Makefile
+++ b/usr/src/uts/intel/vuid3ps2/Makefile
@@ -51,7 +51,7 @@ ROOTMODULE = $(ROOT_STRMOD_DIR)/$(MODULE)
#
include $(UTSBASE)/intel/Makefile.intel
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
# needs work
diff --git a/usr/src/uts/intel/vuidm3p/Makefile b/usr/src/uts/intel/vuidm3p/Makefile
index 8084cbc35a..bf2b8420bc 100644
--- a/usr/src/uts/intel/vuidm3p/Makefile
+++ b/usr/src/uts/intel/vuidm3p/Makefile
@@ -63,7 +63,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
ALL_DEFS += -DVUIDM3P
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/vuidm4p/Makefile b/usr/src/uts/intel/vuidm4p/Makefile
index 23f2265cdd..d0427eea4c 100644
--- a/usr/src/uts/intel/vuidm4p/Makefile
+++ b/usr/src/uts/intel/vuidm4p/Makefile
@@ -63,7 +63,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
ALL_DEFS += -DVUIDM4P
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/vuidm5p/Makefile b/usr/src/uts/intel/vuidm5p/Makefile
index 4ddc855e60..ff26e2ad7e 100644
--- a/usr/src/uts/intel/vuidm5p/Makefile
+++ b/usr/src/uts/intel/vuidm5p/Makefile
@@ -60,7 +60,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
ALL_DEFS += -DVUIDM5P
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/wc/Makefile b/usr/src/uts/intel/wc/Makefile
index b855fa56bc..b8a4d2e366 100644
--- a/usr/src/uts/intel/wc/Makefile
+++ b/usr/src/uts/intel/wc/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
LDFLAGS += -dy -Nmisc/tem -Ndacf/consconfig_dacf
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += deref_check
diff --git a/usr/src/uts/intel/xge/Makefile b/usr/src/uts/intel/xge/Makefile
index c0407c1984..a02d05e84d 100644
--- a/usr/src/uts/intel/xge/Makefile
+++ b/usr/src/uts/intel/xge/Makefile
@@ -94,7 +94,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-empty-body
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# needs work
SMOFF += indenting
diff --git a/usr/src/uts/intel/zut/Makefile b/usr/src/uts/intel/zut/Makefile
index 23db5c4405..1ec757e8e8 100644
--- a/usr/src/uts/intel/zut/Makefile
+++ b/usr/src/uts/intel/zut/Makefile
@@ -72,7 +72,7 @@ C99LMODE= -Xc99=%all
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/intel/zyd/Makefile b/usr/src/uts/intel/zyd/Makefile
index 144dbad6b2..7d3e76e441 100644
--- a/usr/src/uts/intel/zyd/Makefile
+++ b/usr/src/uts/intel/zyd/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
LDFLAGS += -dy -Nmisc/mac -Nmisc/net80211 -Nmisc/usba
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/FSS/Makefile b/usr/src/uts/sparc/FSS/Makefile
index 8bf1c25c85..095998c3f9 100644
--- a/usr/src/uts/sparc/FSS/Makefile
+++ b/usr/src/uts/sparc/FSS/Makefile
@@ -69,7 +69,7 @@ CFLAGS += $(CCVERBOSE)
#
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/aac/Makefile b/usr/src/uts/sparc/aac/Makefile
index 53ee28aeba..a9b097d1f3 100644
--- a/usr/src/uts/sparc/aac/Makefile
+++ b/usr/src/uts/sparc/aac/Makefile
@@ -70,7 +70,7 @@ LDFLAGS += -dy -Nmisc/scsi
# Overrides
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sparc/aggr/Makefile b/usr/src/uts/sparc/aggr/Makefile
index d9ec754f15..06895b3c11 100644
--- a/usr/src/uts/sparc/aggr/Makefile
+++ b/usr/src/uts/sparc/aggr/Makefile
@@ -64,7 +64,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sparc/audio/Makefile b/usr/src/uts/sparc/audio/Makefile
index fde8cd522b..a77b4bd8c1 100644
--- a/usr/src/uts/sparc/audio/Makefile
+++ b/usr/src/uts/sparc/audio/Makefile
@@ -46,7 +46,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/audio/impl
#
include $(UTSBASE)/sparc/Makefile.sparc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/sparc/audiocs/Makefile b/usr/src/uts/sparc/audiocs/Makefile
index 72b36a15d1..30f41da658 100644
--- a/usr/src/uts/sparc/audiocs/Makefile
+++ b/usr/src/uts/sparc/audiocs/Makefile
@@ -57,7 +57,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# Overrides
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Depends on misc/audiosup
diff --git a/usr/src/uts/sparc/audioens/Makefile b/usr/src/uts/sparc/audioens/Makefile
index aa4088266c..ef97517997 100644
--- a/usr/src/uts/sparc/audioens/Makefile
+++ b/usr/src/uts/sparc/audioens/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio -Nmisc/ac97
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/audiop16x/Makefile b/usr/src/uts/sparc/audiop16x/Makefile
index b11c93d68d..901d7781cf 100644
--- a/usr/src/uts/sparc/audiop16x/Makefile
+++ b/usr/src/uts/sparc/audiop16x/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio -Nmisc/ac97
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/audiopci/Makefile b/usr/src/uts/sparc/audiopci/Makefile
index d660a24994..53f3ee95a2 100644
--- a/usr/src/uts/sparc/audiopci/Makefile
+++ b/usr/src/uts/sparc/audiopci/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -Ndrv/audio
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/autofs/Makefile b/usr/src/uts/sparc/autofs/Makefile
index 3c76d18c96..291808a5d2 100644
--- a/usr/src/uts/sparc/autofs/Makefile
+++ b/usr/src/uts/sparc/autofs/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/av1394/Makefile b/usr/src/uts/sparc/av1394/Makefile
index 8699d8b0ee..b1daba5cae 100644
--- a/usr/src/uts/sparc/av1394/Makefile
+++ b/usr/src/uts/sparc/av1394/Makefile
@@ -75,7 +75,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/uts/sparc/bge/Makefile b/usr/src/uts/sparc/bge/Makefile
index 9fb4f205b9..a0b56a51b0 100644
--- a/usr/src/uts/sparc/bge/Makefile
+++ b/usr/src/uts/sparc/bge/Makefile
@@ -77,7 +77,7 @@ LDFLAGS += -dy -N misc/mac
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sparc/blowfish/Makefile b/usr/src/uts/sparc/blowfish/Makefile
index 88d56bb251..16cf0e6148 100644
--- a/usr/src/uts/sparc/blowfish/Makefile
+++ b/usr/src/uts/sparc/blowfish/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/bnxe/Makefile b/usr/src/uts/sparc/bnxe/Makefile
index ba59f51fee..bba862b1e7 100644
--- a/usr/src/uts/sparc/bnxe/Makefile
+++ b/usr/src/uts/sparc/bnxe/Makefile
@@ -87,7 +87,7 @@ CPPFLAGS += -DLM_RXPKT_NON_CONTIGUOUS \
LDFLAGS += -dy -r -Ndrv/ip -Nmisc/mac
#CERRWARN += -_gcc=-Wno-old-style-declaration
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-value
diff --git a/usr/src/uts/sparc/bofi/Makefile b/usr/src/uts/sparc/bofi/Makefile
index e133686cb0..4e5662616a 100644
--- a/usr/src/uts/sparc/bofi/Makefile
+++ b/usr/src/uts/sparc/bofi/Makefile
@@ -83,7 +83,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/bpf/Makefile b/usr/src/uts/sparc/bpf/Makefile
index 7fa0e7d76c..c1dda2a861 100644
--- a/usr/src/uts/sparc/bpf/Makefile
+++ b/usr/src/uts/sparc/bpf/Makefile
@@ -71,7 +71,7 @@ INC_PATH += -I$(UTSBASE)/common/io/bpf
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/bridge/Makefile b/usr/src/uts/sparc/bridge/Makefile
index 0d233275d9..0dc192e56d 100644
--- a/usr/src/uts/sparc/bridge/Makefile
+++ b/usr/src/uts/sparc/bridge/Makefile
@@ -57,7 +57,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/sparc/busra/Makefile b/usr/src/uts/sparc/busra/Makefile
index 6c7373a899..36e3cbfd21 100644
--- a/usr/src/uts/sparc/busra/Makefile
+++ b/usr/src/uts/sparc/busra/Makefile
@@ -51,7 +51,7 @@ ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE)
include $(UTSBASE)/sparc/Makefile.sparc
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/sparc/c2audit/Makefile b/usr/src/uts/sparc/c2audit/Makefile
index 90af18b7be..1453514a90 100644
--- a/usr/src/uts/sparc/c2audit/Makefile
+++ b/usr/src/uts/sparc/c2audit/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/cardbus/Makefile b/usr/src/uts/sparc/cardbus/Makefile
index 39b54137e8..c72edb640f 100644
--- a/usr/src/uts/sparc/cardbus/Makefile
+++ b/usr/src/uts/sparc/cardbus/Makefile
@@ -78,7 +78,7 @@ CPPFLAGS += -DHOTPLUG
# dependency
LDFLAGS += -dy -Nmisc/busra -Nmisc/pcmcia -Nmisc/hpcsvc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sparc/cmlb/Makefile b/usr/src/uts/sparc/cmlb/Makefile
index e17426bf77..193a612279 100644
--- a/usr/src/uts/sparc/cmlb/Makefile
+++ b/usr/src/uts/sparc/cmlb/Makefile
@@ -77,7 +77,7 @@ CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/cryptmod/Makefile b/usr/src/uts/sparc/cryptmod/Makefile
index ad24856510..2c22229d42 100644
--- a/usr/src/uts/sparc/cryptmod/Makefile
+++ b/usr/src/uts/sparc/cryptmod/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/crypto/Makefile b/usr/src/uts/sparc/crypto/Makefile
index 786ff74b65..8a9e787a5d 100644
--- a/usr/src/uts/sparc/crypto/Makefile
+++ b/usr/src/uts/sparc/crypto/Makefile
@@ -61,7 +61,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Nmisc/kcf
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/cryptoadm/Makefile b/usr/src/uts/sparc/cryptoadm/Makefile
index f992ce2af8..dc1890e064 100644
--- a/usr/src/uts/sparc/cryptoadm/Makefile
+++ b/usr/src/uts/sparc/cryptoadm/Makefile
@@ -71,7 +71,7 @@ LDFLAGS += -dy -Nmisc/kcf
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ctf/Makefile b/usr/src/uts/sparc/ctf/Makefile
index 0f463684dd..55dc972c1c 100644
--- a/usr/src/uts/sparc/ctf/Makefile
+++ b/usr/src/uts/sparc/ctf/Makefile
@@ -52,7 +52,7 @@ LDFLAGS += $(BREDUCE) -M$(UTSBASE)/common/ctf/mapfile -dy
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/uts/sparc/dad/Makefile b/usr/src/uts/sparc/dad/Makefile
index fe137a836d..f57c3fc370 100644
--- a/usr/src/uts/sparc/dad/Makefile
+++ b/usr/src/uts/sparc/dad/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/uts/sparc/daplt/Makefile b/usr/src/uts/sparc/daplt/Makefile
index 8000f5772c..bc346b9cfc 100644
--- a/usr/src/uts/sparc/daplt/Makefile
+++ b/usr/src/uts/sparc/daplt/Makefile
@@ -80,7 +80,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/dcam1394/Makefile b/usr/src/uts/sparc/dcam1394/Makefile
index 6f8d4dce91..e43ec22386 100644
--- a/usr/src/uts/sparc/dcam1394/Makefile
+++ b/usr/src/uts/sparc/dcam1394/Makefile
@@ -66,7 +66,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Nmisc/s1394
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# Default build targets.
#
diff --git a/usr/src/uts/sparc/dcfs/Makefile b/usr/src/uts/sparc/dcfs/Makefile
index 0b6ef711dc..de6c0a6ae2 100644
--- a/usr/src/uts/sparc/dcfs/Makefile
+++ b/usr/src/uts/sparc/dcfs/Makefile
@@ -62,7 +62,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/des/Makefile b/usr/src/uts/sparc/des/Makefile
index abf71ab827..b205c669ee 100644
--- a/usr/src/uts/sparc/des/Makefile
+++ b/usr/src/uts/sparc/des/Makefile
@@ -82,7 +82,7 @@ CFLAGS += $(CCVERBOSE) -I$(COM_DIR)
LINTFLAGS += -I$(COM_DIR)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/dev/Makefile b/usr/src/uts/sparc/dev/Makefile
index e079a824c3..a918d401af 100644
--- a/usr/src/uts/sparc/dev/Makefile
+++ b/usr/src/uts/sparc/dev/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/devinfo/Makefile b/usr/src/uts/sparc/devinfo/Makefile
index 9afc28426f..7f97558d29 100644
--- a/usr/src/uts/sparc/devinfo/Makefile
+++ b/usr/src/uts/sparc/devinfo/Makefile
@@ -66,7 +66,7 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRC)/common
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/uts/sparc/dld/Makefile b/usr/src/uts/sparc/dld/Makefile
index b4b1c63377..e288e2e357 100644
--- a/usr/src/uts/sparc/dld/Makefile
+++ b/usr/src/uts/sparc/dld/Makefile
@@ -69,7 +69,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/sparc/dls/Makefile b/usr/src/uts/sparc/dls/Makefile
index a7c278e543..b32db65dd0 100644
--- a/usr/src/uts/sparc/dls/Makefile
+++ b/usr/src/uts/sparc/dls/Makefile
@@ -67,7 +67,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_STATIC_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/dmfe/Makefile b/usr/src/uts/sparc/dmfe/Makefile
index 7d3b4a6957..1220b595fd 100644
--- a/usr/src/uts/sparc/dmfe/Makefile
+++ b/usr/src/uts/sparc/dmfe/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# extra link arguments
diff --git a/usr/src/uts/sparc/doorfs/Makefile b/usr/src/uts/sparc/doorfs/Makefile
index ebdfcb24fd..d8bd5421c0 100644
--- a/usr/src/uts/sparc/doorfs/Makefile
+++ b/usr/src/uts/sparc/doorfs/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/dscpmk/Makefile b/usr/src/uts/sparc/dscpmk/Makefile
index f9c67ebd48..e4f488c306 100644
--- a/usr/src/uts/sparc/dscpmk/Makefile
+++ b/usr/src/uts/sparc/dscpmk/Makefile
@@ -72,7 +72,7 @@ LDFLAGS += -dy -Ndrv/ip
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/dtrace/Makefile b/usr/src/uts/sparc/dtrace/Makefile
index 7fbedc8cbe..941f5873ca 100644
--- a/usr/src/uts/sparc/dtrace/Makefile
+++ b/usr/src/uts/sparc/dtrace/Makefile
@@ -41,7 +41,7 @@ DSF_DIR = $(UTSBASE)/$(PLATFORM)/genassym
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
ALL_TARGET = $(BINARY) $(SRC_CONFILE)
LINT_TARGET = $(MODULE).lint
diff --git a/usr/src/uts/sparc/e1000g/Makefile b/usr/src/uts/sparc/e1000g/Makefile
index 6ddb183f62..f22795fdce 100644
--- a/usr/src/uts/sparc/e1000g/Makefile
+++ b/usr/src/uts/sparc/e1000g/Makefile
@@ -62,7 +62,7 @@ LINTFLAGS += \
-I$(UTSBASE)/common/io/e1000api
-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/uts/sparc/ecc/Makefile b/usr/src/uts/sparc/ecc/Makefile
index 8876c0ab9e..7930035fed 100644
--- a/usr/src/uts/sparc/ecc/Makefile
+++ b/usr/src/uts/sparc/ecc/Makefile
@@ -70,7 +70,7 @@ LINTFLAGS += -I$(COM1_DIR) -I$(COM2_DIR)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-empty-body
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sparc/ecpp/Makefile b/usr/src/uts/sparc/ecpp/Makefile
index 677fce57ee..bbf1a3a00c 100644
--- a/usr/src/uts/sparc/ecpp/Makefile
+++ b/usr/src/uts/sparc/ecpp/Makefile
@@ -64,7 +64,7 @@ CFLAGS += $(CCVERBOSE)
# Turn this on once compiler understands v9 in it's backend
#INLINES += $(UTSBASE)/sun/io/ecpp.il
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sparc/efe/Makefile b/usr/src/uts/sparc/efe/Makefile
index e0342d5ace..119d855117 100644
--- a/usr/src/uts/sparc/efe/Makefile
+++ b/usr/src/uts/sparc/efe/Makefile
@@ -40,7 +40,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -N misc/mac -N misc/mii
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ehci/Makefile b/usr/src/uts/sparc/ehci/Makefile
index 65fcbe5430..42f0e0d7bb 100644
--- a/usr/src/uts/sparc/ehci/Makefile
+++ b/usr/src/uts/sparc/ehci/Makefile
@@ -53,7 +53,7 @@ include $(UTSBASE)/sparc/Makefile.sparc
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
#
diff --git a/usr/src/uts/sparc/eibnx/Makefile b/usr/src/uts/sparc/eibnx/Makefile
index 7380f424ab..3dd9c47375 100644
--- a/usr/src/uts/sparc/eibnx/Makefile
+++ b/usr/src/uts/sparc/eibnx/Makefile
@@ -81,7 +81,7 @@ LDFLAGS += -dy -Nmisc/ibcm -Nmisc/ibtl
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets
diff --git a/usr/src/uts/sparc/elfexec/Makefile b/usr/src/uts/sparc/elfexec/Makefile
index cfe4e5e8e0..ba49e2b0d5 100644
--- a/usr/src/uts/sparc/elfexec/Makefile
+++ b/usr/src/uts/sparc/elfexec/Makefile
@@ -74,7 +74,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/emlxs/Makefile b/usr/src/uts/sparc/emlxs/Makefile
index bf4e73799d..16ac3b05df 100644
--- a/usr/src/uts/sparc/emlxs/Makefile
+++ b/usr/src/uts/sparc/emlxs/Makefile
@@ -89,7 +89,7 @@ LINTTAGS += -erroff=E_INCONS_VAL_TYPE_DECL2
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/emul64/Makefile b/usr/src/uts/sparc/emul64/Makefile
index 337d3e9d95..86cfecacd1 100644
--- a/usr/src/uts/sparc/emul64/Makefile
+++ b/usr/src/uts/sparc/emul64/Makefile
@@ -66,7 +66,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -N misc/scsi
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/eoib/Makefile b/usr/src/uts/sparc/eoib/Makefile
index 01a11078fc..ffa1ac053d 100644
--- a/usr/src/uts/sparc/eoib/Makefile
+++ b/usr/src/uts/sparc/eoib/Makefile
@@ -70,7 +70,7 @@ CPPFLAGS += -DEIB_DEBUG
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Depends on misc/ibtl
diff --git a/usr/src/uts/sparc/fas/Makefile b/usr/src/uts/sparc/fas/Makefile
index 03dea3fc60..03eec24a86 100644
--- a/usr/src/uts/sparc/fas/Makefile
+++ b/usr/src/uts/sparc/fas/Makefile
@@ -74,7 +74,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/fasttrap/Makefile b/usr/src/uts/sparc/fasttrap/Makefile
index a6fc8659cf..e69edd4f6f 100644
--- a/usr/src/uts/sparc/fasttrap/Makefile
+++ b/usr/src/uts/sparc/fasttrap/Makefile
@@ -43,7 +43,7 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRC)/common
LDFLAGS += -dy -Ndrv/dtrace
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/uts/sparc/fbt/Makefile b/usr/src/uts/sparc/fbt/Makefile
index 1b2b5dcf75..79286b526e 100644
--- a/usr/src/uts/sparc/fbt/Makefile
+++ b/usr/src/uts/sparc/fbt/Makefile
@@ -51,7 +51,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/uts/sparc/fcp/Makefile b/usr/src/uts/sparc/fcp/Makefile
index ddc705e0ba..8ba05be670 100644
--- a/usr/src/uts/sparc/fcp/Makefile
+++ b/usr/src/uts/sparc/fcp/Makefile
@@ -67,7 +67,7 @@ LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/fcpci/Makefile b/usr/src/uts/sparc/fcpci/Makefile
index ab429cd13c..eacdd19548 100644
--- a/usr/src/uts/sparc/fcpci/Makefile
+++ b/usr/src/uts/sparc/fcpci/Makefile
@@ -87,7 +87,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/fcsm/Makefile b/usr/src/uts/sparc/fcsm/Makefile
index faaa084924..fc93e07a59 100644
--- a/usr/src/uts/sparc/fcsm/Makefile
+++ b/usr/src/uts/sparc/fcsm/Makefile
@@ -68,7 +68,7 @@ LDFLAGS += -dy -Nmisc/fctl
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/fct/Makefile b/usr/src/uts/sparc/fct/Makefile
index b61a18873d..c4c89b3a46 100644
--- a/usr/src/uts/sparc/fct/Makefile
+++ b/usr/src/uts/sparc/fct/Makefile
@@ -72,7 +72,7 @@ LINTTAGS += -erroff=E_IF_ELSE_ANNOTATION
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/fctl/Makefile b/usr/src/uts/sparc/fctl/Makefile
index 080e6afeb8..b0c525ed3e 100644
--- a/usr/src/uts/sparc/fctl/Makefile
+++ b/usr/src/uts/sparc/fctl/Makefile
@@ -69,7 +69,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/flowacct/Makefile b/usr/src/uts/sparc/flowacct/Makefile
index 40e80edef4..56a16ddc8b 100644
--- a/usr/src/uts/sparc/flowacct/Makefile
+++ b/usr/src/uts/sparc/flowacct/Makefile
@@ -71,7 +71,7 @@ LDFLAGS += -dy -Ndrv/ip -Ndrv/tcp
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/fp/Makefile b/usr/src/uts/sparc/fp/Makefile
index f1791f247e..5d446e7ca9 100644
--- a/usr/src/uts/sparc/fp/Makefile
+++ b/usr/src/uts/sparc/fp/Makefile
@@ -72,7 +72,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
LINTTAGS += -erroff=E_STATIC_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
#
diff --git a/usr/src/uts/sparc/gld/Makefile b/usr/src/uts/sparc/gld/Makefile
index e4323878f1..d56548e81b 100644
--- a/usr/src/uts/sparc/gld/Makefile
+++ b/usr/src/uts/sparc/gld/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/hci1394/Makefile b/usr/src/uts/sparc/hci1394/Makefile
index 5bdb63b1e0..07b8f1c907 100644
--- a/usr/src/uts/sparc/hci1394/Makefile
+++ b/usr/src/uts/sparc/hci1394/Makefile
@@ -85,7 +85,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/hermon/Makefile b/usr/src/uts/sparc/hermon/Makefile
index 23ff5b1ecf..b91d41e52c 100644
--- a/usr/src/uts/sparc/hermon/Makefile
+++ b/usr/src/uts/sparc/hermon/Makefile
@@ -76,7 +76,7 @@ CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/hidparser/Makefile b/usr/src/uts/sparc/hidparser/Makefile
index 1b6f99ef6e..31eb5a23b6 100644
--- a/usr/src/uts/sparc/hidparser/Makefile
+++ b/usr/src/uts/sparc/hidparser/Makefile
@@ -53,7 +53,7 @@ include $(UTSBASE)/sparc/Makefile.sparc
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# depends on misc/usba
diff --git a/usr/src/uts/sparc/hme/Makefile b/usr/src/uts/sparc/hme/Makefile
index b22c9eb8be..492dfe2a25 100644
--- a/usr/src/uts/sparc/hme/Makefile
+++ b/usr/src/uts/sparc/hme/Makefile
@@ -61,7 +61,7 @@ LDFLAGS += -dy -Nmisc/mii -Nmisc/mac
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/hook/Makefile b/usr/src/uts/sparc/hook/Makefile
index 7f8a8a0f5e..5e68af14d3 100644
--- a/usr/src/uts/sparc/hook/Makefile
+++ b/usr/src/uts/sparc/hook/Makefile
@@ -49,7 +49,7 @@ ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE)
#
include $(UTSBASE)/sparc/Makefile.sparc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/sparc/hpcsvc/Makefile b/usr/src/uts/sparc/hpcsvc/Makefile
index 74edaabac0..3472ca053a 100644
--- a/usr/src/uts/sparc/hpcsvc/Makefile
+++ b/usr/src/uts/sparc/hpcsvc/Makefile
@@ -63,7 +63,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
DEBUG_FLGS =
DEBUG_DEFS += $(DEBUG_FLGS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# lint pass one enforcement
diff --git a/usr/src/uts/sparc/hsfs/Makefile b/usr/src/uts/sparc/hsfs/Makefile
index 7a042ec007..1303c74a7e 100644
--- a/usr/src/uts/sparc/hsfs/Makefile
+++ b/usr/src/uts/sparc/hsfs/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-switch
diff --git a/usr/src/uts/sparc/hxge/Makefile b/usr/src/uts/sparc/hxge/Makefile
index e8064bf9a7..46343ada36 100644
--- a/usr/src/uts/sparc/hxge/Makefile
+++ b/usr/src/uts/sparc/hxge/Makefile
@@ -90,7 +90,7 @@ LINTTAGS += -erroff=E_FALSE_LOGICAL_EXPR
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/ib/Makefile b/usr/src/uts/sparc/ib/Makefile
index 4432cce6a9..83e44c69f2 100644
--- a/usr/src/uts/sparc/ib/Makefile
+++ b/usr/src/uts/sparc/ib/Makefile
@@ -63,7 +63,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
ALL_BUILDS = $(ALL_BUILDSONLY64)
DEF_BUILDS = $(DEF_BUILDSONLY64)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# lint pass one enforcement
diff --git a/usr/src/uts/sparc/ibcm/Makefile b/usr/src/uts/sparc/ibcm/Makefile
index 8cd008039b..71f1f79fcc 100644
--- a/usr/src/uts/sparc/ibcm/Makefile
+++ b/usr/src/uts/sparc/ibcm/Makefile
@@ -69,7 +69,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
#
diff --git a/usr/src/uts/sparc/ibdm/Makefile b/usr/src/uts/sparc/ibdm/Makefile
index e713659ab8..1308ed72b3 100644
--- a/usr/src/uts/sparc/ibdm/Makefile
+++ b/usr/src/uts/sparc/ibdm/Makefile
@@ -78,7 +78,7 @@ LDFLAGS += -dy -Nmisc/ibtl -Nmisc/ibmf
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ibmf/Makefile b/usr/src/uts/sparc/ibmf/Makefile
index 70413eda4f..6de209c25c 100644
--- a/usr/src/uts/sparc/ibmf/Makefile
+++ b/usr/src/uts/sparc/ibmf/Makefile
@@ -76,7 +76,7 @@ CFLAGS += $(CCVERBOSE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ibp/Makefile b/usr/src/uts/sparc/ibp/Makefile
index 6017f36362..8e837ad67d 100644
--- a/usr/src/uts/sparc/ibp/Makefile
+++ b/usr/src/uts/sparc/ibp/Makefile
@@ -71,7 +71,7 @@ CFLAGS += $(CCVERBOSE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
#
diff --git a/usr/src/uts/sparc/ibtl/Makefile b/usr/src/uts/sparc/ibtl/Makefile
index acbd0b110f..31da41ff10 100644
--- a/usr/src/uts/sparc/ibtl/Makefile
+++ b/usr/src/uts/sparc/ibtl/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-value
diff --git a/usr/src/uts/sparc/idm/Makefile b/usr/src/uts/sparc/idm/Makefile
index ee54f9ca87..6ae749af13 100644
--- a/usr/src/uts/sparc/idm/Makefile
+++ b/usr/src/uts/sparc/idm/Makefile
@@ -62,7 +62,7 @@ LDFLAGS += -dy -Nfs/sockfs -Nmisc/ksocket
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# Include
INC_PATH += -I$(SRC)/common/hdcrc
diff --git a/usr/src/uts/sparc/igb/Makefile b/usr/src/uts/sparc/igb/Makefile
index 51fb4cdfcc..3e8c78c94d 100644
--- a/usr/src/uts/sparc/igb/Makefile
+++ b/usr/src/uts/sparc/igb/Makefile
@@ -55,7 +55,7 @@ LINTFLAGS += \
-I$(UTSBASE)/common/io/e1000api
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_cc=-erroff=E_STATEMENT_NOT_REACHED
#
diff --git a/usr/src/uts/sparc/ip/Makefile b/usr/src/uts/sparc/ip/Makefile
index e63fa44000..a6f693aec2 100644
--- a/usr/src/uts/sparc/ip/Makefile
+++ b/usr/src/uts/sparc/ip/Makefile
@@ -82,7 +82,7 @@ CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
#
diff --git a/usr/src/uts/sparc/ipc/Makefile b/usr/src/uts/sparc/ipc/Makefile
index 2298bb7c42..1ed5f1f9fe 100644
--- a/usr/src/uts/sparc/ipc/Makefile
+++ b/usr/src/uts/sparc/ipc/Makefile
@@ -68,7 +68,7 @@ CFLAGS += $(CCVERBOSE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ipf/Makefile b/usr/src/uts/sparc/ipf/Makefile
index 5ed794ece5..5c9861ee7f 100644
--- a/usr/src/uts/sparc/ipf/Makefile
+++ b/usr/src/uts/sparc/ipf/Makefile
@@ -80,7 +80,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-empty-body
#
diff --git a/usr/src/uts/sparc/ipgpc/Makefile b/usr/src/uts/sparc/ipgpc/Makefile
index 0e36efe1dc..a5d60bf915 100644
--- a/usr/src/uts/sparc/ipgpc/Makefile
+++ b/usr/src/uts/sparc/ipgpc/Makefile
@@ -67,7 +67,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Ndrv/ip
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/ipsecah/Makefile b/usr/src/uts/sparc/ipsecah/Makefile
index 506645d988..55ee48c88f 100644
--- a/usr/src/uts/sparc/ipsecah/Makefile
+++ b/usr/src/uts/sparc/ipsecah/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ipsecesp/Makefile b/usr/src/uts/sparc/ipsecesp/Makefile
index fa3fc8f4d5..1a36e4fbc7 100644
--- a/usr/src/uts/sparc/ipsecesp/Makefile
+++ b/usr/src/uts/sparc/ipsecesp/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/iptun/Makefile b/usr/src/uts/sparc/iptun/Makefile
index fc09008ab2..3b5ad846bf 100644
--- a/usr/src/uts/sparc/iptun/Makefile
+++ b/usr/src/uts/sparc/iptun/Makefile
@@ -61,7 +61,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/iscsi/Makefile b/usr/src/uts/sparc/iscsi/Makefile
index 56e8b185f2..7b0c73fd6b 100644
--- a/usr/src/uts/sparc/iscsi/Makefile
+++ b/usr/src/uts/sparc/iscsi/Makefile
@@ -72,7 +72,7 @@ CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/iscsit/Makefile b/usr/src/uts/sparc/iscsit/Makefile
index 73b9139ec9..45954abf12 100644
--- a/usr/src/uts/sparc/iscsit/Makefile
+++ b/usr/src/uts/sparc/iscsit/Makefile
@@ -63,7 +63,7 @@ LDFLAGS += -dy -Ndrv/stmf -Nmisc/idm -Nfs/sockfs -Nmisc/md5 -Nmisc/ksocket
C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
#
diff --git a/usr/src/uts/sparc/iser/Makefile b/usr/src/uts/sparc/iser/Makefile
index bf5dd8e069..f4fd1b5c41 100644
--- a/usr/src/uts/sparc/iser/Makefile
+++ b/usr/src/uts/sparc/iser/Makefile
@@ -43,7 +43,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/iser
#
include $(UTSBASE)/sparc/Makefile.sparc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/sparc/ixgbe/Makefile b/usr/src/uts/sparc/ixgbe/Makefile
index 90fbc215c8..493f91652d 100644
--- a/usr/src/uts/sparc/ixgbe/Makefile
+++ b/usr/src/uts/sparc/ixgbe/Makefile
@@ -56,7 +56,7 @@ INC_PATH += -I$(UTSBASE)/common/io/ixgbe/core
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_cc=-erroff=E_STATEMENT_NOT_REACHED
diff --git a/usr/src/uts/sparc/kaio/Makefile b/usr/src/uts/sparc/kaio/Makefile
index 9713927ed1..41f948fc03 100644
--- a/usr/src/uts/sparc/kaio/Makefile
+++ b/usr/src/uts/sparc/kaio/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/kb8042/Makefile b/usr/src/uts/sparc/kb8042/Makefile
index 517bfd446d..258a09323a 100644
--- a/usr/src/uts/sparc/kb8042/Makefile
+++ b/usr/src/uts/sparc/kb8042/Makefile
@@ -64,7 +64,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/kcf/Makefile b/usr/src/uts/sparc/kcf/Makefile
index 22d39a7c0e..7d7eee4c01 100644
--- a/usr/src/uts/sparc/kcf/Makefile
+++ b/usr/src/uts/sparc/kcf/Makefile
@@ -66,7 +66,7 @@ CFLAGS += $(CCVERBOSE) -I$(COM_DIR)
LINTTAGS += -I$(COM_DIR)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sparc/kgssapi/Makefile b/usr/src/uts/sparc/kgssapi/Makefile
index c33564a338..3e25d28a02 100644
--- a/usr/src/uts/sparc/kgssapi/Makefile
+++ b/usr/src/uts/sparc/kgssapi/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/kmech_krb5/Makefile b/usr/src/uts/sparc/kmech_krb5/Makefile
index 0bf4c49d1c..dc76bb0d91 100644
--- a/usr/src/uts/sparc/kmech_krb5/Makefile
+++ b/usr/src/uts/sparc/kmech_krb5/Makefile
@@ -66,7 +66,7 @@ LDFLAGS += -dy -N misc/kgssapi -N crypto/md5
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/kssl/Makefile b/usr/src/uts/sparc/kssl/Makefile
index ba7750705b..566bbeb13a 100644
--- a/usr/src/uts/sparc/kssl/Makefile
+++ b/usr/src/uts/sparc/kssl/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_STATIC_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ksslf/Makefile b/usr/src/uts/sparc/ksslf/Makefile
index 17d6816547..a65199e8ec 100644
--- a/usr/src/uts/sparc/ksslf/Makefile
+++ b/usr/src/uts/sparc/ksslf/Makefile
@@ -68,7 +68,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/kstat/Makefile b/usr/src/uts/sparc/kstat/Makefile
index 09d0f64722..efe30fdacd 100644
--- a/usr/src/uts/sparc/kstat/Makefile
+++ b/usr/src/uts/sparc/kstat/Makefile
@@ -68,7 +68,7 @@ CFLAGS += $(CCVERBOSE)
#
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ldterm/Makefile b/usr/src/uts/sparc/ldterm/Makefile
index a76cdad21e..82f018cb9c 100644
--- a/usr/src/uts/sparc/ldterm/Makefile
+++ b/usr/src/uts/sparc/ldterm/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/llc1/Makefile b/usr/src/uts/sparc/llc1/Makefile
index f2d79adf02..5cc83a519b 100644
--- a/usr/src/uts/sparc/llc1/Makefile
+++ b/usr/src/uts/sparc/llc1/Makefile
@@ -63,7 +63,7 @@ CFLAGS += $(CCVERBOSE)
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/lofi/Makefile b/usr/src/uts/sparc/lofi/Makefile
index 3b9a1e5703..6fa0f0b8e0 100644
--- a/usr/src/uts/sparc/lofi/Makefile
+++ b/usr/src/uts/sparc/lofi/Makefile
@@ -58,7 +58,7 @@ LDFLAGS += -dy -Nmisc/cmlb
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
INC_PATH += -I$(SRC)/common/lzma
diff --git a/usr/src/uts/sparc/mac/Makefile b/usr/src/uts/sparc/mac/Makefile
index 0995eaa299..c5fcd87bb7 100644
--- a/usr/src/uts/sparc/mac/Makefile
+++ b/usr/src/uts/sparc/mac/Makefile
@@ -66,7 +66,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sparc/mii/Makefile b/usr/src/uts/sparc/mii/Makefile
index a853240a72..3dce507659 100644
--- a/usr/src/uts/sparc/mii/Makefile
+++ b/usr/src/uts/sparc/mii/Makefile
@@ -55,7 +55,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
LDFLAGS += -dy -N misc/mac
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/mpt_sas/Makefile b/usr/src/uts/sparc/mpt_sas/Makefile
index 4f7414a794..b63d1b04f4 100644
--- a/usr/src/uts/sparc/mpt_sas/Makefile
+++ b/usr/src/uts/sparc/mpt_sas/Makefile
@@ -63,7 +63,7 @@ include $(UTSBASE)/sparc/Makefile.sparc
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
#
diff --git a/usr/src/uts/sparc/mr_sas/Makefile b/usr/src/uts/sparc/mr_sas/Makefile
index 7a38c8cc50..3429251238 100644
--- a/usr/src/uts/sparc/mr_sas/Makefile
+++ b/usr/src/uts/sparc/mr_sas/Makefile
@@ -61,7 +61,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sparc/msgsys/Makefile b/usr/src/uts/sparc/msgsys/Makefile
index d0f1e78532..a16e294bea 100644
--- a/usr/src/uts/sparc/msgsys/Makefile
+++ b/usr/src/uts/sparc/msgsys/Makefile
@@ -68,7 +68,7 @@ LDFLAGS += -dy -Nmisc/ipc
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/nfs/Makefile b/usr/src/uts/sparc/nfs/Makefile
index e29e28133c..4e85d846a5 100644
--- a/usr/src/uts/sparc/nfs/Makefile
+++ b/usr/src/uts/sparc/nfs/Makefile
@@ -85,7 +85,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-type-limits
-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/uts/sparc/nfssrv/Makefile b/usr/src/uts/sparc/nfssrv/Makefile
index f71c2f10d8..b0dfc398d2 100644
--- a/usr/src/uts/sparc/nfssrv/Makefile
+++ b/usr/src/uts/sparc/nfssrv/Makefile
@@ -79,7 +79,7 @@ CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
#
diff --git a/usr/src/uts/sparc/objfs/Makefile b/usr/src/uts/sparc/objfs/Makefile
index f166f4ee54..9a0845e331 100644
--- a/usr/src/uts/sparc/objfs/Makefile
+++ b/usr/src/uts/sparc/objfs/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/oce/Makefile b/usr/src/uts/sparc/oce/Makefile
index fe3521b2f9..375aba9280 100644
--- a/usr/src/uts/sparc/oce/Makefile
+++ b/usr/src/uts/sparc/oce/Makefile
@@ -58,7 +58,7 @@ LDFLAGS += -dy -Nmisc/mac
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/ohci/Makefile b/usr/src/uts/sparc/ohci/Makefile
index 2360e3480c..3c0ee37ec4 100644
--- a/usr/src/uts/sparc/ohci/Makefile
+++ b/usr/src/uts/sparc/ohci/Makefile
@@ -66,7 +66,7 @@ ALL_TARGET = $(BINARY) $(SRC_CONFFILE)
LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/openeepr/Makefile b/usr/src/uts/sparc/openeepr/Makefile
index 80214c9e68..b536c6c58c 100644
--- a/usr/src/uts/sparc/openeepr/Makefile
+++ b/usr/src/uts/sparc/openeepr/Makefile
@@ -61,7 +61,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Ndacf/consconfig_dacf
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/pcfs/Makefile b/usr/src/uts/sparc/pcfs/Makefile
index 3140a6d539..59c53e2458 100644
--- a/usr/src/uts/sparc/pcfs/Makefile
+++ b/usr/src/uts/sparc/pcfs/Makefile
@@ -64,7 +64,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
#
diff --git a/usr/src/uts/sparc/pcic/Makefile b/usr/src/uts/sparc/pcic/Makefile
index be073df333..93e2eb1198 100644
--- a/usr/src/uts/sparc/pcic/Makefile
+++ b/usr/src/uts/sparc/pcic/Makefile
@@ -80,7 +80,7 @@ LDFLAGS += -dy -Nmisc/busra -Nmisc/pcmcia -Nmisc/cardbus
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/pcicfg/Makefile b/usr/src/uts/sparc/pcicfg/Makefile
index 5cda1ade8e..b403c87670 100644
--- a/usr/src/uts/sparc/pcicfg/Makefile
+++ b/usr/src/uts/sparc/pcicfg/Makefile
@@ -89,7 +89,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/pcmcia/Makefile b/usr/src/uts/sparc/pcmcia/Makefile
index 2efecbe522..e8d67d5fdb 100644
--- a/usr/src/uts/sparc/pcmcia/Makefile
+++ b/usr/src/uts/sparc/pcmcia/Makefile
@@ -83,7 +83,7 @@ LDFLAGS += -dy -Nmisc/busra
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/pm/Makefile b/usr/src/uts/sparc/pm/Makefile
index da6092c328..ce992428df 100644
--- a/usr/src/uts/sparc/pm/Makefile
+++ b/usr/src/uts/sparc/pm/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/pmcs/Makefile b/usr/src/uts/sparc/pmcs/Makefile
index 82414a28bf..6689465afd 100644
--- a/usr/src/uts/sparc/pmcs/Makefile
+++ b/usr/src/uts/sparc/pmcs/Makefile
@@ -67,7 +67,7 @@ CPPFLAGS += $(PMCS_DRV_FLGS) \
-DPMCS_FIRMWARE_VERSION_STRING=\"${PMCS_FW_VERSION_STRING}\"
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/sparc/poll/Makefile b/usr/src/uts/sparc/poll/Makefile
index c8722105ee..af97f9371f 100644
--- a/usr/src/uts/sparc/poll/Makefile
+++ b/usr/src/uts/sparc/poll/Makefile
@@ -54,7 +54,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# See uts/intel/poll/Makefile for why this is necessary.
diff --git a/usr/src/uts/sparc/portfs/Makefile b/usr/src/uts/sparc/portfs/Makefile
index 3f2465e7ed..faad9243ee 100644
--- a/usr/src/uts/sparc/portfs/Makefile
+++ b/usr/src/uts/sparc/portfs/Makefile
@@ -74,7 +74,7 @@ CFLAGS += $(CCVERBOSE)
#
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/pppt/Makefile b/usr/src/uts/sparc/pppt/Makefile
index f492a4d1b0..d4d4dcbdbf 100644
--- a/usr/src/uts/sparc/pppt/Makefile
+++ b/usr/src/uts/sparc/pppt/Makefile
@@ -63,7 +63,7 @@ LDFLAGS += -dy -Ndrv/stmf
C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/procfs/Makefile b/usr/src/uts/sparc/procfs/Makefile
index 6c4ec3fb7c..8dd05fe72b 100644
--- a/usr/src/uts/sparc/procfs/Makefile
+++ b/usr/src/uts/sparc/procfs/Makefile
@@ -75,7 +75,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ptem/Makefile b/usr/src/uts/sparc/ptem/Makefile
index 202a3250a9..0031ebe676 100644
--- a/usr/src/uts/sparc/ptem/Makefile
+++ b/usr/src/uts/sparc/ptem/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/qlc/Makefile b/usr/src/uts/sparc/qlc/Makefile
index 92494ed283..2d492a8baa 100644
--- a/usr/src/uts/sparc/qlc/Makefile
+++ b/usr/src/uts/sparc/qlc/Makefile
@@ -77,7 +77,7 @@ FWIMAGES += 8100
FWMODULES = $(FWIMAGES:%=$(MODULE)_fw_%)
FWMODULES_SRC = $(FWIMAGES:%=$(CONF_SRCDIR)/ql_fw_%.c)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/sparc/qlge/Makefile b/usr/src/uts/sparc/qlge/Makefile
index d9951b0d1a..a823631732 100644
--- a/usr/src/uts/sparc/qlge/Makefile
+++ b/usr/src/uts/sparc/qlge/Makefile
@@ -64,7 +64,7 @@ LDFLAGS += -dy -Nmisc/mac -Ndrv/ip
C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/qlt/Makefile b/usr/src/uts/sparc/qlt/Makefile
index f145c2e880..16fd3ef9ed 100644
--- a/usr/src/uts/sparc/qlt/Makefile
+++ b/usr/src/uts/sparc/qlt/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/rds/Makefile b/usr/src/uts/sparc/rds/Makefile
index 8a19251b1d..8e078da5da 100644
--- a/usr/src/uts/sparc/rds/Makefile
+++ b/usr/src/uts/sparc/rds/Makefile
@@ -61,7 +61,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Nfs/sockfs -Ndrv/ip
diff --git a/usr/src/uts/sparc/rdsib/Makefile b/usr/src/uts/sparc/rdsib/Makefile
index 9a71c4cc92..8325150c18 100644
--- a/usr/src/uts/sparc/rdsib/Makefile
+++ b/usr/src/uts/sparc/rdsib/Makefile
@@ -62,7 +62,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Ndrv/rds -Nmisc/ibtl -Nmisc/ibcm -Ndrv/ip
diff --git a/usr/src/uts/sparc/rdsv3/Makefile b/usr/src/uts/sparc/rdsv3/Makefile
index ec1fa4ac0a..42218769c8 100644
--- a/usr/src/uts/sparc/rdsv3/Makefile
+++ b/usr/src/uts/sparc/rdsv3/Makefile
@@ -61,7 +61,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/rge/Makefile b/usr/src/uts/sparc/rge/Makefile
index 56ebef3144..48b7f673ed 100644
--- a/usr/src/uts/sparc/rge/Makefile
+++ b/usr/src/uts/sparc/rge/Makefile
@@ -69,7 +69,7 @@ CFLAGS += -dalign
LDFLAGS += -dy -N misc/mac -N drv/ip
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/rlmod/Makefile b/usr/src/uts/sparc/rlmod/Makefile
index b9f6254a5e..dc8cdff3a3 100644
--- a/usr/src/uts/sparc/rlmod/Makefile
+++ b/usr/src/uts/sparc/rlmod/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/rpcib/Makefile b/usr/src/uts/sparc/rpcib/Makefile
index 82f1206b40..7d8e43ea31 100644
--- a/usr/src/uts/sparc/rpcib/Makefile
+++ b/usr/src/uts/sparc/rpcib/Makefile
@@ -75,7 +75,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/rpcmod/Makefile b/usr/src/uts/sparc/rpcmod/Makefile
index dad440934b..e25ca4bb83 100644
--- a/usr/src/uts/sparc/rpcmod/Makefile
+++ b/usr/src/uts/sparc/rpcmod/Makefile
@@ -87,7 +87,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sparc/rpcsec/Makefile b/usr/src/uts/sparc/rpcsec/Makefile
index 87f385f29d..ac2536bc4f 100644
--- a/usr/src/uts/sparc/rpcsec/Makefile
+++ b/usr/src/uts/sparc/rpcsec/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/rsa/Makefile b/usr/src/uts/sparc/rsa/Makefile
index ea61e30cea..048e02f81e 100644
--- a/usr/src/uts/sparc/rsa/Makefile
+++ b/usr/src/uts/sparc/rsa/Makefile
@@ -80,7 +80,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/rsm/Makefile b/usr/src/uts/sparc/rsm/Makefile
index 6d830fa2b1..cfd0eccedc 100644
--- a/usr/src/uts/sparc/rsm/Makefile
+++ b/usr/src/uts/sparc/rsm/Makefile
@@ -83,7 +83,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/rtls/Makefile b/usr/src/uts/sparc/rtls/Makefile
index d19674b6ed..6a9e60d6a3 100644
--- a/usr/src/uts/sparc/rtls/Makefile
+++ b/usr/src/uts/sparc/rtls/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# Overrides
#
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Driver depends on Mac
diff --git a/usr/src/uts/sparc/s1394/Makefile b/usr/src/uts/sparc/s1394/Makefile
index 5122529ec5..67e21511cd 100644
--- a/usr/src/uts/sparc/s1394/Makefile
+++ b/usr/src/uts/sparc/s1394/Makefile
@@ -84,7 +84,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
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/uts/sparc/sad/Makefile b/usr/src/uts/sparc/sad/Makefile
index 92d7bedcdc..f55534c3e7 100644
--- a/usr/src/uts/sparc/sad/Makefile
+++ b/usr/src/uts/sparc/sad/Makefile
@@ -72,7 +72,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/sata/Makefile b/usr/src/uts/sparc/sata/Makefile
index cb1c0878a1..71ed1be9ae 100644
--- a/usr/src/uts/sparc/sata/Makefile
+++ b/usr/src/uts/sparc/sata/Makefile
@@ -90,7 +90,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-empty-body
# needs work
diff --git a/usr/src/uts/sparc/scsa1394/Makefile b/usr/src/uts/sparc/scsa1394/Makefile
index f8f2543772..5eab76a7ed 100644
--- a/usr/src/uts/sparc/scsa1394/Makefile
+++ b/usr/src/uts/sparc/scsa1394/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LDFLAGS += -dy -Nmisc/scsi -Nmisc/s1394 -Nmisc/sbp2
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# Default build targets.
#
diff --git a/usr/src/uts/sparc/scsa2usb/Makefile b/usr/src/uts/sparc/scsa2usb/Makefile
index c122b2b7cb..eb7fdbbf9c 100644
--- a/usr/src/uts/sparc/scsa2usb/Makefile
+++ b/usr/src/uts/sparc/scsa2usb/Makefile
@@ -67,7 +67,7 @@ LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/scsi/Makefile b/usr/src/uts/sparc/scsi/Makefile
index 54479da2f5..1d464fca09 100644
--- a/usr/src/uts/sparc/scsi/Makefile
+++ b/usr/src/uts/sparc/scsi/Makefile
@@ -72,7 +72,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/scsi_vhci/Makefile b/usr/src/uts/sparc/scsi_vhci/Makefile
index 9213f4ff57..fbe826d733 100644
--- a/usr/src/uts/sparc/scsi_vhci/Makefile
+++ b/usr/src/uts/sparc/scsi_vhci/Makefile
@@ -49,7 +49,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/scsi/adapters/scsi_vhci
include $(UTSBASE)/sparc/Makefile.sparc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
#
diff --git a/usr/src/uts/sparc/semsys/Makefile b/usr/src/uts/sparc/semsys/Makefile
index d7ffa310bd..9f7dba60b4 100644
--- a/usr/src/uts/sparc/semsys/Makefile
+++ b/usr/src/uts/sparc/semsys/Makefile
@@ -71,7 +71,7 @@ LDFLAGS += -dy -Nmisc/ipc
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/sfe/Makefile b/usr/src/uts/sparc/sfe/Makefile
index 235f9df0b7..ff245466d1 100644
--- a/usr/src/uts/sparc/sfe/Makefile
+++ b/usr/src/uts/sparc/sfe/Makefile
@@ -76,7 +76,7 @@ CFLAGS += $(CPPFLAGS)
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Driver depends on MAC & IP
diff --git a/usr/src/uts/sparc/sgen/Makefile b/usr/src/uts/sparc/sgen/Makefile
index 723344d539..c342af394e 100644
--- a/usr/src/uts/sparc/sgen/Makefile
+++ b/usr/src/uts/sparc/sgen/Makefile
@@ -74,7 +74,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/sha2/Makefile b/usr/src/uts/sparc/sha2/Makefile
index e9d255252d..df8e453ddc 100644
--- a/usr/src/uts/sparc/sha2/Makefile
+++ b/usr/src/uts/sparc/sha2/Makefile
@@ -72,7 +72,7 @@ CFLAGS += $(CCVERBOSE) -I$(COM_DIR)
LINTFLAGS += -I$(COM_DIR)
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/smbfs/Makefile b/usr/src/uts/sparc/smbfs/Makefile
index 9525c70171..346972e300 100644
--- a/usr/src/uts/sparc/smbfs/Makefile
+++ b/usr/src/uts/sparc/smbfs/Makefile
@@ -68,7 +68,7 @@ LDFLAGS += -dy -Ndrv/nsmb
# Until CR 4994570 is fixed...
LINTTAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
# The mb_put/md_get functions are intentionally used with and without
# return value checks, so filter those out like LGREP.2 does.
diff --git a/usr/src/uts/sparc/socal/Makefile b/usr/src/uts/sparc/socal/Makefile
index fa38e547c5..e79fdc9bd2 100644
--- a/usr/src/uts/sparc/socal/Makefile
+++ b/usr/src/uts/sparc/socal/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/sockfs/Makefile b/usr/src/uts/sparc/sockfs/Makefile
index 1b9600ab01..d2d43d640a 100644
--- a/usr/src/uts/sparc/sockfs/Makefile
+++ b/usr/src/uts/sparc/sockfs/Makefile
@@ -92,7 +92,7 @@ CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/sockpfp/Makefile b/usr/src/uts/sparc/sockpfp/Makefile
index 007eea8053..59e17ddc64 100644
--- a/usr/src/uts/sparc/sockpfp/Makefile
+++ b/usr/src/uts/sparc/sockpfp/Makefile
@@ -69,7 +69,7 @@ INC_PATH += -I$(UTSBASE)/common/inet/sockmods -I$(UTSBASE)/common/io/bpf
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
#
diff --git a/usr/src/uts/sparc/socksctp/Makefile b/usr/src/uts/sparc/socksctp/Makefile
index 066cfd9982..50ce165fd1 100644
--- a/usr/src/uts/sparc/socksctp/Makefile
+++ b/usr/src/uts/sparc/socksctp/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/socksdp/Makefile b/usr/src/uts/sparc/socksdp/Makefile
index 0b2ca3d837..746f8c90c5 100644
--- a/usr/src/uts/sparc/socksdp/Makefile
+++ b/usr/src/uts/sparc/socksdp/Makefile
@@ -60,7 +60,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Nfs/sockfs -Ndrv/ip -Ndrv/sdpib
diff --git a/usr/src/uts/sparc/softmac/Makefile b/usr/src/uts/sparc/softmac/Makefile
index 23a54a8098..dc9a3f53de 100644
--- a/usr/src/uts/sparc/softmac/Makefile
+++ b/usr/src/uts/sparc/softmac/Makefile
@@ -62,7 +62,7 @@ LDFLAGS += -dy -Ndrv/dld -Nmisc/mac -Nmisc/strplumb -Nmisc/dls
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
#
diff --git a/usr/src/uts/sparc/sol_ofs/Makefile b/usr/src/uts/sparc/sol_ofs/Makefile
index 31d0f9ca94..1b2c55fd77 100644
--- a/usr/src/uts/sparc/sol_ofs/Makefile
+++ b/usr/src/uts/sparc/sol_ofs/Makefile
@@ -59,7 +59,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_STATIC_UNUSED
LINTTAGS += -erroff=E_CONST_TRUNCATED_BY_ASSIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sparc/sol_umad/Makefile b/usr/src/uts/sparc/sol_umad/Makefile
index e1774a2943..8e7dcaa7ef 100644
--- a/usr/src/uts/sparc/sol_umad/Makefile
+++ b/usr/src/uts/sparc/sol_umad/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
INCLUDE_PATH += -I$(UTSBASE)/common/sys/ib/clients/of/sol_umad
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/spdsock/Makefile b/usr/src/uts/sparc/spdsock/Makefile
index 85adf6a5d3..1c0bbcb2d8 100644
--- a/usr/src/uts/sparc/spdsock/Makefile
+++ b/usr/src/uts/sparc/spdsock/Makefile
@@ -79,7 +79,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/specfs/Makefile b/usr/src/uts/sparc/specfs/Makefile
index bcb97f9b53..07a23b1309 100644
--- a/usr/src/uts/sparc/specfs/Makefile
+++ b/usr/src/uts/sparc/specfs/Makefile
@@ -66,7 +66,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Nfs/fifofs
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/sppp/Makefile b/usr/src/uts/sparc/sppp/Makefile
index 287dd71ea5..c281897458 100644
--- a/usr/src/uts/sparc/sppp/Makefile
+++ b/usr/src/uts/sparc/sppp/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/spppcomp/Makefile b/usr/src/uts/sparc/spppcomp/Makefile
index b1da4d5dda..7f603cc521 100644
--- a/usr/src/uts/sparc/spppcomp/Makefile
+++ b/usr/src/uts/sparc/spppcomp/Makefile
@@ -75,7 +75,7 @@ LDFLAGS += -dy -N drv/sppp
CLEANLINTFILES += $(LINT64_FILES)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/sppptun/Makefile b/usr/src/uts/sparc/sppptun/Makefile
index 488d6cf6b0..94776f4695 100644
--- a/usr/src/uts/sparc/sppptun/Makefile
+++ b/usr/src/uts/sparc/sppptun/Makefile
@@ -81,7 +81,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/ssd/Makefile b/usr/src/uts/sparc/ssd/Makefile
index 47159b3ba3..108607f00b 100644
--- a/usr/src/uts/sparc/ssd/Makefile
+++ b/usr/src/uts/sparc/ssd/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
#
diff --git a/usr/src/uts/sparc/st/Makefile b/usr/src/uts/sparc/st/Makefile
index 21f51215d6..d36ea2464a 100644
--- a/usr/src/uts/sparc/st/Makefile
+++ b/usr/src/uts/sparc/st/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/stmf/Makefile b/usr/src/uts/sparc/stmf/Makefile
index 50ec544cbb..f32c38fab7 100644
--- a/usr/src/uts/sparc/stmf/Makefile
+++ b/usr/src/uts/sparc/stmf/Makefile
@@ -67,7 +67,7 @@ C99LMODE= -Xc99=%all
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_STATIC_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sparc/stmf_sbd/Makefile b/usr/src/uts/sparc/stmf_sbd/Makefile
index 4259f16b69..bbee85d605 100644
--- a/usr/src/uts/sparc/stmf_sbd/Makefile
+++ b/usr/src/uts/sparc/stmf_sbd/Makefile
@@ -73,7 +73,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/tavor/Makefile b/usr/src/uts/sparc/tavor/Makefile
index 7bd88686ea..e5fe4d0452 100644
--- a/usr/src/uts/sparc/tavor/Makefile
+++ b/usr/src/uts/sparc/tavor/Makefile
@@ -84,7 +84,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
#
diff --git a/usr/src/uts/sparc/tem/Makefile b/usr/src/uts/sparc/tem/Makefile
index 1a9dcb12e1..12d9741c56 100644
--- a/usr/src/uts/sparc/tem/Makefile
+++ b/usr/src/uts/sparc/tem/Makefile
@@ -69,7 +69,7 @@ LDFLAGS += -dy -Ndacf/consconfig_dacf
LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/tl/Makefile b/usr/src/uts/sparc/tl/Makefile
index b63d5cb165..21104104ce 100644
--- a/usr/src/uts/sparc/tl/Makefile
+++ b/usr/src/uts/sparc/tl/Makefile
@@ -79,7 +79,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/tmpfs/Makefile b/usr/src/uts/sparc/tmpfs/Makefile
index 7a74a3d693..42ec7b74c6 100644
--- a/usr/src/uts/sparc/tmpfs/Makefile
+++ b/usr/src/uts/sparc/tmpfs/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
#
diff --git a/usr/src/uts/sparc/tnf/Makefile b/usr/src/uts/sparc/tnf/Makefile
index 5c4f539671..f450067556 100644
--- a/usr/src/uts/sparc/tnf/Makefile
+++ b/usr/src/uts/sparc/tnf/Makefile
@@ -71,7 +71,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/trill/Makefile b/usr/src/uts/sparc/trill/Makefile
index 11e1f1202e..0a4229f9be 100644
--- a/usr/src/uts/sparc/trill/Makefile
+++ b/usr/src/uts/sparc/trill/Makefile
@@ -48,7 +48,7 @@ ROOTMODULE = $(ROOT_SOCK_DIR)/$(MODULE)
#
include $(UTSBASE)/sparc/Makefile.sparc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/sparc/udfs/Makefile b/usr/src/uts/sparc/udfs/Makefile
index 93b7278ee3..a47ed38860 100644
--- a/usr/src/uts/sparc/udfs/Makefile
+++ b/usr/src/uts/sparc/udfs/Makefile
@@ -81,7 +81,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
#
diff --git a/usr/src/uts/sparc/ufs/Makefile b/usr/src/uts/sparc/ufs/Makefile
index d49a878102..0e13f2371f 100644
--- a/usr/src/uts/sparc/ufs/Makefile
+++ b/usr/src/uts/sparc/ufs/Makefile
@@ -78,7 +78,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Nfs/specfs -Nmisc/fssnap_if
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sparc/ugen/Makefile b/usr/src/uts/sparc/ugen/Makefile
index 3b494749cc..49918eeb70 100644
--- a/usr/src/uts/sparc/ugen/Makefile
+++ b/usr/src/uts/sparc/ugen/Makefile
@@ -53,7 +53,7 @@ include $(UTSBASE)/sparc/Makefile.sparc
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# depends on misc/usba
diff --git a/usr/src/uts/sparc/uhci/Makefile b/usr/src/uts/sparc/uhci/Makefile
index efd8d429f8..6895a2e161 100644
--- a/usr/src/uts/sparc/uhci/Makefile
+++ b/usr/src/uts/sparc/uhci/Makefile
@@ -66,7 +66,7 @@ ALL_TARGET = $(BINARY) $(SRC_CONFFILE)
LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/usb_ac/Makefile b/usr/src/uts/sparc/usb_ac/Makefile
index 1cb5902777..5915676942 100644
--- a/usr/src/uts/sparc/usb_ac/Makefile
+++ b/usr/src/uts/sparc/usb_ac/Makefile
@@ -66,7 +66,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/usb_ah/Makefile b/usr/src/uts/sparc/usb_ah/Makefile
index d01c42d896..7ab174b77b 100644
--- a/usr/src/uts/sparc/usb_ah/Makefile
+++ b/usr/src/uts/sparc/usb_ah/Makefile
@@ -64,7 +64,7 @@ ALL_TARGET = $(BINARY)
LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/usba/Makefile b/usr/src/uts/sparc/usba/Makefile
index e90778e3ac..8443b068e5 100644
--- a/usr/src/uts/sparc/usba/Makefile
+++ b/usr/src/uts/sparc/usba/Makefile
@@ -51,7 +51,7 @@ include $(UTSBASE)/sparc/Makefile.sparc
#
CFLAGS += $(CCVERBOSE)
-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/uts/sparc/usbftdi/Makefile b/usr/src/uts/sparc/usbftdi/Makefile
index 8a7e1b41d9..9e793402e4 100644
--- a/usr/src/uts/sparc/usbftdi/Makefile
+++ b/usr/src/uts/sparc/usbftdi/Makefile
@@ -46,7 +46,7 @@ CONF_SRCDIR = $(UTSBASE)/common/io/usb/clients/usbser/usbftdi
#
include $(UTSBASE)/sparc/Makefile.sparc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Nmisc/usba -Nmisc/usbser
diff --git a/usr/src/uts/sparc/usbms/Makefile b/usr/src/uts/sparc/usbms/Makefile
index 9223ef56a9..6d4be539a3 100644
--- a/usr/src/uts/sparc/usbms/Makefile
+++ b/usr/src/uts/sparc/usbms/Makefile
@@ -66,7 +66,7 @@ LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/usbsacm/Makefile b/usr/src/uts/sparc/usbsacm/Makefile
index 3805e59c8b..6655e2b194 100644
--- a/usr/src/uts/sparc/usbsacm/Makefile
+++ b/usr/src/uts/sparc/usbsacm/Makefile
@@ -52,7 +52,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Nmisc/usba -Nmisc/usbser
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/sparc/usbser/Makefile b/usr/src/uts/sparc/usbser/Makefile
index 56f053c4cb..7f7c072d46 100644
--- a/usr/src/uts/sparc/usbser/Makefile
+++ b/usr/src/uts/sparc/usbser/Makefile
@@ -70,7 +70,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sparc/usbsksp/Makefile b/usr/src/uts/sparc/usbsksp/Makefile
index 951860f774..3172890fca 100644
--- a/usr/src/uts/sparc/usbsksp/Makefile
+++ b/usr/src/uts/sparc/usbsksp/Makefile
@@ -85,4 +85,4 @@ install: $(INSTALL_DEPS)
#
include $(UTSBASE)/sparc/Makefile.targ
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/uts/sparc/usbsprl/Makefile b/usr/src/uts/sparc/usbsprl/Makefile
index 6ecac0694f..a5e3449d2e 100644
--- a/usr/src/uts/sparc/usbsprl/Makefile
+++ b/usr/src/uts/sparc/usbsprl/Makefile
@@ -51,7 +51,7 @@ include $(UTSBASE)/sparc/Makefile.sparc
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Nmisc/usba -Nmisc/usbser
diff --git a/usr/src/uts/sparc/usbvc/Makefile b/usr/src/uts/sparc/usbvc/Makefile
index eb747fe312..876c334829 100644
--- a/usr/src/uts/sparc/usbvc/Makefile
+++ b/usr/src/uts/sparc/usbvc/Makefile
@@ -67,7 +67,7 @@ ALL_TARGET = $(BINARY)
LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Disable this because it is necessary for this driver
diff --git a/usr/src/uts/sparc/usbwcm/Makefile b/usr/src/uts/sparc/usbwcm/Makefile
index 9549f2bdc3..05e339f96f 100644
--- a/usr/src/uts/sparc/usbwcm/Makefile
+++ b/usr/src/uts/sparc/usbwcm/Makefile
@@ -66,7 +66,7 @@ LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sparc/vnic/Makefile b/usr/src/uts/sparc/vnic/Makefile
index 9be92ea9bc..4eb75ef18b 100644
--- a/usr/src/uts/sparc/vnic/Makefile
+++ b/usr/src/uts/sparc/vnic/Makefile
@@ -55,7 +55,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Ndrv/dld -Nmisc/mac -Nmisc/dls
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sparc/vr/Makefile b/usr/src/uts/sparc/vr/Makefile
index 5679a7d12b..567d4c4f6b 100644
--- a/usr/src/uts/sparc/vr/Makefile
+++ b/usr/src/uts/sparc/vr/Makefile
@@ -58,7 +58,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Driver depends on GLD
diff --git a/usr/src/uts/sparc/vuid3ps2/Makefile b/usr/src/uts/sparc/vuid3ps2/Makefile
index 7c2dd06c67..ad7ce36c5b 100644
--- a/usr/src/uts/sparc/vuid3ps2/Makefile
+++ b/usr/src/uts/sparc/vuid3ps2/Makefile
@@ -48,7 +48,7 @@ ROOTMODULE = $(ROOT_STRMOD_DIR)/$(MODULE)
#
include $(UTSBASE)/sparc/Makefile.sparc
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sparc/wc/Makefile b/usr/src/uts/sparc/wc/Makefile
index 2e6438cff9..37482ac950 100644
--- a/usr/src/uts/sparc/wc/Makefile
+++ b/usr/src/uts/sparc/wc/Makefile
@@ -61,7 +61,7 @@ MODSTUBS_DIR = $(OBJS_DIR)
$(MODSTUBS_O) := AS_CPPFLAGS += -DWC_MODULE
CLEANFILES += $(MODSTUBS_O)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# lint pass one enforcement
diff --git a/usr/src/uts/sparc/xge/Makefile b/usr/src/uts/sparc/xge/Makefile
index 422a552783..5a252dc13d 100644
--- a/usr/src/uts/sparc/xge/Makefile
+++ b/usr/src/uts/sparc/xge/Makefile
@@ -110,7 +110,7 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-empty-body
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
#
diff --git a/usr/src/uts/sparc/zut/Makefile b/usr/src/uts/sparc/zut/Makefile
index 23db5c4405..1ec757e8e8 100644
--- a/usr/src/uts/sparc/zut/Makefile
+++ b/usr/src/uts/sparc/zut/Makefile
@@ -72,7 +72,7 @@ C99LMODE= -Xc99=%all
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4/vm/vm_dep.h b/usr/src/uts/sun4/vm/vm_dep.h
index 3828665f63..4923173d81 100644
--- a/usr/src/uts/sun4/vm/vm_dep.h
+++ b/usr/src/uts/sun4/vm/vm_dep.h
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2019 Joyent, Inc.
*/
/*
@@ -55,7 +56,7 @@ extern u_longlong_t randtick(void);
mtype = (flags & PG_NORELOC) ? MTYPE_NORELOC : MTYPE_RELOC;
/* mtype init for page_get_replacement_page */
-#define MTYPE_PGR_INIT(mtype, flags, pp, mnode, pgcnt) \
+#define MTYPE_PGR_INIT(mtype, flags, pp, pgcnt) \
mtype = (flags & PG_NORELOC) ? MTYPE_NORELOC : MTYPE_RELOC;
#define MNODETYPE_2_PFN(mnode, mtype, pfnlo, pfnhi) \
diff --git a/usr/src/uts/sun4u/blade/bscv/Makefile b/usr/src/uts/sun4u/blade/bscv/Makefile
index ca20d5a1e8..b87a1cb5fd 100644
--- a/usr/src/uts/sun4u/blade/bscv/Makefile
+++ b/usr/src/uts/sun4u/blade/bscv/Makefile
@@ -66,7 +66,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/bootdev/Makefile b/usr/src/uts/sun4u/bootdev/Makefile
index c430b580b2..89e6f1964f 100644
--- a/usr/src/uts/sun4u/bootdev/Makefile
+++ b/usr/src/uts/sun4u/bootdev/Makefile
@@ -66,7 +66,7 @@ CFLAGS += $(CCVERBOSE)
#
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/cheetah/Makefile b/usr/src/uts/sun4u/cheetah/Makefile
index 09e23457b4..d9a17fd409 100644
--- a/usr/src/uts/sun4u/cheetah/Makefile
+++ b/usr/src/uts/sun4u/cheetah/Makefile
@@ -124,6 +124,6 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/uts/sun4u/cheetahplus/Makefile b/usr/src/uts/sun4u/cheetahplus/Makefile
index 0e92f69cb6..f4bb408f25 100644
--- a/usr/src/uts/sun4u/cheetahplus/Makefile
+++ b/usr/src/uts/sun4u/cheetahplus/Makefile
@@ -130,7 +130,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/uts/sun4u/cpr/Makefile b/usr/src/uts/sun4u/cpr/Makefile
index 5d5b047b47..af9b3a9635 100644
--- a/usr/src/uts/sun4u/cpr/Makefile
+++ b/usr/src/uts/sun4u/cpr/Makefile
@@ -91,7 +91,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-unused-variable
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/uts/sun4u/db21554/Makefile b/usr/src/uts/sun4u/db21554/Makefile
index 860ed675f7..ef3d37f0f3 100644
--- a/usr/src/uts/sun4u/db21554/Makefile
+++ b/usr/src/uts/sun4u/db21554/Makefile
@@ -87,7 +87,7 @@ LDFLAGS += -dy -Nmisc/pcihp
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
# Default build targets.
diff --git a/usr/src/uts/sun4u/des/Makefile b/usr/src/uts/sun4u/des/Makefile
index e4b2fa80d0..d8b27d3d66 100644
--- a/usr/src/uts/sun4u/des/Makefile
+++ b/usr/src/uts/sun4u/des/Makefile
@@ -90,7 +90,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/ebus/Makefile b/usr/src/uts/sun4u/ebus/Makefile
index aa391f1ccd..ac9d584723 100644
--- a/usr/src/uts/sun4u/ebus/Makefile
+++ b/usr/src/uts/sun4u/ebus/Makefile
@@ -76,7 +76,7 @@ CFLAGS += -dalign
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/excalibur/xcalppm/Makefile b/usr/src/uts/sun4u/excalibur/xcalppm/Makefile
index 76c4b45f68..719ffcf517 100644
--- a/usr/src/uts/sun4u/excalibur/xcalppm/Makefile
+++ b/usr/src/uts/sun4u/excalibur/xcalppm/Makefile
@@ -65,7 +65,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
#
diff --git a/usr/src/uts/sun4u/fd/Makefile b/usr/src/uts/sun4u/fd/Makefile
index 9d7036feb7..2da88952a2 100644
--- a/usr/src/uts/sun4u/fd/Makefile
+++ b/usr/src/uts/sun4u/fd/Makefile
@@ -83,7 +83,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-char-subscripts
diff --git a/usr/src/uts/sun4u/genunix/Makefile b/usr/src/uts/sun4u/genunix/Makefile
index f617c121c7..48ccc65750 100644
--- a/usr/src/uts/sun4u/genunix/Makefile
+++ b/usr/src/uts/sun4u/genunix/Makefile
@@ -117,7 +117,7 @@ CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-empty-body
diff --git a/usr/src/uts/sun4u/hummingbird/Makefile b/usr/src/uts/sun4u/hummingbird/Makefile
index ce2dcf25f8..1e114e429e 100644
--- a/usr/src/uts/sun4u/hummingbird/Makefile
+++ b/usr/src/uts/sun4u/hummingbird/Makefile
@@ -121,4 +121,4 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_BAD_FORMAT_STR2
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/uts/sun4u/jalapeno/Makefile b/usr/src/uts/sun4u/jalapeno/Makefile
index 83eccaaffd..90606a8e04 100644
--- a/usr/src/uts/sun4u/jalapeno/Makefile
+++ b/usr/src/uts/sun4u/jalapeno/Makefile
@@ -129,6 +129,6 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/uts/sun4u/javelin/envctrltwo/Makefile b/usr/src/uts/sun4u/javelin/envctrltwo/Makefile
index 11efab8ed6..cee65d58e4 100644
--- a/usr/src/uts/sun4u/javelin/envctrltwo/Makefile
+++ b/usr/src/uts/sun4u/javelin/envctrltwo/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4u/lw8/ntwdt/Makefile b/usr/src/uts/sun4u/lw8/ntwdt/Makefile
index 004558ea7a..6a66d5c2f1 100644
--- a/usr/src/uts/sun4u/lw8/ntwdt/Makefile
+++ b/usr/src/uts/sun4u/lw8/ntwdt/Makefile
@@ -66,7 +66,7 @@ CLEANLINTFILES += $(LINT32_FILES)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Ndrv/sgsbbc
diff --git a/usr/src/uts/sun4u/lw8/platmod/Makefile b/usr/src/uts/sun4u/lw8/platmod/Makefile
index 3c2c2e27b3..65ed6d1ac9 100644
--- a/usr/src/uts/sun4u/lw8/platmod/Makefile
+++ b/usr/src/uts/sun4u/lw8/platmod/Makefile
@@ -75,7 +75,7 @@ CLEANLINTFILES += $(LINT32_FILES)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/mc-us3i/Makefile b/usr/src/uts/sun4u/mc-us3i/Makefile
index 3a233a7361..a4db4e00b0 100644
--- a/usr/src/uts/sun4u/mc-us3i/Makefile
+++ b/usr/src/uts/sun4u/mc-us3i/Makefile
@@ -62,7 +62,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4u/nxge/Makefile b/usr/src/uts/sun4u/nxge/Makefile
index b6ff905531..e4178caa04 100644
--- a/usr/src/uts/sun4u/nxge/Makefile
+++ b/usr/src/uts/sun4u/nxge/Makefile
@@ -91,7 +91,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
#
diff --git a/usr/src/uts/sun4u/opl/dr/Makefile b/usr/src/uts/sun4u/opl/dr/Makefile
index 81edee1e96..7589e53b9d 100644
--- a/usr/src/uts/sun4u/opl/dr/Makefile
+++ b/usr/src/uts/sun4u/opl/dr/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sun4u/opl/drmach/Makefile b/usr/src/uts/sun4u/opl/drmach/Makefile
index e96c6defc4..a65edcc6f3 100644
--- a/usr/src/uts/sun4u/opl/drmach/Makefile
+++ b/usr/src/uts/sun4u/opl/drmach/Makefile
@@ -65,7 +65,7 @@ CLEANFILES += $(DRMACH_OFFSETS_H) $(DRMACH_OFFSETS_OUT)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# module dependencies
diff --git a/usr/src/uts/sun4u/opl/mc-opl/Makefile b/usr/src/uts/sun4u/opl/mc-opl/Makefile
index 7fd191f904..bafe22c32e 100644
--- a/usr/src/uts/sun4u/opl/mc-opl/Makefile
+++ b/usr/src/uts/sun4u/opl/mc-opl/Makefile
@@ -62,7 +62,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
CFLAGS += $(CCVERBOSE) -I../sys
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
#
diff --git a/usr/src/uts/sun4u/opl/olympus_c/Makefile b/usr/src/uts/sun4u/opl/olympus_c/Makefile
index b79f790cee..ac3b4e8f21 100644
--- a/usr/src/uts/sun4u/opl/olympus_c/Makefile
+++ b/usr/src/uts/sun4u/opl/olympus_c/Makefile
@@ -75,7 +75,7 @@ CLEANLINTFILES += $(LINT32_FILES)
#
OLYMPUS_C_DEFS += -DOLYMPUS_C
CFLAGS += $(CCVERBOSE) $(OLYMPUS_C_DEFS)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -DCPU_MODULE -DOLYMPUS_C
AS_CPPFLAGS += -DCPU_MODULE -DOLYMPUS_C
diff --git a/usr/src/uts/sun4u/opl/oplmsu/Makefile b/usr/src/uts/sun4u/opl/oplmsu/Makefile
index 8506680c14..e496ccdd7d 100644
--- a/usr/src/uts/sun4u/opl/oplmsu/Makefile
+++ b/usr/src/uts/sun4u/opl/oplmsu/Makefile
@@ -62,7 +62,7 @@ CFLAGS += $(CCVERBOSE) -I../sys
LDFLAGS += -dy -Ndrv/su
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/opl/pcicmu/Makefile b/usr/src/uts/sun4u/opl/pcicmu/Makefile
index 00b9a4213f..fbddd90ea2 100644
--- a/usr/src/uts/sun4u/opl/pcicmu/Makefile
+++ b/usr/src/uts/sun4u/opl/pcicmu/Makefile
@@ -61,7 +61,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE) -I../sys
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sun4u/opl/unix/Makefile b/usr/src/uts/sun4u/opl/unix/Makefile
index 916c2f8fe5..6b556d057a 100644
--- a/usr/src/uts/sun4u/opl/unix/Makefile
+++ b/usr/src/uts/sun4u/opl/unix/Makefile
@@ -115,7 +115,7 @@ CLEANLINTFILES += $(LINT_LIB)
CFLAGS += $(CCVERBOSE) -dalign
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/sun4u/opl_cfg/Makefile b/usr/src/uts/sun4u/opl_cfg/Makefile
index ae72d82246..1dcec6314f 100644
--- a/usr/src/uts/sun4u/opl_cfg/Makefile
+++ b/usr/src/uts/sun4u/opl_cfg/Makefile
@@ -83,7 +83,7 @@ CFLAGS += -dalign
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/pca9556/Makefile b/usr/src/uts/sun4u/pca9556/Makefile
index 89fe7e08ba..182a32f4e1 100644
--- a/usr/src/uts/sun4u/pca9556/Makefile
+++ b/usr/src/uts/sun4u/pca9556/Makefile
@@ -56,7 +56,7 @@ LDFLAGS += -dy -N misc/i2c_svc
#
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/sun4u/pcie/Makefile b/usr/src/uts/sun4u/pcie/Makefile
index d10cf86c92..b1ad4eb65f 100644
--- a/usr/src/uts/sun4u/pcie/Makefile
+++ b/usr/src/uts/sun4u/pcie/Makefile
@@ -63,7 +63,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
LDFLAGS += -dy -Nmisc/busra
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/uts/sun4u/pcipsy/Makefile b/usr/src/uts/sun4u/pcipsy/Makefile
index 0db91a93d1..1857d38f95 100644
--- a/usr/src/uts/sun4u/pcipsy/Makefile
+++ b/usr/src/uts/sun4u/pcipsy/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
#
diff --git a/usr/src/uts/sun4u/pcisch/Makefile b/usr/src/uts/sun4u/pcisch/Makefile
index d246548ee9..dbfb75fb27 100644
--- a/usr/src/uts/sun4u/pcisch/Makefile
+++ b/usr/src/uts/sun4u/pcisch/Makefile
@@ -77,7 +77,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-value
diff --git a/usr/src/uts/sun4u/pmubus/Makefile b/usr/src/uts/sun4u/pmubus/Makefile
index 89c6d07fe3..7f6ef65190 100644
--- a/usr/src/uts/sun4u/pmubus/Makefile
+++ b/usr/src/uts/sun4u/pmubus/Makefile
@@ -77,7 +77,7 @@ CPPFLAGS += -I$(UTSBASE)/sun4u
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/ppm/Makefile b/usr/src/uts/sun4u/ppm/Makefile
index e13a4da1a8..dc15c0e88a 100644
--- a/usr/src/uts/sun4u/ppm/Makefile
+++ b/usr/src/uts/sun4u/ppm/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4u/px/Makefile b/usr/src/uts/sun4u/px/Makefile
index 0e4a0ad309..79ef780ea3 100644
--- a/usr/src/uts/sun4u/px/Makefile
+++ b/usr/src/uts/sun4u/px/Makefile
@@ -84,7 +84,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sun4u/rootnex/Makefile b/usr/src/uts/sun4u/rootnex/Makefile
index 3c31ff2e8f..e1f3d0657b 100644
--- a/usr/src/uts/sun4u/rootnex/Makefile
+++ b/usr/src/uts/sun4u/rootnex/Makefile
@@ -80,7 +80,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/sbd/Makefile b/usr/src/uts/sun4u/sbd/Makefile
index bab52e56bb..9e6df9ad35 100644
--- a/usr/src/uts/sun4u/sbd/Makefile
+++ b/usr/src/uts/sun4u/sbd/Makefile
@@ -61,7 +61,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
#
diff --git a/usr/src/uts/sun4u/sbus/Makefile b/usr/src/uts/sun4u/sbus/Makefile
index 8fee184761..0d222c5c3c 100644
--- a/usr/src/uts/sun4u/sbus/Makefile
+++ b/usr/src/uts/sun4u/sbus/Makefile
@@ -79,7 +79,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/seeprom/Makefile b/usr/src/uts/sun4u/seeprom/Makefile
index a1c1fd4712..92b51e0417 100644
--- a/usr/src/uts/sun4u/seeprom/Makefile
+++ b/usr/src/uts/sun4u/seeprom/Makefile
@@ -57,7 +57,7 @@ LDFLAGS += -dy -N misc/i2c_svc
#
LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Define targets
diff --git a/usr/src/uts/sun4u/serengeti/cheetah/Makefile b/usr/src/uts/sun4u/serengeti/cheetah/Makefile
index e28743a9f7..301cc62306 100644
--- a/usr/src/uts/sun4u/serengeti/cheetah/Makefile
+++ b/usr/src/uts/sun4u/serengeti/cheetah/Makefile
@@ -78,7 +78,7 @@ CFLAGS += $(CCVERBOSE) -DCHEETAH
ASFLAGS += -DCHEETAH
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile b/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile
index e95048de85..f81ea26dda 100644
--- a/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile
+++ b/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile
@@ -81,7 +81,7 @@ ASFLAGS += -DCHEETAH -DCHEETAH_PLUS -DCPU_IMP_L1_CACHE_PARITY \
-DCPU_IMP_ECACHE_ASSOC -DCPU_IMP_DUAL_PAGESIZE -DCPU_IMP_AFSR_EXT
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/uts/sun4u/serengeti/platmod/Makefile b/usr/src/uts/sun4u/serengeti/platmod/Makefile
index eeb965a2a8..ed362ec056 100644
--- a/usr/src/uts/sun4u/serengeti/platmod/Makefile
+++ b/usr/src/uts/sun4u/serengeti/platmod/Makefile
@@ -76,7 +76,7 @@ CLEANLINTFILES += $(LINT32_FILES)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/serengeti/sbdp/Makefile b/usr/src/uts/sun4u/serengeti/sbdp/Makefile
index c1a49ef2ef..2a45b38f06 100644
--- a/usr/src/uts/sun4u/serengeti/sbdp/Makefile
+++ b/usr/src/uts/sun4u/serengeti/sbdp/Makefile
@@ -70,7 +70,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Ndrv/sgsbbc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sun4u/serengeti/sgcn/Makefile b/usr/src/uts/sun4u/serengeti/sgcn/Makefile
index ae115fae1f..94a28a5a96 100644
--- a/usr/src/uts/sun4u/serengeti/sgcn/Makefile
+++ b/usr/src/uts/sun4u/serengeti/sgcn/Makefile
@@ -69,7 +69,7 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -dy -Ndrv/sgsbbc
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/serengeti/sghsc/Makefile b/usr/src/uts/sun4u/serengeti/sghsc/Makefile
index 684a7ec7ec..6899e46e48 100644
--- a/usr/src/uts/sun4u/serengeti/sghsc/Makefile
+++ b/usr/src/uts/sun4u/serengeti/sghsc/Makefile
@@ -69,7 +69,7 @@ CLEANLINTFILES += $(LINT32_FILES)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4u/serengeti/sgsbbc/Makefile b/usr/src/uts/sun4u/serengeti/sgsbbc/Makefile
index 70abd98d29..14f851e299 100644
--- a/usr/src/uts/sun4u/serengeti/sgsbbc/Makefile
+++ b/usr/src/uts/sun4u/serengeti/sgsbbc/Makefile
@@ -73,7 +73,7 @@ CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/serengeti/unix/Makefile b/usr/src/uts/sun4u/serengeti/unix/Makefile
index 7e17ce6332..ae5a397012 100644
--- a/usr/src/uts/sun4u/serengeti/unix/Makefile
+++ b/usr/src/uts/sun4u/serengeti/unix/Makefile
@@ -114,7 +114,7 @@ CLEANLINTFILES += $(LINT_LIB)
CFLAGS += $(CCVERBOSE) -dalign
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/sun4u/serrano/Makefile b/usr/src/uts/sun4u/serrano/Makefile
index e5327b5a74..28dfb143f6 100644
--- a/usr/src/uts/sun4u/serrano/Makefile
+++ b/usr/src/uts/sun4u/serrano/Makefile
@@ -129,6 +129,6 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-clobbered
diff --git a/usr/src/uts/sun4u/sf/Makefile b/usr/src/uts/sun4u/sf/Makefile
index 23c34d8bb9..5ab7f68103 100644
--- a/usr/src/uts/sun4u/sf/Makefile
+++ b/usr/src/uts/sun4u/sf/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/sha1/Makefile b/usr/src/uts/sun4u/sha1/Makefile
index 4c78018602..d62f696e5b 100644
--- a/usr/src/uts/sun4u/sha1/Makefile
+++ b/usr/src/uts/sun4u/sha1/Makefile
@@ -67,7 +67,7 @@ CFLAGS += $(CCVERBOSE) -I$(COM_DIR)
CFLAGS += -DVIS_SHA1
LINTFLAGS += -I$(COM_DIR)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/spitfire/Makefile b/usr/src/uts/sun4u/spitfire/Makefile
index 0b2df11653..d6b1481448 100644
--- a/usr/src/uts/sun4u/spitfire/Makefile
+++ b/usr/src/uts/sun4u/spitfire/Makefile
@@ -86,7 +86,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_BAD_FORMAT_STR2
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/su/Makefile b/usr/src/uts/sun4u/su/Makefile
index 25dc6f0f8f..533f0614ce 100644
--- a/usr/src/uts/sun4u/su/Makefile
+++ b/usr/src/uts/sun4u/su/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/sunfire/ac/Makefile b/usr/src/uts/sun4u/sunfire/ac/Makefile
index f73e528bab..966a97147e 100644
--- a/usr/src/uts/sun4u/sunfire/ac/Makefile
+++ b/usr/src/uts/sun4u/sunfire/ac/Makefile
@@ -58,7 +58,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4u/sunfire/sysctrl/Makefile b/usr/src/uts/sun4u/sunfire/sysctrl/Makefile
index c17f77d6a2..21411d8b9d 100644
--- a/usr/src/uts/sun4u/sunfire/sysctrl/Makefile
+++ b/usr/src/uts/sun4u/sunfire/sysctrl/Makefile
@@ -60,7 +60,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4u/tazmo/envctrl/Makefile b/usr/src/uts/sun4u/tazmo/envctrl/Makefile
index 3562da1dca..7877ead054 100644
--- a/usr/src/uts/sun4u/tazmo/envctrl/Makefile
+++ b/usr/src/uts/sun4u/tazmo/envctrl/Makefile
@@ -61,7 +61,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
#
diff --git a/usr/src/uts/sun4u/todds1287/Makefile b/usr/src/uts/sun4u/todds1287/Makefile
index 9ffd0c2526..ee0d883bc9 100644
--- a/usr/src/uts/sun4u/todds1287/Makefile
+++ b/usr/src/uts/sun4u/todds1287/Makefile
@@ -67,7 +67,7 @@ CFLAGS += $(CCVERBOSE)
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/unix/Makefile b/usr/src/uts/sun4u/unix/Makefile
index 8ff31a51ff..9610b65e09 100644
--- a/usr/src/uts/sun4u/unix/Makefile
+++ b/usr/src/uts/sun4u/unix/Makefile
@@ -121,7 +121,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/sun4u/upa64s/Makefile b/usr/src/uts/sun4u/upa64s/Makefile
index 48c7021920..1d2e17ed0a 100644
--- a/usr/src/uts/sun4u/upa64s/Makefile
+++ b/usr/src/uts/sun4u/upa64s/Makefile
@@ -68,7 +68,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/us/Makefile b/usr/src/uts/sun4u/us/Makefile
index 5b28ca8b2a..110f57f0f7 100644
--- a/usr/src/uts/sun4u/us/Makefile
+++ b/usr/src/uts/sun4u/us/Makefile
@@ -76,7 +76,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4u/vis/Makefile b/usr/src/uts/sun4u/vis/Makefile
index 530f21d1d9..7ce1877331 100644
--- a/usr/src/uts/sun4u/vis/Makefile
+++ b/usr/src/uts/sun4u/vis/Makefile
@@ -60,7 +60,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/uts/sun4u/zs/Makefile b/usr/src/uts/sun4u/zs/Makefile
index 927f12d442..198362da01 100644
--- a/usr/src/uts/sun4u/zs/Makefile
+++ b/usr/src/uts/sun4u/zs/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4v/bge/Makefile b/usr/src/uts/sun4v/bge/Makefile
index a062204337..6a99f9e374 100644
--- a/usr/src/uts/sun4v/bge/Makefile
+++ b/usr/src/uts/sun4v/bge/Makefile
@@ -76,7 +76,7 @@ LDFLAGS += -dy -N misc/mac -N drv/ip
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-variable
diff --git a/usr/src/uts/sun4v/bootdev/Makefile b/usr/src/uts/sun4v/bootdev/Makefile
index 684f732418..4b393be29b 100644
--- a/usr/src/uts/sun4v/bootdev/Makefile
+++ b/usr/src/uts/sun4v/bootdev/Makefile
@@ -66,7 +66,7 @@ CFLAGS += $(CCVERBOSE)
#
LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4v/dr_io/Makefile b/usr/src/uts/sun4v/dr_io/Makefile
index 1de9932500..64346521b0 100644
--- a/usr/src/uts/sun4v/dr_io/Makefile
+++ b/usr/src/uts/sun4v/dr_io/Makefile
@@ -55,7 +55,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4v/ds/Makefile b/usr/src/uts/sun4v/ds/Makefile
index 64e873f53a..ed43f2f58e 100644
--- a/usr/src/uts/sun4v/ds/Makefile
+++ b/usr/src/uts/sun4v/ds/Makefile
@@ -77,7 +77,7 @@ LDFLAGS += -dy -Nmisc/ldc
#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4v/ds_pri/Makefile b/usr/src/uts/sun4v/ds_pri/Makefile
index d67e8da7d0..4fd9d986af 100644
--- a/usr/src/uts/sun4v/ds_pri/Makefile
+++ b/usr/src/uts/sun4v/ds_pri/Makefile
@@ -67,7 +67,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Module Dependencies
diff --git a/usr/src/uts/sun4v/ebus/Makefile b/usr/src/uts/sun4v/ebus/Makefile
index 6ad462ca17..a278c5ed3d 100644
--- a/usr/src/uts/sun4v/ebus/Makefile
+++ b/usr/src/uts/sun4v/ebus/Makefile
@@ -76,7 +76,7 @@ CFLAGS += -dalign
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4v/genunix/Makefile b/usr/src/uts/sun4v/genunix/Makefile
index 3efad8b2e4..37beecd4ee 100644
--- a/usr/src/uts/sun4v/genunix/Makefile
+++ b/usr/src/uts/sun4v/genunix/Makefile
@@ -125,7 +125,7 @@ CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-type-limits
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-empty-body
diff --git a/usr/src/uts/sun4v/ldc/Makefile b/usr/src/uts/sun4v/ldc/Makefile
index 0175bd7b56..f1c044bb36 100644
--- a/usr/src/uts/sun4v/ldc/Makefile
+++ b/usr/src/uts/sun4v/ldc/Makefile
@@ -78,7 +78,7 @@ LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-parentheses
#
diff --git a/usr/src/uts/sun4v/n2rng/Makefile b/usr/src/uts/sun4v/n2rng/Makefile
index b88975168f..ba94b5bdfb 100644
--- a/usr/src/uts/sun4v/n2rng/Makefile
+++ b/usr/src/uts/sun4v/n2rng/Makefile
@@ -68,7 +68,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
CFLAGS += $(CCVERBOSE) -DN2 -I$(COM_DIR)
LINTFLAGS += -DN2 -I$(COM_DIR)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# module dependencies
diff --git a/usr/src/uts/sun4v/niumx/Makefile b/usr/src/uts/sun4v/niumx/Makefile
index 756934f278..5ebcf02762 100644
--- a/usr/src/uts/sun4v/niumx/Makefile
+++ b/usr/src/uts/sun4v/niumx/Makefile
@@ -64,7 +64,7 @@ INC_PATH += -I$(UTSBASE)/sun4v/io/niumx
#
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4v/nxge/Makefile b/usr/src/uts/sun4v/nxge/Makefile
index 6d29a43007..78c316d0be 100644
--- a/usr/src/uts/sun4v/nxge/Makefile
+++ b/usr/src/uts/sun4v/nxge/Makefile
@@ -115,7 +115,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
#
diff --git a/usr/src/uts/sun4v/ontario/tsalarm/Makefile b/usr/src/uts/sun4v/ontario/tsalarm/Makefile
index 7e8111d281..8f0a8a0718 100644
--- a/usr/src/uts/sun4v/ontario/tsalarm/Makefile
+++ b/usr/src/uts/sun4v/ontario/tsalarm/Makefile
@@ -86,7 +86,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4v/pcie/Makefile b/usr/src/uts/sun4v/pcie/Makefile
index 56b54dc602..12cf0358a9 100644
--- a/usr/src/uts/sun4v/pcie/Makefile
+++ b/usr/src/uts/sun4v/pcie/Makefile
@@ -63,7 +63,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
LDFLAGS += -dy -Nmisc/busra
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/uts/sun4v/platsvc/Makefile b/usr/src/uts/sun4v/platsvc/Makefile
index b66ad32420..0c56b38552 100644
--- a/usr/src/uts/sun4v/platsvc/Makefile
+++ b/usr/src/uts/sun4v/platsvc/Makefile
@@ -56,7 +56,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4v/px/Makefile b/usr/src/uts/sun4v/px/Makefile
index 839ed8709e..d3b224707a 100644
--- a/usr/src/uts/sun4v/px/Makefile
+++ b/usr/src/uts/sun4v/px/Makefile
@@ -88,7 +88,7 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-clobbered
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sun4v/rootnex/Makefile b/usr/src/uts/sun4v/rootnex/Makefile
index bf26875fc0..004b5140c2 100644
--- a/usr/src/uts/sun4v/rootnex/Makefile
+++ b/usr/src/uts/sun4v/rootnex/Makefile
@@ -70,7 +70,7 @@ CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# For now, disable these lint checks; maintainers should endeavor
diff --git a/usr/src/uts/sun4v/su/Makefile b/usr/src/uts/sun4v/su/Makefile
index 52719a7dab..5b2296ce5f 100644
--- a/usr/src/uts/sun4v/su/Makefile
+++ b/usr/src/uts/sun4v/su/Makefile
@@ -70,7 +70,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4v/unix/Makefile b/usr/src/uts/sun4v/unix/Makefile
index 216a236f0f..084cad3622 100644
--- a/usr/src/uts/sun4v/unix/Makefile
+++ b/usr/src/uts/sun4v/unix/Makefile
@@ -120,7 +120,7 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-unused-function
diff --git a/usr/src/uts/sun4v/vcc/Makefile b/usr/src/uts/sun4v/vcc/Makefile
index 8100d00ebf..3a333ba3c8 100644
--- a/usr/src/uts/sun4v/vcc/Makefile
+++ b/usr/src/uts/sun4v/vcc/Makefile
@@ -70,7 +70,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-unused-function
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# compiler failes with not reached statements
diff --git a/usr/src/uts/sun4v/vdc/Makefile b/usr/src/uts/sun4v/vdc/Makefile
index da180435e0..9877103746 100644
--- a/usr/src/uts/sun4v/vdc/Makefile
+++ b/usr/src/uts/sun4v/vdc/Makefile
@@ -66,7 +66,7 @@ CFLAGS += $(CCVERBOSE)
CFLAGS += -D_EXTVTOC
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
LDFLAGS += -dy -Nmisc/ldc -Nmisc/platsvc -Nmisc/scsi
diff --git a/usr/src/uts/sun4v/vds/Makefile b/usr/src/uts/sun4v/vds/Makefile
index 80e5028a06..664b987d0f 100644
--- a/usr/src/uts/sun4v/vds/Makefile
+++ b/usr/src/uts/sun4v/vds/Makefile
@@ -65,7 +65,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
CFLAGS += $(CCVERBOSE)
CFLAGS += -D_EXTVTOC
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# module dependencies
diff --git a/usr/src/uts/sun4v/vis/Makefile b/usr/src/uts/sun4v/vis/Makefile
index f7f1f09cb7..522d46d84a 100644
--- a/usr/src/uts/sun4v/vis/Makefile
+++ b/usr/src/uts/sun4v/vis/Makefile
@@ -61,7 +61,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
# lint pass one enforcement
#
CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
.KEEP_STATE:
diff --git a/usr/src/uts/sun4v/vnet/Makefile b/usr/src/uts/sun4v/vnet/Makefile
index a24d4790b6..858c2c58da 100644
--- a/usr/src/uts/sun4v/vnet/Makefile
+++ b/usr/src/uts/sun4v/vnet/Makefile
@@ -92,7 +92,7 @@ CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
#
# Default build targets.
diff --git a/usr/src/uts/sun4v/vsw/Makefile b/usr/src/uts/sun4v/vsw/Makefile
index bbc07208ef..e7d0a439e7 100644
--- a/usr/src/uts/sun4v/vsw/Makefile
+++ b/usr/src/uts/sun4v/vsw/Makefile
@@ -88,7 +88,7 @@ LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
CERRWARN += -_gcc=-Wno-type-limits
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-label