20 files changed, 4 insertions, 24 deletions
diff --git a/usr/src/uts/intel/bfe/Makefile b/usr/src/uts/intel/bfe/Makefile
index 89b13ec0be..da2b8f55c5 100644
--- a/usr/src/uts/intel/bfe/Makefile
+++ b/usr/src/uts/intel/bfe/Makefile
@@ -66,7 +66,7 @@ CFGFLAGS	= -DGEM_CONFIG_POLLING -DGEM_CONFIG_GLDv3 -DGEM_CONFIG_VLAN \
 CPPFLAGS	+= $(VFLAGS) $(AFLAGS) $(DFLAGS) $(CFGFLAGS) $(CCVERBOSE) \
 	-I$(UTSBASE)/common/io/bfe
 
-CFLAGS		+= $(CPPFLAGS) -xc99=%all
+CFLAGS		+= $(CPPFLAGS)
 
 CERRWARN	+= -_gcc=-Wno-switch
 CERRWARN	+= -_gcc=-Wno-uninitialized
diff --git a/usr/src/uts/intel/bnxe/Makefile b/usr/src/uts/intel/bnxe/Makefile
index ff44f0d4d8..4b078ae559 100644
--- a/usr/src/uts/intel/bnxe/Makefile
+++ b/usr/src/uts/intel/bnxe/Makefile
@@ -49,7 +49,6 @@ ALL_TARGET	= $(BINARY) $(CONFMOD)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
-C99MODE=        -xc99=%all
 C99LMODE=       -Xc99=%all
 
 #
diff --git a/usr/src/uts/intel/chxge/Makefile b/usr/src/uts/intel/chxge/Makefile
index 0d1a5010a1..052bd467d2 100644
--- a/usr/src/uts/intel/chxge/Makefile
+++ b/usr/src/uts/intel/chxge/Makefile
@@ -65,8 +65,6 @@ CFLAGS		+= -DCONFIG_CHELSIO_T1_OFFLOAD
 
 CFLAGS		+= -DSUN_KSTATS -DHOST_PAUSE -DTX_CKSUM_FIX -DTX_THREAD_RECLAIM
 
-CFLAGS		+= -xc99=%all
-
 #	Debug flags
 # CFLAGS		+= -DCH_DEBUG=1 -DPE_DBGOUT_ENABLED=1
 
diff --git a/usr/src/uts/intel/cxgbe/cxgbe/Makefile b/usr/src/uts/intel/cxgbe/cxgbe/Makefile
index acb33502c8..19c7d29776 100644
--- a/usr/src/uts/intel/cxgbe/cxgbe/Makefile
+++ b/usr/src/uts/intel/cxgbe/cxgbe/Makefile
@@ -45,7 +45,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
 
 CFLAGS += -g -I$(UTSBASE)/common/io/cxgbe -I$(UTSBASE)/common/io/cxgbe/common \
 	-I$(UTSBASE)/common/io/cxgbe/t4nex -I$(UTSBASE)/common/io/cxgbe/shared
-CFLAGS += -xc99=%all
 
 #
 # Driver depends
diff --git a/usr/src/uts/intel/cxgbe/t4nex/Makefile b/usr/src/uts/intel/cxgbe/t4nex/Makefile
index 6ebef6a7ea..8185b52238 100644
--- a/usr/src/uts/intel/cxgbe/t4nex/Makefile
+++ b/usr/src/uts/intel/cxgbe/t4nex/Makefile
@@ -50,7 +50,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
 CFLAGS += -g -I$(UTSBASE)/common/io/cxgbe -I$(UTSBASE)/common/io/cxgbe/common \
 	-I$(UTSBASE)/common/io/cxgbe/t4nex -I$(UTSBASE)/common/io/cxgbe/shared \
 	-I$(UTSBASE)/common/io/cxgbe/firmware
-CFLAGS += -xc99=%all
 
 #
 # Driver depends
