summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-08-16 11:15:20 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-08-16 11:15:20 +0000
commit0833839f60181af6fcf14de327d3ba2b30da8ed2 (patch)
treeaf7f3254e70fb8ad910d460648f9af42c0210457 /usr/src/uts/intel
parentadf665b5e735d87cf7d6b4e8932fb7dce88e42ad (diff)
parentd3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe (diff)
downloadillumos-joyent-0833839f60181af6fcf14de327d3ba2b30da8ed2.tar.gz
[illumos-gate merge]
commit d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe 11528 Makefile.noget can get gone 11529 Use -Wno-maybe-initialized commit c4ccc1f9004b70b07e4cdb57641c38ab607306c9 11226 Remove NetraCT support commit dcfeff93f67a1188722a358e0fbfcd604993e573 11561 loader script needs to place .eh_frame after .text commit a8ffe4975d219124d53dcd9de30126f3a595d28f 11555 gptzfsboot: boot prompt is not refreshed on device change commit 79940ff6ac581ff9431c474dcfa18c78f1cb7a50 11556 ip_attr.c functions need to not dereference conn_ixa directly after lock drop commit fe949611d4f0a0f42a6923a31cd3073e5b2bc97c 10540 wsdiff much slower under python3 than python2 commit c1064fd7ce62fe763a4475e9988ffea3b22137de 11541 allocation_classes feature must be enabled to add log device Conflicts: usr/src/uts/sparc/Makefile.sparc usr/src/uts/intel/dev/Makefile usr/src/uts/i86pc/pcie/Makefile usr/src/cmd/zoneadmd/Makefile
Diffstat (limited to 'usr/src/uts/intel')
-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/Makefile3
-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
222 files changed, 222 insertions, 223 deletions
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 08e92c6fc7..b1d3344ae7 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 6286d956a9..25b49cc203 100644
--- a/usr/src/uts/intel/core_pcbe/Makefile
+++ b/usr/src/uts/intel/core_pcbe/Makefile
@@ -118,7 +118,7 @@ ROOTSOFTLINKS = $(SOFTLINKS:%=$(ROOT_PSM_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 00c885fc3a..6cc3fda6cd 100644
--- a/usr/src/uts/intel/dev/Makefile
+++ b/usr/src/uts/intel/dev/Makefile
@@ -70,8 +70,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-uninitialized
-CERRWARN += -_gcc=-Wno-unused-function
+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 d2bf772b82..1f2e3d7023 100644
--- a/usr/src/uts/intel/dld/Makefile
+++ b/usr/src/uts/intel/dld/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-type-limits
CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/uts/intel/dls/Makefile b/usr/src/uts/intel/dls/Makefile
index 5bf2bdbcf8..2c9c5a49f1 100644
--- a/usr/src/uts/intel/dls/Makefile
+++ b/usr/src/uts/intel/dls/Makefile
@@ -65,7 +65,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 7ab08e4456..9cc6e5499f 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 7e0da79ba3..7387a62a15 100644
--- a/usr/src/uts/intel/ipf/Makefile
+++ b/usr/src/uts/intel/ipf/Makefile
@@ -71,7 +71,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 c71c39f911..b276ee8375 100644
--- a/usr/src/uts/intel/iptun/Makefile
+++ b/usr/src/uts/intel/iptun/Makefile
@@ -60,7 +60,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 6766bd933b..7b9fefec25 100644
--- a/usr/src/uts/intel/mac/Makefile
+++ b/usr/src/uts/intel/mac/Makefile
@@ -59,7 +59,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 42dc040eee..1f341b47d8 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 7b54398af3..614aae4d60 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 cae0da72f8..e161960b33 100644
--- a/usr/src/uts/intel/spdsock/Makefile
+++ b/usr/src/uts/intel/spdsock/Makefile
@@ -65,7 +65,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.