Mercurial > unleashed > wips
changeset 20286:f7ab5379e23a
Makefiles need to specify C99 mode consistently
Port of illumos-gate commit bd0ce624be4492bab2f6c53383a40618647aba28.
illumos bug# 9027
Port done by Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
line wrap: on
line diff
--- a/usr/src/Makefile.ast Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/Makefile.ast Mon Feb 05 08:52:36 2018 +0300 @@ -26,7 +26,7 @@ # Override this top level flag so the compiler builds in its native # C99 mode. This has been enabled to support the math stuff in the # AST tools (including ksh93). -C99MODE= $(C99_ENABLE) -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1 +CSTD= $(CSTD_GNU99) -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1 # common CPP flags for libshell consumers (ksh etc.) LIBSHELLCPPFLAGS = \
--- a/usr/src/Makefile.master Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/Makefile.master Mon Feb 05 08:52:36 2018 +0300 @@ -306,10 +306,10 @@ # turn warnings into errors (C++) CCERRWARN= -Werror -# C99 mode -C99_ENABLE= -std=gnu99 -C99_DISABLE= -std=gnu89 -C99MODE= $(C99_DISABLE) +# C standard. +CSTD_GNU89= -std=gnu89 +CSTD_GNU99= -std=gnu99 +CSTD= $(CSTD_GNU89) # In most places, assignments to these macros should be appended with += # (CPPFLAGS.first allows values to be prepended to CPPFLAGS). @@ -350,8 +350,8 @@ # Flags used to build in debug mode for ctf generation. Bugs in the Devpro # compilers currently prevent us from building with cc-emitted DWARF. # -CTF_FLAGS_sparc = -g -Wc,-Qiselect-T1 $(C99MODE) $(CDWARFSTR) -CTF_FLAGS_i386 = -g $(C99MODE) $(CDWARFSTR) +CTF_FLAGS_sparc = -g -Wc,-Qiselect-T1 $(CSTD) $(CDWARFSTR) +CTF_FLAGS_i386 = -g $(CSTD) $(CDWARFSTR) CTF_FLAGS_sparcv9 = $(CTF_FLAGS_sparc) CTF_FLAGS_amd64 = $(CTF_FLAGS_i386) @@ -407,11 +407,11 @@ $(SRCDBGBLD)CCSOURCEDEBUGFLAGS = -g CFLAGS= $(COPTFLAG) $($(MACH)_CFLAGS) \ - $(CERRWARN) $(C99MODE) \ + $(CERRWARN) $(CSTD) \ $(CCNOAUTOINLINE) $(CSOURCEDEBUGFLAGS) \ $(CUSERFLAGS) CFLAGS64= $(COPTFLAG64) $($(MACH64)_CFLAGS) \ - $(CERRWARN) $(C99MODE) \ + $(CERRWARN) $(CSTD) \ $(CCNOAUTOINLINE) $(CSOURCEDEBUGFLAGS) \ $(CUSERFLAGS64) ARFLAGS= rc @@ -420,7 +420,7 @@ # run on the build machine (also known as the NATIVE_BUILD). # NATIVE_CFLAGS= $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) \ - $(CERRWARN) $(C99MODE) \ + $(CERRWARN) $(CSTD) \ $(CCNOAUTOINLINE) \ $(CSOURCEDEBUGFLAGS) $(CUSERFLAGS)
--- a/usr/src/cmd/boot/bootadm/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/boot/bootadm/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -47,7 +47,7 @@ CPPFLAGS += -I$(SRCTOP)/include -I$(SRC)/common -I$(SRC)/common/ficl CERRWARN += -Wall -Wno-unknown-pragmas -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) all: $(PROG)
--- a/usr/src/cmd/boot/installboot/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/boot/installboot/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ LDLIBS += -lmd5 -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -23,7 +23,7 @@ OBJS= ClientCommon.o dns-sd.o SRCS= ClientCommon.c dns-sd.c -CFLAGS += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) CPPFLAGS += -DMDNS_VERSIONSTR_NODTS LDLIBS += -ldns_sd
--- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -53,7 +53,7 @@ CERRWARN += -Wno-uninitialized CERRWARN += -Wno-unused-label -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) # I18n POFILE = $(ILBD).po
--- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ POFILE = $(PROG).po POFILES = $(SRCS:%.c=%.po) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) # # We need access to the ancillary data features which are only available
--- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -68,7 +68,7 @@ include ../Makefile.lib -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += $(MDNSFLAGS) -I$(CMN_DIR) install: all $(ROOTLIBINETPROG) $(ROOTMANIFEST)
--- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ $(ROOTETC)/inet/$(CFGFILES):= OWNER= root $(ROOTETC)/inet/$(CFGFILES):= GROUP= sys -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # # We need access to the ancillary data features which are only available
--- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) POFILES = $(OBJS:%.o=%.po) POFILE = $(PROG)_all.po
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -28,7 +28,7 @@ include $(SRC)/cmd/Makefile.cmd -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-uninitialized LDLIBS += -lipmp -lsysevent -lnvpair -lofmt XGETFLAGS += -a -x $(PROG).xcl
--- a/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -41,7 +41,7 @@ # These #defines are required to use SUSv3 interfaces CPPFLAGS += -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) .KEEP_STATE: .PARALLEL:
--- a/usr/src/cmd/coreadm/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/coreadm/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -33,7 +33,7 @@ .KEEP_STATE: LDLIBS += -lproc -lscf -C99MODE=$(C99_ENABLE) +CSTD=$(CSTD_GNU99) all: $(PROG)
--- a/usr/src/cmd/diskinfo/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/diskinfo/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -20,7 +20,7 @@ include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/Makefile.ctf -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/lib/fm/topo
--- a/usr/src/cmd/fm/notify/smtp-notify/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fm/notify/smtp-notify/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -44,7 +44,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I../../../../../lib/fm/libfmnotify/common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) LDLIBS += -L$(ROOT)/usr/lib/fm -lnvpair -lfmevent -lfmd_msg -lfmnotify \ -lumem
--- a/usr/src/cmd/fm/notify/snmp-notify/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fm/notify/snmp-notify/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -42,7 +42,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I../../../../../lib/fm/libfmnotify/common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) LDLIBS += -L$(ROOT)/usr/lib/fm -lnvpair -lfmevent -lfmd_msg -lfmnotify \ -lumem -lnetsnmp -lnetsnmpagent
--- a/usr/src/cmd/fs.d/nfs/lockd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/nfs/lockd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ ../lib/smfcfg.c ../lib/thrpool.c LDLIBS += -lscf CPPFLAGS += -I../lib -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-parentheses CERRWARN += -Wno-switch
--- a/usr/src/cmd/fs.d/reparsed/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/reparsed/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ CLOBBERFILES += $(TYPEPROG) CERRWARN += -Wno-unused-variable -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lreparse
--- a/usr/src/cmd/fs.d/smbclnt/chacl/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/smbclnt/chacl/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ CERRWARN += -Wno-unused-variable CERRWARN += -Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLOBBERFILES += $(LIBPROG)
--- a/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -35,7 +35,7 @@ LDLIBS += -lsmbfs -lsec CERRWARN += -Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLOBBERFILES += $(LIBPROG)
--- a/usr/src/cmd/fs.d/smbclnt/mount/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/smbclnt/mount/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -42,7 +42,7 @@ CERRWARN += -Wno-parentheses CERRWARN += -Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lsmbfs
--- a/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ SRCS= $(TYPEPROG).c POFILE= $(TYPEPROG).po -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/lib/libsmbfs \ -I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common
--- a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ SRCS= $(TYPEPROG).c POFILE= $(TYPEPROG).po -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # This is a multi-thread program but Nevada # no longer needs -lthread
--- a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -45,7 +45,7 @@ CLEANFILES += srvsvc1_ndr.c CLOBBERFILES+= $(POFILE) $(POFILES) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lmlrpc -lsmbfs
--- a/usr/src/cmd/fs.d/smbclnt/test/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/fs.d/smbclnt/test/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -47,7 +47,7 @@ LDLIBS += -lsmbfs CERRWARN += -Wno-unused-variable -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # CLOBBERFILES += $(LIBPROG)
--- a/usr/src/cmd/getconf/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/getconf/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -29,7 +29,7 @@ include ../Makefile.cmd -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += -D_XOPEN_SOURCE=600 -I$(SRC)/lib/libc/inc .KEEP_STATE:
--- a/usr/src/cmd/hal/addons/acpi/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/addons/acpi/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/addons/cpufreq/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/addons/cpufreq/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -g -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/addons/network-devices/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/addons/network-devices/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -44,7 +44,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -I../../utils -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/addons/storage/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/addons/storage/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/hald-runner/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/hald-runner/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -UDBUS_API_SUBJECT_TO_CHANGE -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/hald/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/hald/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -46,7 +46,7 @@ all install $(PROG) := LDLIBS += -lexpat CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CLOBBERFILES += hald_marshal.c hald_marshal.h
--- a/usr/src/cmd/hal/hald/solaris/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/hald/solaris/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ $(ROOTLIBSVCMETHOD)/svc-hal:= FILEMODE = 555 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/probing/acpi/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/probing/acpi/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/probing/network-printer/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/probing/network-printer/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/probing/printer/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/probing/printer/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/probing/storage/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/probing/storage/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/probing/volume/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/probing/volume/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/probing/xkb/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/probing/xkb/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/hal/tools/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/tools/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -73,7 +73,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTUSRSBINPROG = $(HAL_PROG:%=$(ROOTUSRSBIN)/%) \ $(SCRIPT_BIN:%=$(ROOTUSRSBIN)/%)
--- a/usr/src/cmd/hal/tools/illumos/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/hal/tools/illumos/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -44,7 +44,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTCMDDIR = $(ROOTLIB_HAL)/illumos ROOTCMD = $(HAL_PROGS:%=$(ROOTCMDDIR)/%) \
--- a/usr/src/cmd/iconv/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/iconv/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -23,7 +23,7 @@ SRCS = $(OBJS:%.o=%.c) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lcmdutils -lavl YFLAGS = -d -b parser CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
--- a/usr/src/cmd/idmap/idmapd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/idmap/idmapd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -65,7 +65,7 @@ TEXT_DOMAIN = SUNW_OST_OSLIB -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) POFILE = $(PROG)_all.po RPC_MSGOUT_OPT = -DRPC_MSGOUT=idmap_rpc_msgout
--- a/usr/src/cmd/latencytop/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/latencytop/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -34,7 +34,7 @@ CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LDLIBS += -lncurses -ldtrace all install := LDLIBS += -lglib-2.0
--- a/usr/src/cmd/ldap/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/ldap/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -31,7 +31,7 @@ -DNO_LIBLCACHE -DLDAP_REFERRALS -DNET_SSL \ -DLDAPSSLIO -DHAVE_SASL_OPTIONS \ -DSOLARIS_LDAP_CMD -$(NS_POFILES) := C99MODE = $(C99_ENABLE) +$(NS_POFILES) := CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/ldap/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/ldap/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -109,9 +109,9 @@ ldapaddent := LDLIBS += -lsldap ldapclient := LDLIBS += -lsldap -lscf -ldaplist := C99MODE = $(C99_ENABLE) -ldapaddent := C99MODE = $(C99_ENABLE) -ldapclient := C99MODE = $(C99_ENABLE) +ldaplist := CSTD = $(CSTD_GNU99) +ldapaddent := CSTD = $(CSTD_GNU99) +ldapclient := CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/mdb/Makefile.kmdb Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/Makefile.kmdb Mon Feb 05 08:52:36 2018 +0300 @@ -49,7 +49,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -D_MDB -D_KMDB $(INCDIRS:%=-I%) $(ARCHOPTS) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # # kmdb is a kernel module, so we'll use the kernel's build flags.
--- a/usr/src/cmd/mdb/Makefile.libstand Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/Makefile.libstand Mon Feb 05 08:52:36 2018 +0300 @@ -57,7 +57,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS = $(INCDIRS:%=-I%) -D_KMDB -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # # kmdb is a kernel module, so we'll use the kernel's build flags.
--- a/usr/src/cmd/mdb/Makefile.libstandctf Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/Makefile.libstandctf Mon Feb 05 08:52:36 2018 +0300 @@ -45,7 +45,7 @@ CPPFLAGS += -I$(SRC)/common/ctf -I../../../common -DCTF_OLD_VERSIONS -D_MDB \ -Dvsnprintf=ctf_vsnprintf -Dassfail=kmdb_prom_assfail -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # # kmdb is a kernel module, so we'll use the kernel's build flags.
--- a/usr/src/cmd/mdb/Makefile.mdb Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/Makefile.mdb Mon Feb 05 08:52:36 2018 +0300 @@ -95,7 +95,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -D_MDB -I. -I../.. -I../../../common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lncurses -lkvm -lproc -lrtld_db -lctf -lumem -ldisasm -lscf LDLIBS += -ldemangle-sys
--- a/usr/src/cmd/mdb/Makefile.module Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/Makefile.module Mon Feb 05 08:52:36 2018 +0300 @@ -98,7 +98,7 @@ kvm_TGTFLAGS = -D_KERNEL proc_TGTFLAGS = -D_USER -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += $($(MDBTGT)_TGTFLAGS) -I../../../common CPPFLAGS += -I$(SRCTOP)/include
--- a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -41,7 +41,7 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \ -I$(SRCTOP)/kernel/fs/zfs -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-type-limits
--- a/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ CPPFLAGS += -I$(SRC)/uts/common/fs/smbclnt CPPFLAGS += -I$(SRC)/uts/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # maybe not the best place for this, but # we need to create this directory.
--- a/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -33,7 +33,7 @@ include $(SRC)/cmd/mdb/intel/Makefile.amd64 include $(SRC)/cmd/mdb/Makefile.module -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRCTOP)/include
--- a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -38,6 +38,6 @@ CPPFLAGS += -I$(SRCTOP)/include/sys/fibre-channel/fca/qlc CPPFLAGS += -I$(SRCTOP)/include/sys/fibre-channel/impl -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-address
--- a/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -41,7 +41,7 @@ CPPFLAGS += -I$(SRC)/uts/common CPPFLAGS += -I$(SRCTOP)/include -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # maybe not the best place for this, but # we need to create this directory.
--- a/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ include ../../../Makefile.module -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) $(ROOTKMOD): $(INS.dir)
--- a/usr/src/cmd/mdb/intel/amd64/srpt/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/amd64/srpt/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -41,4 +41,4 @@ CPPFLAGS += -I$(SRCTOP)/include/sys CPPFLAGS += -I$(SRPTBASE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99)
--- a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -40,6 +40,6 @@ CPPFLAGS += -I$(SRCTOP)/kernel/fs/zfs CPPFLAGS += -I$(SRCTOP)/kernel/fs/zfs/lua -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-type-limits
--- a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -43,7 +43,7 @@ -I$(SRCTOP)/kernel/fs/zfs \ -I$(SRCTOP)/kernel/fs/zfs/lua -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-type-limits
--- a/usr/src/cmd/ndmpd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/ndmpd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -50,7 +50,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DDEBUG CPPFLAGS += -I. -Iinclude -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-unused-variable CERRWARN += -Wno-switch
--- a/usr/src/cmd/nvmeadm/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/nvmeadm/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -26,7 +26,7 @@ .KEEP_STATE: LDLIBS += -ldevinfo -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) all: $(PROG)
--- a/usr/src/cmd/od/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/od/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -22,7 +22,7 @@ CLOBBERFILES= $(PROG) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -D__EXTENSIONS__ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 # install rules
--- a/usr/src/cmd/perl/Makefile.perl Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/perl/Makefile.perl Mon Feb 05 08:52:36 2018 +0300 @@ -45,4 +45,4 @@ XSUBPP = $(PERL) $(PERLDIR)/lib/ExtUtils/xsubpp \ -typemap $(PERLDIR)/lib/ExtUtils/typemap -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99)
--- a/usr/src/cmd/policykit/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/policykit/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -35,7 +35,7 @@ CPPFLAGS += -I$(ROOT)/usr/include/libpolkit CPPFLAGS += $(POLICYKIT_DBUS_CPPFLAGS) $(POLICYKIT_GLIB_CPPFLAGS) CPPFLAGS += -DPACKAGE_VERSION=\"$(POLICYKIT_VERSION)\" -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-unused-variable CERRWARN += -Wno-unused-function
--- a/usr/src/cmd/rmmount/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/rmmount/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(SRC)/cmd/rmvolmgr -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-switch CERRWARN += -Wno-unused-variable
--- a/usr/src/cmd/rmvolmgr/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/rmvolmgr/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-switch CERRWARN += -Wno-uninitialized
--- a/usr/src/cmd/savecore/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/savecore/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -28,7 +28,7 @@ include ../../Makefile.cmd -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -DBZ_NO_STDIO -I$(SRC)/uts/common
--- a/usr/src/cmd/sgs/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/sgs/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -41,12 +41,12 @@ # Setting DEBUG = -DDEBUG (or "make DEBUG=-DDEBUG ...") enables ASSERT() # checking. This is automatically enabled for DEBUG builds, not for non-debug -# builds. Unset the global C99_DISABLE flag to insure we uncover all compiler +# builds. Unset the global CSTD_GNU89 flag to insure we uncover all compiler # warnings/errors. DEBUG = $(NOT_RELEASE_BUILD)DEBUG = -DDEBUG -C99_DISABLE = $(C99_ENABLE) +CSTD_GNU89 = $(CSTD_GNU99) CFLAGS += $(DEBUG) CFLAGS64 += $(DEBUG)
--- a/usr/src/cmd/sgs/ar/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/sgs/ar/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ LLDFLAGS = '-R$$ORIGIN/../../lib' LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' CPPFLAGS= -I. -I../../include $(CPPFLAGS.master) -I$(ELFCAP) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-uninitialized LDLIBS += -lelf $(CONVLIBDIR) $(CONV_LIB) -lsendfile
--- a/usr/src/cmd/sgs/error/i386/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/sgs/error/i386/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ INCLIST= -I../common DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-uninitialized CERRWARN += -Wno-parentheses
--- a/usr/src/cmd/sgs/gprof/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/sgs/gprof/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ INCLIST= -I../common -I../../include -I../../include/$(MACH) DEFLIST= -DELF_OBJ -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf CERRWARN += -Wno-uninitialized
--- a/usr/src/cmd/sgs/lex/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/sgs/lex/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -44,7 +44,7 @@ SRCDIR = ../common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-unused-label CERRWARN += -Wno-uninitialized
--- a/usr/src/cmd/sgs/m4/i386/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/sgs/m4/i386/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -33,7 +33,7 @@ INCLIST= -I../common DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-parentheses CERRWARN += -Wno-unused-label
--- a/usr/src/cmd/sgs/prof/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/sgs/prof/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ INCLIST= -I../common -I../../include -I../../include/$(MACH) CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-uninitialized LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
--- a/usr/src/cmd/sgs/unifdef/i386/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/sgs/unifdef/i386/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -33,7 +33,7 @@ DEFLIST= -DELF_OBJ -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-char-subscripts CERRWARN += -Wno-parentheses
--- a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs Mon Feb 05 08:52:36 2018 +0300 @@ -34,4 +34,4 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99)
--- a/usr/src/cmd/smbsrv/smbd/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/smbsrv/smbd/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -64,7 +64,7 @@ # Should not have to do this, but the Kerberos includes are a mess. CPPFLAGS += -I $(ROOT)/usr/include/kerberosv5 -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LDFLAGS += -R/usr/lib/smbsrv LDLIBS += -L$(ROOT)/usr/lib/smbsrv
--- a/usr/src/cmd/tail/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/tail/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -24,7 +24,7 @@ CLOBBERFILES= $(PROG) CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # install rules $(ROOTINC)/% : %
--- a/usr/src/cmd/th_tools/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/th_tools/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -29,7 +29,7 @@ include ../Makefile.cmd CFLAGS += -I$(SRC)/uts/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized
--- a/usr/src/cmd/tr/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/tr/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -24,7 +24,7 @@ CLOBBERFILES= $(PROG) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -D_ILLUMOS_PRIVATE -I. # install rules
--- a/usr/src/cmd/truss/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/truss/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ CERRWARN += -Wno-uninitialized CERRWARN += -Wno-switch -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lproc -lrtld_db -lc_db -lnvpair CPPFLAGS += -D_LARGEFILE64_SOURCE=1
--- a/usr/src/cmd/uuidgen/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/uuidgen/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -19,7 +19,7 @@ LDLIBS += -luuid -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/volcheck/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/volcheck/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(SRC)/cmd/rmvolmgr -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-switch CERRWARN += -Wno-unused-variable
--- a/usr/src/cmd/volrmmount/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/volrmmount/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(SRC)/cmd/rmvolmgr -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-switch CERRWARN += -Wno-unused-variable
--- a/usr/src/cmd/vscan/vscanadm/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/vscan/vscanadm/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -34,7 +34,7 @@ LDLIBS += -L$(ROOT)/usr/lib/vscan -lvscan LDFLAGS += -R/usr/lib/vscan -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/cmd/vscan/vscand/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/vscan/vscand/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -45,7 +45,7 @@ CERRWARN += -Wno-switch -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) MANIFEST = vscan.xml ROOTMANIFESTDIR= $(ROOTSVCSYSTEM)/filesystem
--- a/usr/src/cmd/zdb/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/zdb/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ LDLIBS += -lzpool -lumem -lnvpair -lzfs -lavl -lcmdutils -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -D_LARGEFILE64_SOURCE=1 $(INCS) -DDEBUG
--- a/usr/src/cmd/zfs/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/zfs/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -44,7 +44,7 @@ INCS += -I$(SRCTOP)/kernel/fs/zfs/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -D_LARGEFILE64_SOURCE=1 $(INCS) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
--- a/usr/src/cmd/zhack/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/zhack/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -42,7 +42,7 @@ LDLIBS += -lzpool -lumem -lnvpair -lzfs -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -DDEBUG $(INCS)
--- a/usr/src/cmd/zinject/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/zinject/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ LDLIBS += -lzpool -lzfs -lnvpair -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -D_LARGEFILE64_SOURCE=1 $(INCS)
--- a/usr/src/cmd/zlook/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/zlook/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -28,7 +28,7 @@ include ../../Makefile.cmd -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CFLAGS += -g CFLAGS64 += -g CPPFLAGS += -D_LARGEFILE64_SOURCE=1 $(INCS)
--- a/usr/src/cmd/zstreamdump/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/zstreamdump/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -35,7 +35,7 @@ LDLIBS += -lzfs -lnvpair -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -D_LARGEFILE64_SOURCE=1 $(INCS) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
--- a/usr/src/cmd/ztest/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/cmd/ztest/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ LDLIBS += -lumem -lzpool -lcmdutils -lm -lnvpair -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CFLAGS += -g CFLAGS64 += -g CPPFLAGS += -D_LARGEFILE64_SOURCE=1 $(INCS) -DDEBUG
--- a/usr/src/lib/fm/libfmd_snmp/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -44,7 +44,7 @@ SRCDIR = ../common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I../common -I. $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
--- a/usr/src/lib/fm/libfmevent/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/fm/libfmevent/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -51,7 +51,7 @@ SRCDIR = ../common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
--- a/usr/src/lib/fm/libfmnotify/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/fm/libfmnotify/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ SRCDIR = ../common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. CFLAGS += $(C_BIGPICFLAGS)
--- a/usr/src/lib/fm/topo/modules/Makefile.plugin Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin Mon Feb 05 08:52:36 2018 +0300 @@ -61,7 +61,7 @@ APIMAP = ../../../libtopo/common/topo_mod.map MAPFILES = # use APIMAP instead -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CC_PICFLAGS) CFLAGS += $(GSHARED) $(XREGSFLAG)
--- a/usr/src/lib/libads/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libads/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -31,7 +31,7 @@ include ../../Makefile.lib -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LIBS = $(DYNLIB) LDLIBS += -lc
--- a/usr/src/lib/libadutils/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libadutils/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -32,7 +32,7 @@ include ../../Makefile.lib -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LIBS = $(DYNLIB) LDLIBS += -lldap -lresolv -lc
--- a/usr/src/lib/libbe/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libbe/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -49,7 +49,7 @@ INCS += -I$(SRCDIR) -I$(SRC)/cmd/boot/common -I$(SRC)/common/ficl -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lficl-sys -lzfs -lzonecfg -luuid -lnvpair -lc -lgen -lefi CPPFLAGS += $(INCS)
--- a/usr/src/lib/libc/amd64/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libc/amd64/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -1122,7 +1122,7 @@ # Override this top level flag so the compiler builds in its native # C99 mode. This has been enabled to support the complex arithmetic # added to libc. -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # libc method of building an archive # The "$(GREP) -v ' L '" part is necessary only until
--- a/usr/src/lib/libc/i386/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libc/i386/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -1125,7 +1125,7 @@ # Override this top level flag so the compiler builds in its native # C99 mode. This has been enabled to support the complex arithmetic # added to libc. -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # libc method of building an archive # The "$(GREP) -v ' L '" part is necessary only until
--- a/usr/src/lib/libctf/Makefile.shared.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libctf/Makefile.shared.com Mon Feb 05 08:52:36 2018 +0300 @@ -74,7 +74,7 @@ LIBS = $(DYNLIB) LDLIBS += -lc -lelf $(LIBDWARF) -lavl -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) SRCDIR = $(SRC)/lib/libctf/common
--- a/usr/src/lib/libdisasm/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libdisasm/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -134,7 +134,7 @@ CFLAGS64_standalone = $(STAND_FLAGS_64) CFLAGS64 += $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) DYNFLAGS += $(ZINTERPOSE)
--- a/usr/src/lib/libdns_sd/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libdns_sd/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -35,7 +35,7 @@ LDLIBS += -lc -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRCDIR) -DNOT_HAVE_SA_LEN CPPFLAGS += -DMDNS_VERSIONSTR_NODTS
--- a/usr/src/lib/libfcoe/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libfcoe/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ INCS += -I$(SRCTOP)/include/sys/fcoe LDLIBS += -lc -ldladm -lscf -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += $(INCS) .KEEP_STATE:
--- a/usr/src/lib/libfdisk/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libfdisk/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ LIBS= $(DYNLIB) -C99MODE= $(C99_DISABLE) +CSTD= $(CSTD_GNU89) CPPFLAGS += -I. LDLIBS += -lc
--- a/usr/src/lib/libficl/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libficl/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -28,7 +28,7 @@ LIBS= $(DYNLIB) FICLDIR= $(SRC)/common/ficl -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I.. -I$(FICLDIR) -D_LARGEFILE64_SOURCE=1 # As variable "count" is marked volatile, gcc 4.4.4 will complain about
--- a/usr/src/lib/libidmap/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libidmap/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ idmap_xdr.o include ../../Makefile.lib -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LIBS = $(DYNLIB) LDLIBS += -lc -lavl -lnvpair -luutil
--- a/usr/src/lib/libilb/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libilb/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ SRCDIR = ../common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += $(INCS)
--- a/usr/src/lib/libinetsvc/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libinetsvc/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -34,7 +34,7 @@ SRCDIR = ../common -CFLAGS += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) CPPFLAGS += -I../common $(RELEASE_BUILD)CPPFLAGS += -DNDEBUG
--- a/usr/src/lib/libipmi/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libipmi/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -56,7 +56,7 @@ INCS += -I$(SRCDIR) LDLIBS += -lc -lm -lnvpair CPPFLAGS += $(INCS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -Wno-uninitialized
--- a/usr/src/lib/libiscsit/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libiscsit/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ INCS += -I$(SRCDIR) INCS += -I$(SRCTOP)/include -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lc -lnvpair -lstmf -luuid -lscf CPPFLAGS += $(INCS) CERRWARN += -Wno-parentheses
--- a/usr/src/lib/libm/Makefile.libm.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libm/Makefile.libm.com Mon Feb 05 08:52:36 2018 +0300 @@ -21,7 +21,7 @@ ASSUFFIX_i386 = s ASSUFFIX = $(ASSUFFIX_$(MACH)) -# With studio C99MODE of neither enabled nor disabled is "no_lib", whereby we +# With studio CSTD of neither enabled nor disabled is "no_lib", whereby we # expect C99-the-language, but don't modify the behaviour of library routines. # This is VERY IMPORTANT, as -std=gnu99, for instance, would link us with # values-xpg6, which would introduce an __xpg6 to our object with the C99 @@ -31,7 +31,7 @@ # We must then, unfortunately, defeat the GNU compiler _defaulting_ to C99, by # in that case setting it back to gnu89, which _also_ accepts C99 syntax as # far as is important. -C99MODE = +CSTD = CFLAGS += -std=gnu89 CFLAGS64 += -std=gnu89 @@ -51,7 +51,7 @@ # GCC needs __C99FEATURES__ such that the implementations of isunordered, # isgreaterequal, islessequal, etc, exist. This gets us the C99 language # features, but not values-xpg6, the reason for which is outlined with -# C99MODE. +# CSTD. CFLAGS += -D__C99FEATURES__ CFLAGS64 += -D__C99FEATURES__
--- a/usr/src/lib/libndmp/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libndmp/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -46,7 +46,7 @@ INCS += -I$(SRCDIR) INCS += -I$(SRC)/cmd/ndmpd/include -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LIBS= $(DYNLIB) LDLIBS += -lc -lscf CPPFLAGS += $(INCS)
--- a/usr/src/lib/libnvpair/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libnvpair/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -57,7 +57,7 @@ CERRWARN += -Wno-uninitialized -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/lib/libproc/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libproc/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -85,7 +85,7 @@ LIBS = $(DYNLIB) LDLIBS += -lrtld_db -lelf -lctf -lc -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += $($(MACH64)_CPPFLAGS) SRCDIR = ../common
--- a/usr/src/lib/libresolv/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libresolv/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -47,7 +47,7 @@ SRCDIR = . -C99MODE= $(C99_DISABLE) +CSTD= $(CSTD_GNU89) # We really want to say this: # CPPFLAGS += -DDEBUG -DSYSV -I. -I../common/inc
--- a/usr/src/lib/librestart/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/librestart/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ SRCDIR = ../common -CFLAGS += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) CPPFLAGS +=
--- a/usr/src/lib/libsaveargs/tests/dump/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libsaveargs/tests/dump/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -25,7 +25,7 @@ LDLIBS64 += -lctf -lelf -lsaveargs -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) $(PROG): $(OBJECTS) $(LINK.c) -o $@ $(OBJECTS) $(LDLIBS64)
--- a/usr/src/lib/libscf/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libscf/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -51,7 +51,7 @@ COMDIR = ../../../common/svc -CFLAGS += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) CPPFLAGS += -I../inc -I../../common/inc -I$(COMDIR) -I$(ROOTHDRDIR) $(NOT_RELEASE_BUILD) CPPFLAGS += -DFASTREBOOT_DEBUG
--- a/usr/src/lib/libshare/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libshare/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ LDLIBS += -lc -lscf -lzfs -luuid -lxml2 -lnvpair #add nfs/lib directory as part of the include path -C99MODE += $(C99_ENABLE) +CSTD += $(CSTD_GNU99) CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized CERRWARN += -Wno-switch
--- a/usr/src/lib/libsmbfs/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libsmbfs/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -90,7 +90,7 @@ SRCS= $(OBJ_LIB:%.o=$(SRCDIR)/%.c) \ $(OBJ_CMN:%.o=$(CMNDIR)/%.c) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lc -lmd -lpkcs11 -lkrb5 -lsec -lidmap
--- a/usr/src/lib/libsrpt/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libsrpt/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ INCS += -I$(SRCDIR) -I$(SRPTMODDIR) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LDLIBS += -lc -lnvpair -lstmf CPPFLAGS += $(INCS)
--- a/usr/src/lib/libstmf/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libstmf/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ INCS += -I$(SRCDIR) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lc -lnvpair -lscf -lm CPPFLAGS += $(INCS)
--- a/usr/src/lib/libvrrpadm/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libvrrpadm/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -39,7 +39,7 @@ CPPFLAGS += -I$(SRCDIR) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE:
--- a/usr/src/lib/libzfs/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libzfs/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -68,7 +68,7 @@ INCS += -I$(SRCTOP)/kernel/fs/zfs/common INCS += -I../../libc/inc -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lc -lm -ldevid -lgen -lnvpair -luutil -lavl -lefi \ -ladm -lidmap -lmd -lumem -lzfs_core -lz -lcmdutils CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1
--- a/usr/src/lib/libzfs_core/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libzfs_core/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -47,7 +47,7 @@ INCS += -I$(SRCTOP)/kernel/fs/zfs/common INCS += -I../../libc/inc -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lc -lnvpair CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
--- a/usr/src/lib/libzpool/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/libzpool/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -59,7 +59,7 @@ CLEANFILES += ../common/zfs.h CLEANFILES += $(EXTPICS) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) $(LIBS): ../common/zfs.h
--- a/usr/src/lib/nsswitch/mdns/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/nsswitch/mdns/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -35,6 +35,6 @@ # include common nsswitch library definitions. include ../../Makefile.com -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LDLIBS += -ldns_sd -lscf DYNLIB1 = nss_mdns.so$(VERS)
--- a/usr/src/lib/policykit/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/policykit/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -31,7 +31,7 @@ CERRWARN += -Wno-unused-variable CERRWARN += -Wno-unused-function -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTLIBPCDIR = $(ROOT)/usr/lib/pkgconfig ROOTLIBPC = $(LIBPCSRC:%=$(ROOTLIBPCDIR)/%)
--- a/usr/src/lib/pylibbe/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/pylibbe/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -38,7 +38,7 @@ PYFILES= $(PYSRCS) ROOTPYBEFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LIBS = $(DYNLIB) LDLIBS += -lbe -lnvpair -lc
--- a/usr/src/lib/scsi/libscsi/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/scsi/libscsi/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -37,7 +37,7 @@ include ../../Makefile.defs SRCS = $(OBJECTS:%.o=../common/%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
--- a/usr/src/lib/scsi/libses/Makefile.defs Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/scsi/libses/Makefile.defs Mon Feb 05 08:52:36 2018 +0300 @@ -24,7 +24,7 @@ # SRCS = $(OBJECTS:%.o=../common/%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
--- a/usr/src/lib/scsi/libsmp/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/scsi/libsmp/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -36,7 +36,7 @@ include ../../Makefile.defs SRCS = $(OBJECTS:%.o=../common/%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
--- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine Mon Feb 05 08:52:36 2018 +0300 @@ -56,7 +56,7 @@ APIMAP = ../../../../../libscsi/libscsi_api.map -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CC_PICFLAGS) CFLAGS += $(GSHARED) $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CC_PICFLAGS)
--- a/usr/src/lib/scsi/plugins/ses/Makefile.lib Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/scsi/plugins/ses/Makefile.lib Mon Feb 05 08:52:36 2018 +0300 @@ -66,7 +66,7 @@ APIMAP = ../../../../libses/libses_api.map -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CC_PICFLAGS) CFLAGS += $(GSHARED) $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CC_PICFLAGS)
--- a/usr/src/lib/scsi/plugins/smp/Makefile.lib Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/scsi/plugins/smp/Makefile.lib Mon Feb 05 08:52:36 2018 +0300 @@ -64,7 +64,7 @@ APIMAP = ../../../../libsmp/libsmp_api.map -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CC_PICFLAGS) CFLAGS += $(GSHARED) $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CC_PICFLAGS)
--- a/usr/src/lib/smbsrv/Makefile.lib Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/lib/smbsrv/Makefile.lib Mon Feb 05 08:52:36 2018 +0300 @@ -40,7 +40,7 @@ SRCDIR= ../common NDLDIR= $(ROOT)/usr/include/smbsrv/ndl LIBS= $(DYNLIB) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRCDIR) -I. LDLIBS32 += -L$(ROOT)/usr/lib/smbsrv LDLIBS64 += -L$(ROOT)/usr/lib/smbsrv/$(MACH64)
--- a/usr/src/psm/stand/bootlst/common/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/psm/stand/bootlst/common/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -55,8 +55,8 @@ CPPFLAGS = $(CPPDEFS) $(CPPINCS) CPPFLAGS += $(CCYFLAG) -I$(STANDDIR) -C99MODE = $(C99_ENABLE) -CFLAGS = -O $(C99MODE) +CSTD = $(CSTD_GNU99) +CFLAGS = -O $(CSTD) ASFLAGS = -D_ASM $(CPPDEFS) -DLOCORE -D_LOCORE AS_CPPFLAGS = $(CPPINCS) $(CPPFLAGS.master)
--- a/usr/src/psm/stand/cpr/common/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/psm/stand/cpr/common/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -61,8 +61,8 @@ CPPFLAGS = $(CPPDEFS) $(CPPINCS) $(CPPFLAGS.master) CPPFLAGS += $(CCYFLAG) -I$(SYSDIR)/common -C99MODE = $(C99_ENABLE) -CFLAGS = -O $(C99MODE) +CSTD = $(CSTD_GNU99) +CFLAGS = -O $(CSTD) ASFLAGS = -D_ASM $(CPPDEFS) -DLOCORE -D_LOCORE AS_CPPFLAGS = $(CPPINCS) $(CPPFLAGS.master)
--- a/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs Mon Feb 05 08:52:36 2018 +0300 @@ -32,7 +32,7 @@ SRCS = $(OBJS:%.o=%.c) PKCSLIBS = -lpkcs11 -lcryptoutil -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CMDS = $(TESTDIR:%=%/$(PROG)) $(CMDS) := FILEMODE = 0555
--- a/usr/src/test/libc-tests/tests/Makefile.com Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/libc-tests/tests/Makefile.com Mon Feb 05 08:52:36 2018 +0300 @@ -27,7 +27,7 @@ $(OBJS_OVERRIDE)SRCS = $(PROG).c ../common/test_common.c -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(ROOT)/usr/include -I../common ROOTOPTPKG = $(ROOT)/opt/libc-tests
--- a/usr/src/test/libc-tests/tests/select/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/libc-tests/tests/select/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -22,7 +22,7 @@ PROGS= select_test -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) select_test: select_test.c $(LINK64.c) -o $@ select_test.c $(LDLIBS64)
--- a/usr/src/test/os-tests/tests/file-locking/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/os-tests/tests/file-locking/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -22,7 +22,7 @@ runtests \ acquire-lock -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) SRCS = $(PROGS:%=%.c) $(UTILS:%.o=%.c) PROGS32 = $(PROGS:%=%.32)
--- a/usr/src/test/os-tests/tests/i386/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/os-tests/tests/i386/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -22,7 +22,7 @@ TESTDIR = $(ROOTOPTPKG)/tests/i386 ROOTOPTPROGS = $(PROGS:%=$(TESTDIR)/%) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # for badseg COPTFLAG =
--- a/usr/src/test/os-tests/tests/poll/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/os-tests/tests/poll/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -21,7 +21,7 @@ OBJS = $(PROG:%=%.o) SRCS = $(OBJS:%.o=%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTOPTPKG = $(ROOT)/opt/os-tests TESTDIR = $(ROOTOPTPKG)/tests
--- a/usr/src/test/os-tests/tests/sigqueue/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/os-tests/tests/sigqueue/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -21,7 +21,7 @@ OBJS = $(PROG:%=%.o) SRCS = $(OBJS:%.o=%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTOPTPKG = $(ROOT)/opt/os-tests TESTDIR = $(ROOTOPTPKG)/tests/sigqueue
--- a/usr/src/test/os-tests/tests/sockfs/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/os-tests/tests/sockfs/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -19,7 +19,7 @@ PROG = conn dgram drop_priv nosignal sockpair -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ nosignal := LDLIBS += -lnsl
--- a/usr/src/test/os-tests/tests/spoof-ras/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/os-tests/tests/spoof-ras/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -20,7 +20,7 @@ OBJS = $(PROG:%=%.o) SRCS = $(OBJS:%.o=%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTOPTPKG = $(ROOT)/opt/os-tests TESTDIR = $(ROOTOPTPKG)/tests
--- a/usr/src/test/zfs-tests/cmd/Makefile.subdirs Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/zfs-tests/cmd/Makefile.subdirs Mon Feb 05 08:52:36 2018 +0300 @@ -24,7 +24,7 @@ CMDS = $(PROG:%=$(ROOTBIN)/%) $(CMDS) := FILEMODE = 0555 -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 all: $(PROG)
--- a/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs Mon Feb 05 08:52:36 2018 +0300 @@ -26,7 +26,7 @@ CMDS = $(CMD32) $(CMD64) $(CMDS) := FILEMODE = 0555 -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += -I $(SRC)/uts/common -D_KERNEL LDLIBS += -lmd
--- a/usr/src/tools/btxld/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/tools/btxld/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -27,7 +27,7 @@ SRCS= btxld.c elfh.c version.c $(UTILS_SRC) $(EINFO_SRC) $(EXTRA_SRC) OBJS= btxld.o elfh.o version.o bblk_einfo.o mboot_extra.o boot_utils.o LDLIBS += -lmd5 -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I$(COMMON_SRC) -idirafter $(SRCTOP)/include $(ROOTONBLDMAN1ONBLDFILES) := FILEMODE= 644
--- a/usr/src/uts/Makefile.uts Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/Makefile.uts Mon Feb 05 08:52:36 2018 +0300 @@ -175,7 +175,7 @@ $(RELEASE_BUILD)CERRWARN += -Wno-unused $(RELEASE_BUILD)CERRWARN += -Wno-empty-body -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS_uts = CFLAGS_uts += $(STAND_FLAGS_$(CLASS))
--- a/usr/src/uts/common/fs/zut/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/common/fs/zut/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -60,7 +60,7 @@ INC_PATH += -I$(SRC)/common INC_PATH += -I$(COMMONBASE)/zut -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # # For now, disable these compiler warnings; maintainers should endeavor to
--- a/usr/src/uts/common/io/fibre-channel/fca/qlge/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/common/io/fibre-channel/fca/qlge/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -59,7 +59,7 @@ LDFLAGS += -dy -Nmisc/mac -Ndrv/ip -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -Wno-switch CERRWARN += -Wno-uninitialized
--- a/usr/src/uts/i86pc/Makefile.rules Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/i86pc/Makefile.rules Mon Feb 05 08:52:36 2018 +0300 @@ -230,7 +230,7 @@ DBOOT_MACH_64 = -D_BOOT_TARGET_amd64 DBOOT_DEFS = -D_BOOT $(DBOOT_MACH_$(CLASS)) DBOOT_DEFS += -D_MACHDEP -U_KERNEL -D_I32LPx -DBOOT_FLAGS = $(C99MODE) $(CERRWARN) $(CCNOAUTOINLINE) +DBOOT_FLAGS = $(CSTD) $(CERRWARN) $(CCNOAUTOINLINE) DBOOT_CC_INCL = -I$(SRC)/common -I$(SRC)/common/util $(INCLUDE_PATH) \ -I$(SRCTOP)/arch/x86/kernel/dboot
--- a/usr/src/uts/intel/bfe/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/intel/bfe/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -64,7 +64,7 @@ CPPFLAGS += $(VFLAGS) $(AFLAGS) $(DFLAGS) $(CFGFLAGS) \ -I$(UTSBASE)/common/io/bfe -CFLAGS += $(CPPFLAGS) $(C99_ENABLE) +CFLAGS += $(CPPFLAGS) $(CSTD_GNU99) CERRWARN += -Wno-switch CERRWARN += -Wno-uninitialized
--- a/usr/src/uts/intel/cxgbe/cxgbe/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/intel/cxgbe/cxgbe/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -43,7 +43,7 @@ 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 += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) # # Driver depends
--- a/usr/src/uts/intel/cxgbe/t4nex/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/intel/cxgbe/t4nex/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -46,7 +46,7 @@ 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 += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) # # Driver depends
--- a/usr/src/uts/intel/dca/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/intel/dca/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -57,7 +57,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE) # C99 mode is needed for dca -CFLAGS += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) # # For now, disable these compiler warnings; maintainers should endeavor to
--- a/usr/src/uts/intel/nsmb/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/intel/nsmb/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -85,7 +85,7 @@ MODSTUBS_DIR = $(OBJS_DIR) $(MODSTUBS_O) := AS_CPPFLAGS += -DNSMB_MODULE CLEANFILES += $(MODSTUBS_O) $(IOC_CHECK_H) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) INC_PATH += -I$(UTSBASE)/common/fs/smbclnt LDFLAGS += -dy -Ncrypto/md4 -Ncrypto/md5 -Nmisc/tlimod
--- a/usr/src/uts/intel/smbfs/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/intel/smbfs/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -59,7 +59,7 @@ MODSTUBS_DIR = $(OBJS_DIR) $(MODSTUBS_O) := AS_CPPFLAGS += -DSMBFS_MODULE CLEANFILES += $(MODSTUBS_O) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) INC_PATH += -I$(UTSBASE)/common/fs/smbclnt INC_PATH += -I$(COMMONBASE)/smbclnt LDFLAGS += -dy -Ndrv/nsmb
--- a/usr/src/uts/intel/xge/Makefile Fri Jan 11 10:21:14 2019 -0500 +++ b/usr/src/uts/intel/xge/Makefile Mon Feb 05 08:52:36 2018 +0300 @@ -88,13 +88,13 @@ CFLAGS += -fno-unit-at-a-time CFLAGS += -fno-optimize-sibling-calls CFLAGS += -O2 -CFLAGS += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) CFLAGS64 += $(XGE_CFLAGS) CFLAGS64 += -fno-strict-aliasing CFLAGS64 += -fno-unit-at-a-time CFLAGS64 += -fno-optimize-sibling-calls CFLAGS64 += -O2 -CFLAGS64 += $(C99_ENABLE) +CFLAGS64 += $(CSTD_GNU99) # # Driver depends on MAC & IP