diff --git a/usr/src/uts/intel/dca/Makefile b/usr/src/uts/intel/dca/Makefile
index a1ff33c62a..034e2019c3 100644
--- a/usr/src/uts/intel/dca/Makefile
+++ b/usr/src/uts/intel/dca/Makefile
@@ -58,9 +58,6 @@ ALL_TARGET	= $(BINARY) $(SRC_CONFFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 
-# C99 mode is needed for dca
-CFLAGS += $(C99_ENABLE) 
-
 #
 # For now, disable these lint checks; maintainers should endeavor
 # to investigate and remove these for maximum lint coverage.
diff --git a/usr/src/uts/intel/fct/Makefile b/usr/src/uts/intel/fct/Makefile
index 3281db0d10..b61a18873d 100644
--- a/usr/src/uts/intel/fct/Makefile
+++ b/usr/src/uts/intel/fct/Makefile
@@ -60,7 +60,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 MODSTUBS_DIR	 = $(OBJS_DIR)
 LDFLAGS		+= -dy -Ndrv/stmf
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 #
diff --git a/usr/src/uts/intel/iscsit/Makefile b/usr/src/uts/intel/iscsit/Makefile
index 1d61a81d72..73b9139ec9 100644
--- a/usr/src/uts/intel/iscsit/Makefile
+++ b/usr/src/uts/intel/iscsit/Makefile
@@ -60,7 +60,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 MODSTUBS_DIR	 = $(OBJS_DIR)
 LDFLAGS		+= -dy -Ndrv/stmf -Nmisc/idm -Nfs/sockfs -Nmisc/md5 -Nmisc/ksocket
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 CERRWARN	+= -_gcc=-Wno-switch
diff --git a/usr/src/uts/intel/nsmb/Makefile b/usr/src/uts/intel/nsmb/Makefile
index dbe89e1b9d..35be8a8316 100644
--- a/usr/src/uts/intel/nsmb/Makefile
+++ b/usr/src/uts/intel/nsmb/Makefile
@@ -63,7 +63,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 MODSTUBS_DIR	= $(OBJS_DIR)
 $(MODSTUBS_O)	:= AS_CPPFLAGS += -DNSMB_MODULE
 CLEANFILES	+= $(MODSTUBS_O) $(IOC_CHECK_H)
-C99MODE		= $(C99_ENABLE)
 CERRWARN	+= -erroff=E_STATEMENT_NOT_REACHED
 INC_PATH	+= -I$(UTSBASE)/common/fs/smbclnt
 LDFLAGS         += -dy -Ncrypto/md4 -Ncrypto/md5 -Nmisc/tlimod
diff --git a/usr/src/uts/intel/pppt/Makefile b/usr/src/uts/intel/pppt/Makefile
index 78f8e8b7f7..f492a4d1b0 100644
--- a/usr/src/uts/intel/pppt/Makefile
+++ b/usr/src/uts/intel/pppt/Makefile
@@ -60,7 +60,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 MODSTUBS_DIR	 = $(OBJS_DIR)
 LDFLAGS		+= -dy -Ndrv/stmf
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 CERRWARN	+= -_gcc=-Wno-switch
diff --git a/usr/src/uts/intel/qlge/Makefile b/usr/src/uts/intel/qlge/Makefile
index 3883358dbf..d9951b0d1a 100644
--- a/usr/src/uts/intel/qlge/Makefile
+++ b/usr/src/uts/intel/qlge/Makefile
@@ -61,7 +61,6 @@ INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca/qlge
 
 LDFLAGS		+= -dy -Nmisc/mac -Ndrv/ip
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 CERRWARN	+= -_gcc=-Wno-switch
diff --git a/usr/src/uts/intel/qlt/Makefile b/usr/src/uts/intel/qlt/Makefile
index cdbef29ee9..6285b973eb 100644
--- a/usr/src/uts/intel/qlt/Makefile
+++ b/usr/src/uts/intel/qlt/Makefile
@@ -60,7 +60,6 @@ LDFLAGS		+= -dy -Ndrv/fct -Ndrv/stmf
 CFLAGS		+= -DUNIQUE_FW_NAME
 LINTTAGS	+= -DUNIQUE_FW_NAME
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 #
diff --git a/usr/src/uts/intel/sfe/Makefile b/usr/src/uts/intel/sfe/Makefile
index 9f2ad1e63a..00aaa13a71 100644
--- a/usr/src/uts/intel/sfe/Makefile
+++ b/usr/src/uts/intel/sfe/Makefile
@@ -71,7 +71,7 @@ CFGFLAGS	= -DGEM_CONFIG_POLLING -DGEM_CONFIG_GLDv3 -DGEM_CONFIG_VLAN \
 CPPFLAGS	+= $(VFLAGS) $(AFLAGS) $(DFLAGS) $(CFGFLAGS) $(CCVERBOSE) \
 	-I$(UTSBASE)/common/io/sfe
 
-CFLAGS		+= $(CPPFLAGS) -xc99=%all
+CFLAGS		+= $(CPPFLAGS)
 
 CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-switch
diff --git a/usr/src/uts/intel/smbfs/Makefile b/usr/src/uts/intel/smbfs/Makefile
index 49538576b6..6defe60e32 100644
--- a/usr/src/uts/intel/smbfs/Makefile
+++ b/usr/src/uts/intel/smbfs/Makefile
@@ -61,7 +61,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 MODSTUBS_DIR	= $(OBJS_DIR)
 $(MODSTUBS_O)	:= AS_CPPFLAGS += -DSMBFS_MODULE
 CLEANFILES	+= $(MODSTUBS_O)
-C99MODE		= $(C99_ENABLE)
 INC_PATH	+= -I$(UTSBASE)/common/fs/smbclnt
 INC_PATH	+= -I$(COMMONBASE)/smbclnt
 LDFLAGS         += -dy -Ndrv/nsmb
diff --git a/usr/src/uts/intel/srpt/Makefile b/usr/src/uts/intel/srpt/Makefile
index 7c83e44453..424e85470e 100644
--- a/usr/src/uts/intel/srpt/Makefile
+++ b/usr/src/uts/intel/srpt/Makefile
@@ -60,7 +60,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 MODSTUBS_DIR	 = $(OBJS_DIR)
 LDFLAGS		+= -dy -Ndrv/stmf -Nmisc/ibtl -Nmisc/ibcm
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 CERRWARN	+= -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/intel/stmf/Makefile b/usr/src/uts/intel/stmf/Makefile
index 1e45739dbb..50ec544cbb 100644
--- a/usr/src/uts/intel/stmf/Makefile
+++ b/usr/src/uts/intel/stmf/Makefile
@@ -58,7 +58,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 MODSTUBS_DIR	 = $(OBJS_DIR)
 CERRWARN	+= -erroff=E_STATEMENT_NOT_REACHED
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 #
diff --git a/usr/src/uts/intel/stmf_sbd/Makefile b/usr/src/uts/intel/stmf_sbd/Makefile
index ac64b10708..4259f16b69 100644
--- a/usr/src/uts/intel/stmf_sbd/Makefile
+++ b/usr/src/uts/intel/stmf_sbd/Makefile
@@ -61,7 +61,6 @@ LDFLAGS		+= -dy -Ndrv/stmf -Nfs/zfs
 
 INC_PATH	+= -I$(UTSBASE)/common/fs/zfs
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 #
diff --git a/usr/src/uts/intel/xge/Makefile b/usr/src/uts/intel/xge/Makefile
index b3836ba90f..7df734d75d 100644
--- a/usr/src/uts/intel/xge/Makefile
+++ b/usr/src/uts/intel/xge/Makefile
@@ -85,8 +85,8 @@ XGE_CFLAGS	= $(HAL_CFLAGS) $(TRACE_CFLAGS) $(CCVERBOSE) \
 		-I$(UTSBASE)/common/io/xge/hal/xgehal \
 		-I$(UTSBASE)/common/io/xge/drv -DSOLARIS
 
-CFLAGS		+= $(XGE_CFLAGS) -xO4 -xcrossfile -xc99=%all
-CFLAGS64	+= $(XGE_CFLAGS) -xO4 -xcrossfile -xc99=%all
+CFLAGS		+= $(XGE_CFLAGS) -xO4 -xcrossfile
+CFLAGS64	+= $(XGE_CFLAGS) -xO4 -xcrossfile
 
 #
 #	Driver depends on MAC & IP
diff --git a/usr/src/uts/intel/zfs/Makefile b/usr/src/uts/intel/zfs/Makefile
index 1d3da0ec8a..a4a2f4a561 100644
--- a/usr/src/uts/intel/zfs/Makefile
+++ b/usr/src/uts/intel/zfs/Makefile
@@ -72,7 +72,6 @@ INC_PATH	+= -I$(UTSBASE)/common/fs/zfs/lua
 INC_PATH	+= -I$(SRC)/common
 INC_PATH	+= -I$(COMMONBASE)/zfs
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 #
diff --git a/usr/src/uts/intel/zut/Makefile b/usr/src/uts/intel/zut/Makefile
index 7df92bc696..23db5c4405 100644
--- a/usr/src/uts/intel/zut/Makefile
+++ b/usr/src/uts/intel/zut/Makefile
@@ -62,7 +62,6 @@ INC_PATH	+= -I$(UTSBASE)/common/fs/zut
 INC_PATH	+= -I$(SRC)/common
 INC_PATH	+= -I$(COMMONBASE)/zut
 
-C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
 #