diff options
| author | Yuri Pankov <yuri.pankov@nexenta.com> | 2018-02-05 08:52:36 +0300 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@joyent.com> | 2018-02-06 14:27:39 +0100 |
| commit | bd0ce624be4492bab2f6c53383a40618647aba28 (patch) | |
| tree | abf4de26cdc58c35712e9b10380643e048498772 /usr/src | |
| parent | 9a67df4bb0ad84bdbd1a1441f5ddef328cc000f0 (diff) | |
| download | illumos-joyent-bd0ce624be4492bab2f6c53383a40618647aba28.tar.gz | |
9027 Makefiles need to specify C99 mode consistently
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
Diffstat (limited to 'usr/src')
235 files changed, 228 insertions, 307 deletions
diff --git a/usr/src/Makefile.ast b/usr/src/Makefile.ast index 4dda28afa2..1a85c1c7e7 100644 --- a/usr/src/Makefile.ast +++ b/usr/src/Makefile.ast @@ -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 # silence common AST&co. warnings... # ... about |#pragma prototyped| ... diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 67d57a47c8..da65c79fc4 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -406,11 +406,11 @@ $(RELEASE_BUILD)CERRWARN += -_gcc=-Wno-empty-body # turn warnings into errors (C++) CCERRWARN= -xwe -# C99 mode -C99_ENABLE= -xc99=%all -C99_DISABLE= -xc99=%none -C99MODE= $(C99_DISABLE) -C99LMODE= $(C99MODE:-xc99%=-Xc99%) +# C standard. Keep Studio flags until we get rid of lint. +CSTD_GNU89= -xc99=%none +CSTD_GNU99= -xc99=%all +CSTD= $(CSTD_GNU89) +C99LMODE= $(CSTD:-xc99%=-Xc99%) # In most places, assignments to these macros should be appended with += # (CPPFLAGS.first allows values to be prepended to CPPFLAGS). @@ -460,8 +460,8 @@ DEBUGFORMAT= -xdebugformat=stabs # 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) $(CNOGLOBAL) $(CDWARFSTR) -CTF_FLAGS_i386 = -g $(C99MODE) $(CNOGLOBAL) $(CDWARFSTR) +CTF_FLAGS_sparc = -g -Wc,-Qiselect-T1 $(CSTD) $(CNOGLOBAL) $(CDWARFSTR) +CTF_FLAGS_i386 = -g $(CSTD) $(CNOGLOBAL) $(CDWARFSTR) CTF_FLAGS_sparcv9 = $(CTF_FLAGS_sparc) CTF_FLAGS_amd64 = $(CTF_FLAGS_i386) @@ -543,11 +543,11 @@ $(SRCDBGBLD)CSOURCEDEBUGFLAGS = -g -xs $(SRCDBGBLD)CCSOURCEDEBUGFLAGS = -g -xs CFLAGS= $(COPTFLAG) $($(MACH)_CFLAGS) $(SPACEFLAG) $(CCMODE) \ - $(ILDOFF) $(CERRWARN) $(C99MODE) $(CCUNBOUND) $(IROPTFLAG) \ + $(ILDOFF) $(CERRWARN) $(CSTD) $(CCUNBOUND) $(IROPTFLAG) \ $(CGLOBALSTATIC) $(CCNOAUTOINLINE) $(CSOURCEDEBUGFLAGS) \ $(CUSERFLAGS) CFLAGS64= $(COPTFLAG64) $($(MACH64)_CFLAGS) $(SPACEFLAG64) $(CCMODE64) \ - $(ILDOFF) $(CERRWARN) $(C99MODE) $(CCUNBOUND) $(IROPTFLAG64) \ + $(ILDOFF) $(CERRWARN) $(CSTD) $(CCUNBOUND) $(IROPTFLAG64) \ $(CGLOBALSTATIC) $(CCNOAUTOINLINE) $(CSOURCEDEBUGFLAGS) \ $(CUSERFLAGS64) # @@ -555,7 +555,7 @@ CFLAGS64= $(COPTFLAG64) $($(MACH64)_CFLAGS) $(SPACEFLAG64) $(CCMODE64) \ # run on the build machine (also known as the NATIVE_BUILD). # NATIVE_CFLAGS= $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \ - $(ILDOFF) $(CERRWARN) $(C99MODE) $($(NATIVE_MACH)_CCUNBOUND) \ + $(ILDOFF) $(CERRWARN) $(CSTD) $($(NATIVE_MACH)_CCUNBOUND) \ $(IROPTFLAG) $(CGLOBALSTATIC) $(CCNOAUTOINLINE) \ $(CSOURCEDEBUGFLAGS) $(CUSERFLAGS) diff --git a/usr/src/cmd/boot/bootadm/Makefile b/usr/src/cmd/boot/bootadm/Makefile index ad060b375c..b25c45ce04 100644 --- a/usr/src/cmd/boot/bootadm/Makefile +++ b/usr/src/cmd/boot/bootadm/Makefile @@ -51,7 +51,7 @@ CFLAGS += $(XSTRCONST) CPPFLAGS += -D_FILE_OFFSET_BITS=64 CPPFLAGS += -I$(SRC)/uts/common -I$(SRC)/common -I$(SRC)/common/ficl -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += -erroff=E_INCONS_ARG_DECL2 LINTFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2 diff --git a/usr/src/cmd/boot/installboot/Makefile.com b/usr/src/cmd/boot/installboot/Makefile.com index 566e48c42a..1cd8454078 100644 --- a/usr/src/cmd/boot/installboot/Makefile.com +++ b/usr/src/cmd/boot/installboot/Makefile.com @@ -37,7 +37,7 @@ CPPFLAGS += -I$(SRC)/uts/common LDLIBS += -lmd5 -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN diff --git a/usr/src/cmd/boot/installgrub/Makefile b/usr/src/cmd/boot/installgrub/Makefile index 56dfeac536..3269e7d7ef 100644 --- a/usr/src/cmd/boot/installgrub/Makefile +++ b/usr/src/cmd/boot/installgrub/Makefile @@ -55,7 +55,7 @@ LINTFLAGS += \ -xerroff=E_NAME_DEF_NOT_USED2 -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile index 293a4f5976..24028e7f42 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile @@ -23,7 +23,7 @@ include ../../Makefile.cmd-inet OBJS= ClientCommon.o dns-sd.o SRCS= ClientCommon.c dns-sd.c -CFLAGS += $(C99_ENABLE) +CFLAGS += $(CSTD_GNU99) CPPFLAGS += -DMDNS_VERSIONSTR_NODTS LDLIBS += -lsocket -ldns_sd diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile index d00653d4eb..2648c7cf05 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile @@ -53,7 +53,7 @@ CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-unused-label -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) # I18n POFILE = $(ILBD).po diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile index 7f08f59b90..f28c630ac3 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile @@ -36,7 +36,7 @@ ROOTCMDDIR = $(ROOT)/lib/inet 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 diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile index 128bb637b4..e110c4ef48 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile @@ -68,7 +68,7 @@ $(PROG): $(OBJS) include ../Makefile.lib -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -D_REENTRANT $(MDNSFLAGS) -I$(CMN_DIR) LDLIBS += -lsocket -lnsl diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile index 12a621d55f..0039ea5f6a 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/Makefile @@ -37,7 +37,7 @@ $(ROOTETC)/inet/$(CFGFILES):= FILEMODE= 644 $(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 diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile index b9307b48cc..5b2f2eb275 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile @@ -39,7 +39,7 @@ CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) POFILES = $(OBJS:%.o=%.po) POFILE = $(PROG)_all.po diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile index a15c3fce80..cb0ca92b43 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipmpstat/Makefile @@ -28,7 +28,7 @@ ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%) include $(SRC)/cmd/Makefile.cmd -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized LDLIBS += -lipmp -lsocket -lsysevent -lnvpair -lofmt XGETFLAGS += -a -x $(PROG).xcl diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile index 9724fff4e5..905f389570 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile @@ -41,7 +41,7 @@ LDLIBS += -lxnet -lsocket -lnsl -lm -linetutil # These #defines are required to use SUSv3 interfaces CPPFLAGS += -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) # Setting the above defines to use the UNIX98 ancillary data feature # causes lint to output warnings about lint library declarations conflicting diff --git a/usr/src/cmd/coreadm/Makefile b/usr/src/cmd/coreadm/Makefile index 390212d227..38ac91763a 100644 --- a/usr/src/cmd/coreadm/Makefile +++ b/usr/src/cmd/coreadm/Makefile @@ -34,7 +34,7 @@ ROOTMANIFESTDIR= $(ROOTSVCSYSTEM) CFLAGS += $(CCVERBOSE) LDLIBS += -lproc -lscf -C99MODE=$(C99_ENABLE) +CSTD=$(CSTD_GNU99) all: $(PROG) diff --git a/usr/src/cmd/diskinfo/Makefile b/usr/src/cmd/diskinfo/Makefile index daee372303..10cda55ca7 100644 --- a/usr/src/cmd/diskinfo/Makefile +++ b/usr/src/cmd/diskinfo/Makefile @@ -20,7 +20,7 @@ SRCS= $(OBJS:%.o=%.c) include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/Makefile.ctf -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/lib/fm/topo diff --git a/usr/src/cmd/fm/notify/smtp-notify/Makefile.com b/usr/src/cmd/fm/notify/smtp-notify/Makefile.com index d8861ea62b..2d27ca3387 100644 --- a/usr/src/cmd/fm/notify/smtp-notify/Makefile.com +++ b/usr/src/cmd/fm/notify/smtp-notify/Makefile.com @@ -45,7 +45,7 @@ $(ROOTNOTIFYPARAMS) := FILEMODE = 0444 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I../../../../../lib/fm/libfmnotify/common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) LDLIBS += -L$(ROOT)/usr/lib/fm -lnvpair -lfmevent -lfmd_msg -lfmnotify \ -lumem diff --git a/usr/src/cmd/fm/notify/snmp-notify/Makefile.com b/usr/src/cmd/fm/notify/snmp-notify/Makefile.com index 13c78c7ea2..03905b1c76 100644 --- a/usr/src/cmd/fm/notify/snmp-notify/Makefile.com +++ b/usr/src/cmd/fm/notify/snmp-notify/Makefile.com @@ -43,7 +43,7 @@ $(ROOTNOTIFYPARAMS) := FILEMODE = 0444 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -I. -I../common -I../../../../../lib/fm/libfmnotify/common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) LDLIBS += -L$(ROOT)/usr/lib/fm -lnvpair -lfmevent -lfmd_msg -lfmnotify \ -lumem -lnetsnmp -lnetsnmpagent diff --git a/usr/src/cmd/fs.d/nfs/lockd/Makefile b/usr/src/cmd/fs.d/nfs/lockd/Makefile index ce725cd336..19c459d9f5 100644 --- a/usr/src/cmd/fs.d/nfs/lockd/Makefile +++ b/usr/src/cmd/fs.d/nfs/lockd/Makefile @@ -38,7 +38,7 @@ SRCS = $(LOCAL:%.o=%.c) ../lib/daemon.c ../lib/nfs_tbind.c \ ../lib/smfcfg.c ../lib/thrpool.c LDLIBS += -lnsl -lscf CPPFLAGS += -I../lib -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch diff --git a/usr/src/cmd/fs.d/reparsed/Makefile b/usr/src/cmd/fs.d/reparsed/Makefile index e61d7140f4..ed38b26723 100644 --- a/usr/src/cmd/fs.d/reparsed/Makefile +++ b/usr/src/cmd/fs.d/reparsed/Makefile @@ -38,7 +38,7 @@ CLOBBERFILES += $(TYPEPROG) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lreparse -lnsl diff --git a/usr/src/cmd/fs.d/smbclnt/chacl/Makefile b/usr/src/cmd/fs.d/smbclnt/chacl/Makefile index 52a9d04112..f3aabe62a4 100644 --- a/usr/src/cmd/fs.d/smbclnt/chacl/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/chacl/Makefile @@ -37,7 +37,7 @@ LDLIBS += -lsmbfs -lsec CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLOBBERFILES += $(LIBPROG) diff --git a/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile b/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile index fad9235ecd..3442d7a786 100644 --- a/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/lsacl/Makefile @@ -36,7 +36,7 @@ LDLIBS += -lsmbfs -lsec CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLOBBERFILES += $(LIBPROG) diff --git a/usr/src/cmd/fs.d/smbclnt/mount/Makefile b/usr/src/cmd/fs.d/smbclnt/mount/Makefile index 0124840e23..8f61e99026 100644 --- a/usr/src/cmd/fs.d/smbclnt/mount/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/mount/Makefile @@ -43,7 +43,7 @@ $(ROOTLIBFSTYPE)/mount := FILEMODE= 04555 CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lsmbfs diff --git a/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile b/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile index 29155e44f8..a5dbf68bd9 100644 --- a/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile @@ -37,7 +37,7 @@ SRCS= $(TYPEPROG).c POFILE= $(TYPEPROG).po CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/lib/libsmbfs \ -I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common diff --git a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile index f54d107d49..7acbf30f86 100644 --- a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile @@ -37,7 +37,7 @@ SRCS= $(TYPEPROG).c POFILE= $(TYPEPROG).po CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) # This is a multi-thread program but Nevada # no longer needs -lthread diff --git a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile index 31d52961fe..5b751cce22 100644 --- a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile @@ -39,7 +39,7 @@ POFILE= smbutil_all.po POFILES= $(OBJS:%.o=%.po) CLOBBERFILES+= $(POFILE) $(POFILES) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lsmbfs -lnsl diff --git a/usr/src/cmd/fs.d/smbclnt/test/Makefile b/usr/src/cmd/fs.d/smbclnt/test/Makefile index 62eb716f5f..64b626f5a4 100644 --- a/usr/src/cmd/fs.d/smbclnt/test/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/test/Makefile @@ -49,7 +49,7 @@ LINTLIBS= -L$(ROOTLIB) -lsmbfs CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2 diff --git a/usr/src/cmd/getconf/Makefile b/usr/src/cmd/getconf/Makefile index 6293596e58..8d5bc7041a 100644 --- a/usr/src/cmd/getconf/Makefile +++ b/usr/src/cmd/getconf/Makefile @@ -43,7 +43,7 @@ $(XPG4) := CFLAGS += -D_XOPEN_SOURCE -I$(SRC)/lib/libc/inc # XPG6MODE: Depending on the version of the compiler, the value of # __STDC_VERSION__ may differ even in the presence of the same compilation # options. The default compilation mode for Sun compilers that support the -# C99 standard is -xc99=all,no_lib. C99MODE= is equivalent to -xc99=all,no_lib. +# C99 standard is -xc99=all,no_lib. CSTD= is equivalent to -xc99=all,no_lib. # This translates to C99 semantics without the C99 library specific behaviors # and dependencies. # @@ -53,8 +53,8 @@ $(XPG4) := CFLAGS += -D_XOPEN_SOURCE -I$(SRC)/lib/libc/inc # maintain source compatibility. Neither of these cases results in the # importing of /usr/lib/values-xpg6.o, so we need to either manually import # it via linking with a local version of the object, or set -xc99=%all which -# by default imports /usr/lib/values-xpg6.o. C99MODE=C99_ENABLE is equivalent -# to -xc99=all. If C99_ENABLE is defined and we also attempt to link with a +# by default imports /usr/lib/values-xpg6.o. CSTD=CSTD_GNU99 is equivalent +# to -xc99=all. If CSTD_GNU99 is defined and we also attempt to link with a # local version of values-xpg6.o, an error will occur due to multiple # definitions for __xpg4 and __xpg6. Because /usr/lib/values-xpg6.o was # delivered in Solaris 10 and is a stable interface, there is no need to @@ -66,8 +66,8 @@ $(XPG4) := CFLAGS += -D_XOPEN_SOURCE -I$(SRC)/lib/libc/inc # the compiler only imports this by default (from /usr/lib/values-xpg4.o) # if we use the c89 utility as opposed to cc. -XPG6MODE = $(C99_ENABLE) -$(XPG6) := C99MODE = $(XPG6MODE) +XPG6MODE = $(CSTD_GNU99) +$(XPG6) := CSTD = $(XPG6MODE) $(XPG6) := CFLAGS += -D_XOPEN_SOURCE=600 -I$(SRC)/lib/libc/inc .KEEP_STATE: diff --git a/usr/src/cmd/hal/addons/acpi/Makefile b/usr/src/cmd/hal/addons/acpi/Makefile index daf306a758..e66764495c 100644 --- a/usr/src/cmd/hal/addons/acpi/Makefile +++ b/usr/src/cmd/hal/addons/acpi/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-addon-acpi OBJS = addon-acpi.o logger.o util_helper.o acpi.o util_pm.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 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: diff --git a/usr/src/cmd/hal/addons/cpufreq/Makefile b/usr/src/cmd/hal/addons/cpufreq/Makefile index b631fbf33b..1fdf1ad83c 100644 --- a/usr/src/cmd/hal/addons/cpufreq/Makefile +++ b/usr/src/cmd/hal/addons/cpufreq/Makefile @@ -23,8 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# PROG = hald-addon-cpufreq OBJS = addon-cpufreq.o logger.o adt_data.o @@ -40,7 +38,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 -ldbus-glib-1 -lpolkit -lbsm 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: diff --git a/usr/src/cmd/hal/addons/network-devices/Makefile b/usr/src/cmd/hal/addons/network-devices/Makefile index 4d29e23981..3ac146e39e 100644 --- a/usr/src/cmd/hal/addons/network-devices/Makefile +++ b/usr/src/cmd/hal/addons/network-devices/Makefile @@ -45,7 +45,7 @@ LDLIBS += $(ZIGNORE) -lnetsnmp 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: diff --git a/usr/src/cmd/hal/addons/storage/Makefile b/usr/src/cmd/hal/addons/storage/Makefile index e7d4797dc9..f5aa0fbbf5 100644 --- a/usr/src/cmd/hal/addons/storage/Makefile +++ b/usr/src/cmd/hal/addons/storage/Makefile @@ -36,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lnvpair -lsysevent CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/hald-runner/Makefile b/usr/src/cmd/hal/hald-runner/Makefile index f52bb65346..9f283d9468 100644 --- a/usr/src/cmd/hal/hald-runner/Makefile +++ b/usr/src/cmd/hal/hald-runner/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-runner OBJS = main.o runner.o utils.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -ldbus-glib-1 -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -UDBUS_API_SUBJECT_TO_CHANGE -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/hald/Makefile b/usr/src/cmd/hal/hald/Makefile index 9352dd5e56..e61790e3e5 100644 --- a/usr/src/cmd/hal/hald/Makefile +++ b/usr/src/cmd/hal/hald/Makefile @@ -46,7 +46,7 @@ LDLIBS += -lc -lm -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lgobject-2.0 \ 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 diff --git a/usr/src/cmd/hal/hald/solaris/Makefile b/usr/src/cmd/hal/hald/solaris/Makefile index f4513b315b..b7e0d59252 100644 --- a/usr/src/cmd/hal/hald/solaris/Makefile +++ b/usr/src/cmd/hal/hald/solaris/Makefile @@ -40,7 +40,7 @@ $(ROOTMANIFEST) := FILEMODE = 444 $(ROOTLIBSVCMETHOD)/svc-hal:= FILEMODE = 555 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/acpi/Makefile b/usr/src/cmd/hal/probing/acpi/Makefile index 2bfd38d014..69190994c3 100644 --- a/usr/src/cmd/hal/probing/acpi/Makefile +++ b/usr/src/cmd/hal/probing/acpi/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-acpi OBJS = probe-acpi.o logger.o acpi.o util_pm.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 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: diff --git a/usr/src/cmd/hal/probing/network-printer/Makefile b/usr/src/cmd/hal/probing/network-printer/Makefile index 80c2e6d034..f2227ec9e8 100644 --- a/usr/src/cmd/hal/probing/network-printer/Makefile +++ b/usr/src/cmd/hal/probing/network-printer/Makefile @@ -38,7 +38,7 @@ LDLIBS += $(ZIGNORE) -lnetsnmp 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: diff --git a/usr/src/cmd/hal/probing/printer/Makefile b/usr/src/cmd/hal/probing/printer/Makefile index 26903c5959..9954375a62 100644 --- a/usr/src/cmd/hal/probing/printer/Makefile +++ b/usr/src/cmd/hal/probing/printer/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-printer OBJS = probe-printer.o logger.o printer.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal 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: diff --git a/usr/src/cmd/hal/probing/storage/Makefile b/usr/src/cmd/hal/probing/storage/Makefile index 76450e1743..8b886d4c07 100644 --- a/usr/src/cmd/hal/probing/storage/Makefile +++ b/usr/src/cmd/hal/probing/storage/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-storage OBJS = probe-storage.o cdutils.o fsutils.o logger.o @@ -39,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal -ladm -lefi 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: diff --git a/usr/src/cmd/hal/probing/volume/Makefile b/usr/src/cmd/hal/probing/volume/Makefile index a9cd36186b..25ee9ea016 100644 --- a/usr/src/cmd/hal/probing/volume/Makefile +++ b/usr/src/cmd/hal/probing/volume/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-volume OBJS = probe-volume.o cdutils.o fsutils.o logger.o @@ -39,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lfstyp -lnvpair -ladm -lefi 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: diff --git a/usr/src/cmd/hal/probing/xkb/Makefile b/usr/src/cmd/hal/probing/xkb/Makefile index 1db618779c..8d6b1fc13c 100644 --- a/usr/src/cmd/hal/probing/xkb/Makefile +++ b/usr/src/cmd/hal/probing/xkb/Makefile @@ -37,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/tools/Makefile b/usr/src/cmd/hal/tools/Makefile index 1c4fceb34b..6cca522969 100644 --- a/usr/src/cmd/hal/tools/Makefile +++ b/usr/src/cmd/hal/tools/Makefile @@ -72,7 +72,7 @@ $(STORAGE_METHOD_PROG) := LDLIBS += -lpolkit 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)/%) diff --git a/usr/src/cmd/hal/tools/sunos/Makefile b/usr/src/cmd/hal/tools/sunos/Makefile index b1b3a6dc19..51b48b865b 100644 --- a/usr/src/cmd/hal/tools/sunos/Makefile +++ b/usr/src/cmd/hal/tools/sunos/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# HAL_PROGS = hal-system-lcd-set-brightness-sunos \ hal-system-lcd-get-brightness-sunos @@ -43,7 +41,7 @@ $(HAL_PROGS) := LDLIBS += -lc $(ZIGNORE) -lglib-2.0 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)/sunos ROOTCMD = $(HAL_PROGS:%=$(ROOTCMDDIR)/%) \ diff --git a/usr/src/cmd/iconv/Makefile b/usr/src/cmd/iconv/Makefile index 02edd5238d..f4fd3c3010 100644 --- a/usr/src/cmd/iconv/Makefile +++ b/usr/src/cmd/iconv/Makefile @@ -23,7 +23,7 @@ OBJS = iconv_main.o iconv_list.o charmap.o parser.tab.o scanner.o 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 diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile index a4ab35da95..b0d03278ca 100644 --- a/usr/src/cmd/idmap/idmapd/Makefile +++ b/usr/src/cmd/idmap/idmapd/Makefile @@ -69,7 +69,7 @@ XGETFLAGS = --foreign-user --strict -n -E --width=72 \ --omit-header --keyword=directoryError:2 \ --language=C --force-po -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) POFILE = $(PROG)_all.po RPC_MSGOUT_OPT = -DRPC_MSGOUT=idmap_rpc_msgout diff --git a/usr/src/cmd/latencytop/Makefile.com b/usr/src/cmd/latencytop/Makefile.com index a804857533..8bfc1e13a6 100644 --- a/usr/src/cmd/latencytop/Makefile.com +++ b/usr/src/cmd/latencytop/Makefile.com @@ -36,7 +36,7 @@ CERRWARN += -_gcc=-Wno-uninitialized 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 += -lcurses -ldtrace all install := LDLIBS += -lglib-2.0 diff --git a/usr/src/cmd/ldap/Makefile b/usr/src/cmd/ldap/Makefile index 6f8a440264..3815e4fdc7 100644 --- a/usr/src/cmd/ldap/Makefile +++ b/usr/src/cmd/ldap/Makefile @@ -2,8 +2,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# # cmd/ldap/Makefile include ../Makefile.cmd @@ -32,7 +30,7 @@ $(POFILES) := CFLAGS += -I ../../lib/libldap5/include/ldap \ -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: diff --git a/usr/src/cmd/ldap/Makefile.com b/usr/src/cmd/ldap/Makefile.com index a50e846b61..33dd225325 100644 --- a/usr/src/cmd/ldap/Makefile.com +++ b/usr/src/cmd/ldap/Makefile.com @@ -112,9 +112,9 @@ ldaplist := LDLIBS += -lsldap ldapaddent := LDLIBS += -lsldap -lnsl -lsecdb 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) lint := LDLIBS += -lldap @@ -177,18 +177,18 @@ clean: # Not linted Mozilla upstream commands lint: lintns_ldaplist lintns_ldapaddent lintns_ldapclient -lintns_ldaplist := C99MODE = $(C99_ENABLE) +lintns_ldaplist := CSTD = $(CSTD_GNU99) lintns_ldaplist: $(LINT.c) $(LDAPLISTSRCS:%=../ns_ldap/%) $(LDLIBS) -lsldap -lintns_ldapaddent := C99MODE = $(C99_ENABLE) +lintns_ldapaddent := CSTD = $(CSTD_GNU99) lintns_ldapaddent: $(LINT.c) $(LDAPADDENTSRCS:%=../ns_ldap/%) $(LDLIBS) -lsldap -lnsl \ -lsecdb -lintns_ldapclient := C99MODE = $(C99_ENABLE) +lintns_ldapclient := CSTD = $(CSTD_GNU99) lintns_ldapclient: $(LINT.c) $(LDAPCLIENTSRCS:%=../ns_ldap/%) $(LDLIBS) -lsldap -lscf diff --git a/usr/src/cmd/ldmad/Makefile b/usr/src/cmd/ldmad/Makefile index 9e9e30fc19..0e38ddbb00 100644 --- a/usr/src/cmd/ldmad/Makefile +++ b/usr/src/cmd/ldmad/Makefile @@ -64,7 +64,7 @@ LDLIBS += -lds -ldladm -ldevinfo -lpri INCS += -I$(ROOT)/usr/platform/sun4v/include/sys INCS += -I$(SRC)/uts/sun4v CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(INCS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN diff --git a/usr/src/cmd/mandoc/Makefile.common b/usr/src/cmd/mandoc/Makefile.common index 6c0187e3e0..ac5b6fe2ac 100644 --- a/usr/src/cmd/mandoc/Makefile.common +++ b/usr/src/cmd/mandoc/Makefile.common @@ -76,7 +76,7 @@ OBJS= att.o \ OBJS += compat_ohash.o CFLAGS += $(CC_VERBOSE) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -DOSNAME="\"illumos\"" diff --git a/usr/src/cmd/mdb/Makefile.mdb b/usr/src/cmd/mdb/Makefile.mdb index 9d1d7b4d6c..852ce281ac 100644 --- a/usr/src/cmd/mdb/Makefile.mdb +++ b/usr/src/cmd/mdb/Makefile.mdb @@ -95,7 +95,7 @@ SRCS += \ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -D_MDB -I. -I../.. -I../../../common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LDLIBS += -lcurses -lkvm -lproc -lrtld_db -lctf -lumem -ldisasm -lscf diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module index bf8a3821d8..2c8da775da 100644 --- a/usr/src/cmd/mdb/Makefile.module +++ b/usr/src/cmd/mdb/Makefile.module @@ -113,7 +113,7 @@ PYLNFLAGS = -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION) kvm_TGTFLAGS = -D_KERNEL proc_TGTFLAGS = -D_USER -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) diff --git a/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile b/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile index d9bcbaf453..672b40b332 100644 --- a/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile @@ -45,7 +45,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common CPPFLAGS += -I../../../../../uts/common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all dmod/%.o: $(GENUNIX_DIR)/%.c diff --git a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile index f4d128dff7..b0ebe4c7c8 100644 --- a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile @@ -44,7 +44,7 @@ CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common -D_FAKE_KERNEL CPPFLAGS += -I../../../../../lib/libzpool/common \ -I../../../../../uts/common/fs/zfs -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile b/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile index ac91224f66..ec561246ca 100644 --- a/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/nsmb/Makefile @@ -40,7 +40,7 @@ include ../../../Makefile.module 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. diff --git a/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile b/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile index a8e6e2cfcc..02f4962b86 100644 --- a/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/pmcs/Makefile @@ -33,7 +33,7 @@ include $(SRC)/cmd/Makefile.cmd.64 include $(SRC)/cmd/mdb/intel/Makefile.amd64 include $(SRC)/cmd/mdb/Makefile.module -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/uts/common diff --git a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile index 5c60dfe50b..d83124d648 100644 --- a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile @@ -41,7 +41,7 @@ CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/impl LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_FUNC_SET_NOT_USED LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_FUNC_ARG_UNUSED -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-address diff --git a/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile b/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile index b53fa726a1..c929d80524 100644 --- a/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/smbfs/Makefile @@ -40,7 +40,7 @@ include ../../../Makefile.module 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. diff --git a/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile b/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile index 3d5dcdacb8..90a7c02643 100644 --- a/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile @@ -38,7 +38,7 @@ ROOTKMOD = $(ROOT)/usr/kernel/kmdb$(MACHMODDIR) include ../../../Makefile.module -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) $(ROOTKMOD): $(INS.dir) diff --git a/usr/src/cmd/mdb/intel/amd64/srpt/Makefile b/usr/src/cmd/mdb/intel/amd64/srpt/Makefile index 1c15d3abfc..94ea5e7130 100644 --- a/usr/src/cmd/mdb/intel/amd64/srpt/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/srpt/Makefile @@ -39,5 +39,5 @@ include ../../../Makefile.module CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(SRPTBASE) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all diff --git a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile index 870f91ad99..8224d7593d 100644 --- a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile @@ -40,7 +40,7 @@ include ../../../common/modules/zfs/Makefile.zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile b/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile index eb63922371..df59f2c513 100644 --- a/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile @@ -44,7 +44,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common CPPFLAGS += -I../../../../../uts/common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all dmod/%.o: $(GENUNIX_DIR)/%.c diff --git a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile index 658c466248..0ed9a6d470 100644 --- a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile @@ -45,7 +45,7 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \ -I../../../../../uts/common/fs/zfs \ -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile b/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile index b12a97b8e5..bae116d95e 100644 --- a/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile +++ b/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" MODULE = mdb_kb.so MDBTGT = kvm @@ -35,7 +34,7 @@ include ../../../../../Makefile.cmd.64 include ../../../../intel/Makefile.amd64 include ../../../../Makefile.module -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -DMP -D_MACHDEP -D_MDB -D__xpv diff --git a/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile b/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile index 640aecfa3a..4136306433 100644 --- a/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile @@ -45,7 +45,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common CPPFLAGS += -I../../../../../uts/common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all dmod/%.o: $(GENUNIX_DIR)/%.c diff --git a/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile b/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile index b00ff3c0bc..f8f2b3fae3 100644 --- a/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile +++ b/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile @@ -43,7 +43,7 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \ -I../../../../../uts/common/fs/zfs \ -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile b/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile index 480f9a8126..3d7f2e9dd4 100644 --- a/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile @@ -46,7 +46,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common CPPFLAGS += -I../../../../../uts/common -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all dmod/%.o: $(GENUNIX_DIR)/%.c diff --git a/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile b/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile index 5c3b38b760..6b50bacc96 100644 --- a/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile @@ -44,7 +44,7 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \ -I../../../../../uts/common/fs/zfs \ -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/mdb/sparc/v9/nsmb/Makefile b/usr/src/cmd/mdb/sparc/v9/nsmb/Makefile index 03b663a327..42560d80aa 100644 --- a/usr/src/cmd/mdb/sparc/v9/nsmb/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/nsmb/Makefile @@ -40,7 +40,7 @@ include ../../../Makefile.module 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. diff --git a/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile b/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile index d282a060e5..2d28be38f9 100644 --- a/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/pmcs/Makefile @@ -33,7 +33,7 @@ include $(SRC)/cmd/Makefile.cmd.64 include $(SRC)/cmd/mdb/sparc/Makefile.sparcv9 include $(SRC)/cmd/mdb/Makefile.module -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRC)/uts/common diff --git a/usr/src/cmd/mdb/sparc/v9/qlc/Makefile b/usr/src/cmd/mdb/sparc/v9/qlc/Makefile index 1b5dff0286..926d1a809a 100644 --- a/usr/src/cmd/mdb/sparc/v9/qlc/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/qlc/Makefile @@ -41,7 +41,7 @@ CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/impl LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_FUNC_SET_NOT_USED LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_FUNC_ARG_UNUSED -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-address diff --git a/usr/src/cmd/mdb/sparc/v9/smbfs/Makefile b/usr/src/cmd/mdb/sparc/v9/smbfs/Makefile index 4aca90cff9..b89fc0cc1d 100644 --- a/usr/src/cmd/mdb/sparc/v9/smbfs/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/smbfs/Makefile @@ -40,7 +40,7 @@ include ../../../Makefile.module 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. diff --git a/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile b/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile index 643b3c8ec7..5333130137 100644 --- a/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile @@ -38,7 +38,7 @@ ROOTKMOD = $(ROOT)/usr/kernel/kmdb$(MACHMODDIR) include ../../../Makefile.module -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) $(ROOTKMOD): $(INS.dir) diff --git a/usr/src/cmd/mdb/sparc/v9/srpt/Makefile b/usr/src/cmd/mdb/sparc/v9/srpt/Makefile index 7379a27cde..75448c947d 100644 --- a/usr/src/cmd/mdb/sparc/v9/srpt/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/srpt/Makefile @@ -39,5 +39,5 @@ include ../../../Makefile.module CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(SRPTBASE) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all diff --git a/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile b/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile index 0c9a088945..7a15e833f6 100644 --- a/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile @@ -38,5 +38,5 @@ include ../../../Makefile.module CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(STMFSBDBASE) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all diff --git a/usr/src/cmd/mdb/sparc/v9/zfs/Makefile b/usr/src/cmd/mdb/sparc/v9/zfs/Makefile index 751c3c3571..116cc938d8 100644 --- a/usr/src/cmd/mdb/sparc/v9/zfs/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/zfs/Makefile @@ -40,7 +40,7 @@ include ../../../common/modules/zfs/Makefile.zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs/lua -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CERRWARN += -_gcc=-Wno-type-limits diff --git a/usr/src/cmd/ndmpd/Makefile b/usr/src/cmd/ndmpd/Makefile index 3cb74257ce..4d5ed69075 100644 --- a/usr/src/cmd/ndmpd/Makefile +++ b/usr/src/cmd/ndmpd/Makefile @@ -51,7 +51,7 @@ CPPFLAGS += $(LFLAGS64) CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DDEBUG CPPFLAGS += -I. -Iinclude -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) # lint does not like unused _umem_*_init LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2 diff --git a/usr/src/cmd/nvmeadm/Makefile b/usr/src/cmd/nvmeadm/Makefile index c042d4075f..c919c51fce 100644 --- a/usr/src/cmd/nvmeadm/Makefile +++ b/usr/src/cmd/nvmeadm/Makefile @@ -25,7 +25,7 @@ include ../Makefile.cmd CFLAGS += $(CCVERBOSE) LDLIBS += -ldevinfo -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) all: $(PROG) diff --git a/usr/src/cmd/od/Makefile b/usr/src/cmd/od/Makefile index ce45b2db8c..6f449c96d1 100644 --- a/usr/src/cmd/od/Makefile +++ b/usr/src/cmd/od/Makefile @@ -23,7 +23,7 @@ include ../Makefile.cmd CLOBBERFILES= $(PROG) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -D__EXTENSIONS__ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 LINTFLAGS += -D__EXTENSIONS__ diff --git a/usr/src/cmd/perl/Makefile.perl b/usr/src/cmd/perl/Makefile.perl index 25fdc53f50..441f3de665 100644 --- a/usr/src/cmd/perl/Makefile.perl +++ b/usr/src/cmd/perl/Makefile.perl @@ -34,4 +34,4 @@ ROOTPERLEXTDIR = $(ROOTPERLLIBDIR)/auto/Sun/Solaris/$(MODULE) ROOTPERLMOD = $(ROOTPERLMODDIR)/$(MODULE).pm ROOTPERLEXT = $(ROOTPERLEXTDIR)/$(MODULE).so -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) diff --git a/usr/src/cmd/policykit/Makefile b/usr/src/cmd/policykit/Makefile index 0c91f51fe8..db571b927f 100644 --- a/usr/src/cmd/policykit/Makefile +++ b/usr/src/cmd/policykit/Makefile @@ -35,7 +35,7 @@ LDLIBS += -lpolkit $(POLICYKIT_GLIB_LDLIBS) 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 += -_gcc=-Wno-unused-variable diff --git a/usr/src/cmd/rmmount/Makefile b/usr/src/cmd/rmmount/Makefile index a859d240e7..4a075da5ef 100644 --- a/usr/src/cmd/rmmount/Makefile +++ b/usr/src/cmd/rmmount/Makefile @@ -39,7 +39,7 @@ LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract 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 += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/cmd/rmvolmgr/Makefile b/usr/src/cmd/rmvolmgr/Makefile index 32833c1f55..979a41cc5c 100644 --- a/usr/src/cmd/rmvolmgr/Makefile +++ b/usr/src/cmd/rmvolmgr/Makefile @@ -40,7 +40,7 @@ LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract -lscf CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized diff --git a/usr/src/cmd/savecore/Makefile.com b/usr/src/cmd/savecore/Makefile.com index 591f33395b..ef8185d6d8 100644 --- a/usr/src/cmd/savecore/Makefile.com +++ b/usr/src/cmd/savecore/Makefile.com @@ -28,7 +28,7 @@ OBJS= savecore.o compress.o include ../../Makefile.cmd -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) diff --git a/usr/src/cmd/sgs/Makefile.com b/usr/src/cmd/sgs/Makefile.com index 650a93e967..6964761a4e 100644 --- a/usr/src/cmd/sgs/Makefile.com +++ b/usr/src/cmd/sgs/Makefile.com @@ -41,12 +41,12 @@ ARCH = $($(MACH)_ARCH) # 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 += $(CCVERBOSE) $(DEBUG) $(XFFLAG) CFLAGS64 += $(CCVERBOSE) $(DEBUG) $(XFFLAG) diff --git a/usr/src/cmd/sgs/ar/Makefile.com b/usr/src/cmd/sgs/ar/Makefile.com index 4d00f744a4..dcd81c9f7c 100644 --- a/usr/src/cmd/sgs/ar/Makefile.com +++ b/usr/src/cmd/sgs/ar/Makefile.com @@ -39,7 +39,7 @@ LLDFLAGS = '-R$$ORIGIN/../../lib' LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' CPPFLAGS= -I. -I../../include $(CPPFLAGS.master) -I$(ELFCAP) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized LDLIBS += -lelf $(CONVLIBDIR) $(CONV_LIB) -lsendfile diff --git a/usr/src/cmd/sgs/error/i386/Makefile b/usr/src/cmd/sgs/error/i386/Makefile index bafd104413..91b26e49bc 100644 --- a/usr/src/cmd/sgs/error/i386/Makefile +++ b/usr/src/cmd/sgs/error/i386/Makefile @@ -38,7 +38,7 @@ INCLIST= -I../common DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses diff --git a/usr/src/cmd/sgs/error/sparc/Makefile b/usr/src/cmd/sgs/error/sparc/Makefile index cd3bf66bda..2023ad1a42 100644 --- a/usr/src/cmd/sgs/error/sparc/Makefile +++ b/usr/src/cmd/sgs/error/sparc/Makefile @@ -41,7 +41,7 @@ CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLEANFILES += $(LINTOUT) diff --git a/usr/src/cmd/sgs/gprof/Makefile.com b/usr/src/cmd/sgs/gprof/Makefile.com index 71f1ac66c4..cb08915388 100644 --- a/usr/src/cmd/sgs/gprof/Makefile.com +++ b/usr/src/cmd/sgs/gprof/Makefile.com @@ -41,7 +41,7 @@ INCLIST= -I../common -I../../include -I../../include/$(MACH) DEFLIST= -DELF_OBJ -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf LINTSRCS = $(SRCS) LINTFLAGS += -x diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com index 15169ec277..e13b98168f 100644 --- a/usr/src/cmd/sgs/lex/Makefile.com +++ b/usr/src/cmd/sgs/lex/Makefile.com @@ -44,7 +44,7 @@ include ../../../../lib/Makefile.lib SRCDIR = ../common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized diff --git a/usr/src/cmd/sgs/m4/i386/Makefile b/usr/src/cmd/sgs/m4/i386/Makefile index 0a13a85c48..a3e69b92bb 100644 --- a/usr/src/cmd/sgs/m4/i386/Makefile +++ b/usr/src/cmd/sgs/m4/i386/Makefile @@ -50,7 +50,7 @@ INCLIST= -I../common DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label diff --git a/usr/src/cmd/sgs/m4/sparc/Makefile b/usr/src/cmd/sgs/m4/sparc/Makefile index ecda17a550..dea00a256f 100644 --- a/usr/src/cmd/sgs/m4/sparc/Makefile +++ b/usr/src/cmd/sgs/m4/sparc/Makefile @@ -55,7 +55,7 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += $(LDLIBS) CLEANFILES += $(LINTOUT) $(BLTSRCS) diff --git a/usr/src/cmd/sgs/prof/Makefile.com b/usr/src/cmd/sgs/prof/Makefile.com index edaaa695f8..f35c626e36 100644 --- a/usr/src/cmd/sgs/prof/Makefile.com +++ b/usr/src/cmd/sgs/prof/Makefile.com @@ -41,7 +41,7 @@ INCLIST= -I../common -I../../include -I../../include/$(MACH) CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf LINTSRCS = $(SRCS) diff --git a/usr/src/cmd/sgs/tsort/i386/Makefile b/usr/src/cmd/sgs/tsort/i386/Makefile index c565d58a91..0df033fb0e 100644 --- a/usr/src/cmd/sgs/tsort/i386/Makefile +++ b/usr/src/cmd/sgs/tsort/i386/Makefile @@ -36,7 +36,7 @@ SRCS= $(OBJS:%.o=../common/%.c) DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses diff --git a/usr/src/cmd/sgs/tsort/sparc/Makefile b/usr/src/cmd/sgs/tsort/sparc/Makefile index 508983d078..6a5e794bda 100644 --- a/usr/src/cmd/sgs/tsort/sparc/Makefile +++ b/usr/src/cmd/sgs/tsort/sparc/Makefile @@ -39,7 +39,7 @@ DEFLIST= -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CLEANFILES += $(LINTOUT) diff --git a/usr/src/cmd/sgs/unifdef/i386/Makefile b/usr/src/cmd/sgs/unifdef/i386/Makefile index 33f7b96b30..45fd3c3bea 100644 --- a/usr/src/cmd/sgs/unifdef/i386/Makefile +++ b/usr/src/cmd/sgs/unifdef/i386/Makefile @@ -34,7 +34,7 @@ SRCS= $(OBJS:%.o=../common/%.c) DEFLIST= -DELF_OBJ -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += $(LDLIBS) CLEANFILES += $(LINTOUT) diff --git a/usr/src/cmd/sgs/unifdef/sparc/Makefile b/usr/src/cmd/sgs/unifdef/sparc/Makefile index 0a16f4c5f0..297bfe27a5 100644 --- a/usr/src/cmd/sgs/unifdef/sparc/Makefile +++ b/usr/src/cmd/sgs/unifdef/sparc/Makefile @@ -36,7 +36,7 @@ CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-parentheses -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LINTFLAGS += $(LDLIBS) CLEANFILES += $(LINTOUT) diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com index 9744f284ea..07782396a5 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.com +++ b/usr/src/cmd/sgs/yacc/Makefile.com @@ -68,7 +68,7 @@ BUILD.AR= $(AR) $(ARFLAGS) $@ `$(LORDER) $(OBJS) | $(TSORT)` LINTPOUT= lint.out -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses diff --git a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs index 3de8e3efff..050a8e6255 100644 --- a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs +++ b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # Common definitions for all smbsrv commands @@ -36,5 +34,5 @@ LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2 CFLAGS += $(CCVERBOSE) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all diff --git a/usr/src/cmd/smbsrv/fksmbd/Makefile b/usr/src/cmd/smbsrv/fksmbd/Makefile index ca3a8b5fb9..9a28a3c8eb 100644 --- a/usr/src/cmd/smbsrv/fksmbd/Makefile +++ b/usr/src/cmd/smbsrv/fksmbd/Makefile @@ -66,7 +66,7 @@ INCS += -I../../../common/smbsrv # Should not have to do this, but the Kerberos includes are a mess. INCS += -I $(ROOT)/usr/include/kerberosv5 -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/smbsrv/smbd/Makefile b/usr/src/cmd/smbsrv/smbd/Makefile index 7af39ef1a7..c744f73ec6 100644 --- a/usr/src/cmd/smbsrv/smbd/Makefile +++ b/usr/src/cmd/smbsrv/smbd/Makefile @@ -69,7 +69,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG # Should not have to do this, but the Kerberos includes are a mess. CPPFLAGS += -I $(ROOT)/usr/include/kerberosv5 -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all LDFLAGS += -R/usr/lib/smbsrv diff --git a/usr/src/cmd/tail/Makefile b/usr/src/cmd/tail/Makefile index 293920cfd1..52e433c7be 100644 --- a/usr/src/cmd/tail/Makefile +++ b/usr/src/cmd/tail/Makefile @@ -25,7 +25,7 @@ include ../Makefile.cmd CLOBBERFILES= $(PROG) CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LINTFLAGS += -I. -erroff=E_CONSTANT_CONDITION diff --git a/usr/src/cmd/th_tools/Makefile b/usr/src/cmd/th_tools/Makefile index 28dd878fdb..ed9d5ae75a 100644 --- a/usr/src/cmd/th_tools/Makefile +++ b/usr/src/cmd/th_tools/Makefile @@ -30,7 +30,7 @@ include ../Makefile.cmd CFLAGS += -I$(SRC)/uts/common LINTFLAGS += -I$(SRC)/uts/common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized diff --git a/usr/src/cmd/tr/Makefile b/usr/src/cmd/tr/Makefile index 8b556040a5..0da9ab2094 100644 --- a/usr/src/cmd/tr/Makefile +++ b/usr/src/cmd/tr/Makefile @@ -26,7 +26,7 @@ include ../Makefile.cmd CLOBBERFILES= $(PROG) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -D_ILLUMOS_PRIVATE -I. LINTFLAGS += -D_ILLUMOS_PRIVATE -I. diff --git a/usr/src/cmd/truss/Makefile.com b/usr/src/cmd/truss/Makefile.com index 0ed14909e4..e2951b1f35 100644 --- a/usr/src/cmd/truss/Makefile.com +++ b/usr/src/cmd/truss/Makefile.com @@ -42,7 +42,7 @@ CFLAGS64 += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-switch -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lproc -lrtld_db -lc_db -lnsl -lsocket -ltsol -lnvpair CPPFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE=1 diff --git a/usr/src/cmd/uuidgen/Makefile b/usr/src/cmd/uuidgen/Makefile index 663e2dbd43..bc15966cae 100644 --- a/usr/src/cmd/uuidgen/Makefile +++ b/usr/src/cmd/uuidgen/Makefile @@ -20,7 +20,7 @@ include ../Makefile.cmd CFLAGS += $(CCVERBOSE) LDLIBS += -luuid -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/volcheck/Makefile b/usr/src/cmd/volcheck/Makefile index 762dd50c9b..8f95cb5b10 100644 --- a/usr/src/cmd/volcheck/Makefile +++ b/usr/src/cmd/volcheck/Makefile @@ -39,7 +39,7 @@ LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract 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 += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/cmd/volrmmount/Makefile b/usr/src/cmd/volrmmount/Makefile index 5166036a04..f503dc768a 100644 --- a/usr/src/cmd/volrmmount/Makefile +++ b/usr/src/cmd/volrmmount/Makefile @@ -39,7 +39,7 @@ LDLIBS += -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract 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 += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/cmd/vscan/vscanadm/Makefile b/usr/src/cmd/vscan/vscanadm/Makefile index e5765bcbb2..f27f4a22e4 100755 --- a/usr/src/cmd/vscan/vscanadm/Makefile +++ b/usr/src/cmd/vscan/vscanadm/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# -#ident "%Z%%M% %I% %E% SMI" PROG = vscanadm SRCS = vscanadm.c @@ -35,7 +33,7 @@ LDLIBS += -L$(ROOT)/usr/lib/vscan -lvscan LDFLAGS += -R/usr/lib/vscan CFLAGS += $(CCVERBOSE) -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all .KEEP_STATE: diff --git a/usr/src/cmd/vscan/vscand/Makefile b/usr/src/cmd/vscan/vscand/Makefile index 15ff0086c2..dfc363c83d 100644 --- a/usr/src/cmd/vscan/vscand/Makefile +++ b/usr/src/cmd/vscan/vscand/Makefile @@ -47,7 +47,7 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CERRWARN += -_gcc=-Wno-switch LINTFLAGS += -mu -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all MANIFEST = vscan.xml diff --git a/usr/src/cmd/vtfontcvt/Makefile.common b/usr/src/cmd/vtfontcvt/Makefile.common index 4ce385418e..f951eef71b 100644 --- a/usr/src/cmd/vtfontcvt/Makefile.common +++ b/usr/src/cmd/vtfontcvt/Makefile.common @@ -26,4 +26,4 @@ LDLIBS += -lumem $(COMPILE.c) $< $(POST_PROCESS_O) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) diff --git a/usr/src/cmd/zdb/Makefile.com b/usr/src/cmd/zdb/Makefile.com index 78d1bb1738..1870ccd0c5 100644 --- a/usr/src/cmd/zdb/Makefile.com +++ b/usr/src/cmd/zdb/Makefile.com @@ -40,7 +40,7 @@ INCS += -I../../../common/zfs LDLIBS += -lzpool -lumem -lnvpair -lzfs -lavl -lcmdutils -lfakekernel -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/zfs/Makefile b/usr/src/cmd/zfs/Makefile index f84bcbb108..a3d61c7ee4 100644 --- a/usr/src/cmd/zfs/Makefile +++ b/usr/src/cmd/zfs/Makefile @@ -44,7 +44,7 @@ LDLIBS += -lzfs_core -lzfs -luutil -lumem -lnvpair -lsec -lidmap INCS += -I../../common/zfs -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS) diff --git a/usr/src/cmd/zhack/Makefile.com b/usr/src/cmd/zhack/Makefile.com index 3e7890d5d7..8a87de4ec9 100644 --- a/usr/src/cmd/zhack/Makefile.com +++ b/usr/src/cmd/zhack/Makefile.com @@ -43,7 +43,7 @@ INCS += -I../../../common/zfs LDLIBS += -lzpool -lumem -lnvpair -lzfs -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/zinject/Makefile.com b/usr/src/cmd/zinject/Makefile.com index 5bfe8bad79..a1a3baf712 100644 --- a/usr/src/cmd/zinject/Makefile.com +++ b/usr/src/cmd/zinject/Makefile.com @@ -38,7 +38,7 @@ INCS += -I../../../uts/common/fs/zfs/lua LDLIBS += -lzpool -lzfs -lnvpair -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common -D_FAKE_KERNEL diff --git a/usr/src/cmd/zlook/Makefile.com b/usr/src/cmd/zlook/Makefile.com index 937842724d..06627ad814 100644 --- a/usr/src/cmd/zlook/Makefile.com +++ b/usr/src/cmd/zlook/Makefile.com @@ -28,7 +28,7 @@ SRCS= ../$(PROG).c include ../../Makefile.cmd -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += -g $(CCVERBOSE) CFLAGS64 += -g $(CCVERBOSE) diff --git a/usr/src/cmd/zstreamdump/Makefile b/usr/src/cmd/zstreamdump/Makefile index 5b7e6b79c1..ba249bafab 100644 --- a/usr/src/cmd/zstreamdump/Makefile +++ b/usr/src/cmd/zstreamdump/Makefile @@ -35,7 +35,7 @@ INCS += -I../../common/zfs LDLIBS += -lzfs -lnvpair -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS) diff --git a/usr/src/cmd/ztest/Makefile.com b/usr/src/cmd/ztest/Makefile.com index 172ff02b5a..8f6c9d5ccf 100644 --- a/usr/src/cmd/ztest/Makefile.com +++ b/usr/src/cmd/ztest/Makefile.com @@ -38,7 +38,7 @@ INCS += -I../../../common/zfs LDLIBS += -lumem -lzpool -lcmdutils -lm -lnvpair -lfakekernel -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += -g $(CCVERBOSE) CFLAGS64 += -g $(CCVERBOSE) diff --git a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com index 9b721953e8..242ef383b7 100644 --- a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com +++ b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com @@ -78,7 +78,7 @@ CPPFLAGS += -D_REENTRANT -U_ASM \ -I$(SRC)/uts/common/fs/zfs CFLAGS += $(CCVERBOSE) # Needed to handle zfs include files -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all DYNFLAGS += $(DYNFLAGS_$(CLASS)) DYNFLAGS += $(BLOCAL) $(ZNOVERSION) -Wl,-e_start diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile.com b/usr/src/lib/fm/libfmd_snmp/Makefile.com index cba1d90240..e43b2a4152 100644 --- a/usr/src/lib/fm/libfmd_snmp/Makefile.com +++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com @@ -44,7 +44,7 @@ LIBS = $(DYNLIB) $(LINTLIB) SRCDIR = ../common -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CPPFLAGS += -I../common -I. $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG diff --git a/usr/src/lib/fm/libfmevent/Makefile.com b/usr/src/lib/fm/libfmevent/Makefile.com index ce3f9b4dae..4243705988 100644 --- a/usr/src/lib/fm/libfmevent/Makefile.com +++ b/usr/src/lib/fm/libfmevent/Makefile.com @@ -51,7 +51,7 @@ LIBS = $(DYNLIB) $(LINTLIB) SRCDIR = ../common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG diff --git a/usr/src/lib/fm/libfmnotify/Makefile.com b/usr/src/lib/fm/libfmnotify/Makefile.com index e1ff0e027a..d6a60e6fb1 100644 --- a/usr/src/lib/fm/libfmnotify/Makefile.com +++ b/usr/src/lib/fm/libfmnotify/Makefile.com @@ -37,7 +37,7 @@ LIBS = $(DYNLIB) $(LINTLIB) SRCDIR = ../common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin index 13d90b8a27..1ec87f6970 100644 --- a/usr/src/lib/fm/topo/modules/Makefile.plugin +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin @@ -64,7 +64,7 @@ CERRWARN += -_gcc=-Wno-parentheses APIMAP = ../../../libtopo/common/topo_mod.map MAPFILES = # use APIMAP instead -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) CFLAGS += -G $(XREGSFLAG) diff --git a/usr/src/lib/libads/Makefile.com b/usr/src/lib/libads/Makefile.com index 1e1d7d968d..9fd803cac9 100644 --- a/usr/src/lib/libads/Makefile.com +++ b/usr/src/lib/libads/Makefile.com @@ -32,7 +32,7 @@ OBJECTS = $(LINT_OBJECTS) adspriv_xdr.o include ../../Makefile.lib -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LIBS = $(DYNLIB) $(LINTLIB) diff --git a/usr/src/lib/libadutils/Makefile.com b/usr/src/lib/libadutils/Makefile.com index 67014cb75e..7d7e142481 100644 --- a/usr/src/lib/libadutils/Makefile.com +++ b/usr/src/lib/libadutils/Makefile.com @@ -32,7 +32,7 @@ OBJECTS = adutils.o addisc.o adutils_threadfuncs.o \ include ../../Makefile.lib -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LIBS = $(DYNLIB) $(LINTLIB) diff --git a/usr/src/lib/libbc/Makefile b/usr/src/lib/libbc/Makefile index 403ae316a7..1118f0bb7c 100644 --- a/usr/src/lib/libbc/Makefile +++ b/usr/src/lib/libbc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libc.a VERS= .1.9 @@ -34,7 +32,7 @@ include ../Makefile.lib # There should be a mapfile here MAPFILES = -C99MODE= $(C99_DISABLE) +CSTD= $(CSTD_GNU89) # the bcp libraries go in /usr/4lib. override ROOTLIBDIR from ../Makefile.lib ROOTLIBDIR= $(ROOT)/usr/4lib diff --git a/usr/src/lib/libbc/sparc/Makefile b/usr/src/lib/libbc/sparc/Makefile index 7503bae833..c624b62c2f 100644 --- a/usr/src/lib/libbc/sparc/Makefile +++ b/usr/src/lib/libbc/sparc/Makefile @@ -310,7 +310,7 @@ include ../../Makefile.lib # There should be a mapfile here MAPFILES = -C99MODE= $(C99_DISABLE) +CSTD= $(CSTD_GNU89) # # The BCP include files depend on old preprocessor semantics. diff --git a/usr/src/lib/libbe/Makefile.com b/usr/src/lib/libbe/Makefile.com index 8c939917a3..765f8e981a 100644 --- a/usr/src/lib/libbe/Makefile.com +++ b/usr/src/lib/libbe/Makefile.com @@ -49,7 +49,7 @@ SRCDIR= ../common INCS += -I$(SRCDIR) -I$(SRC)/cmd/boot/common -I$(SRC)/common/ficl -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lficl-sys -lzfs -linstzones -luuid -lnvpair -lc -lgen LDLIBS += -ldevinfo -lefi diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index 07c2fc1f0f..e9ee51e1ff 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -1066,7 +1066,7 @@ BUILD.s= $(AS) $(ASFLAGS) $< -o $@ # 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 diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index c8ce23c765..c496bab9f1 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -1126,7 +1126,7 @@ BUILD.s= $(AS) $(ASFLAGS) $< -o $@ # 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 diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index e76f1cc175..89219b3abb 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -1150,7 +1150,7 @@ BUILD.s= $(AS) $(ASFLAGS) $< -o $@ # 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 diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com index 632aa62dd2..9440bd9815 100644 --- a/usr/src/lib/libc/sparcv9/Makefile.com +++ b/usr/src/lib/libc/sparcv9/Makefile.com @@ -1084,7 +1084,7 @@ BUILD.s= $(AS) $(ASFLAGS) $< -o $@ # 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 diff --git a/usr/src/lib/libdisasm/Makefile.com b/usr/src/lib/libdisasm/Makefile.com index adc0816474..b465f56752 100644 --- a/usr/src/lib/libdisasm/Makefile.com +++ b/usr/src/lib/libdisasm/Makefile.com @@ -139,7 +139,7 @@ CFLAGS += $(CFLAGS_$(CURTYPE)) $(CFLAGS_common) CFLAGS64_standalone = $(STAND_FLAGS_64) CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) DYNFLAGS += $(ZINTERPOSE) diff --git a/usr/src/lib/libdns_sd/Makefile.com b/usr/src/lib/libdns_sd/Makefile.com index 944a538b25..5363d2dead 100644 --- a/usr/src/lib/libdns_sd/Makefile.com +++ b/usr/src/lib/libdns_sd/Makefile.com @@ -36,7 +36,7 @@ SRCDIR = ../common LDLIBS += -lsocket -lnsl -lc -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(SRCDIR) -DNOT_HAVE_SA_LEN -D_XPG4_2 -D__EXTENSIONS__ CPPFLAGS += -DMDNS_VERSIONSTR_NODTS diff --git a/usr/src/lib/libdns_sd/java/Makefile.com b/usr/src/lib/libdns_sd/java/Makefile.com index 8a8133ba95..acfcc13dbd 100644 --- a/usr/src/lib/libdns_sd/java/Makefile.com +++ b/usr/src/lib/libdns_sd/java/Makefile.com @@ -34,7 +34,7 @@ LIBS = $(DYNLIB) SRCDIR = ../common -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris CPPFLAGS += -I../com/apple/dnssd CPPFLAGS += -D_REENTRANT diff --git a/usr/src/lib/libfakekernel/Makefile.com b/usr/src/lib/libfakekernel/Makefile.com index dd448d45db..ef1abe4072 100644 --- a/usr/src/lib/libfakekernel/Makefile.com +++ b/usr/src/lib/libfakekernel/Makefile.com @@ -53,7 +53,7 @@ SRCS= $(COBJS:%.o=$(SRCDIR)/%.c) $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all # Note: need our sys includes _before_ ENVCPPFLAGS, proto etc. diff --git a/usr/src/lib/libfcoe/Makefile.com b/usr/src/lib/libfcoe/Makefile.com index ed9f3d773d..e3daeefd56 100644 --- a/usr/src/lib/libfcoe/Makefile.com +++ b/usr/src/lib/libfcoe/Makefile.com @@ -38,7 +38,7 @@ INCS += -I$(SRCDIR) INCS += -I$(SRC)/uts/common/sys/fcoe LDLIBS += -lc -ldladm -lscf -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CPPFLAGS += $(INCS) -D_REENTRANT diff --git a/usr/src/lib/libfdisk/Makefile.com b/usr/src/lib/libfdisk/Makefile.com index 7e05c8f947..46572b0b2b 100644 --- a/usr/src/lib/libfdisk/Makefile.com +++ b/usr/src/lib/libfdisk/Makefile.com @@ -39,7 +39,7 @@ SRCDIR= ../common LIBS= $(DYNLIB) $(LINTLIB) -C99MODE= $(C99_DISABLE) +CSTD= $(CSTD_GNU89) CPPFLAGS += -I. LDLIBS += -lc diff --git a/usr/src/lib/libficl/Makefile.com b/usr/src/lib/libficl/Makefile.com index cdf4419df0..a7f4a3f63f 100644 --- a/usr/src/lib/libficl/Makefile.com +++ b/usr/src/lib/libficl/Makefile.com @@ -28,7 +28,7 @@ include $(SRC)/lib/Makefile.lib LIBS= $(DYNLIB) $(LINTLIB) 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 diff --git a/usr/src/lib/libidmap/Makefile.com b/usr/src/lib/libidmap/Makefile.com index 2a5e5484de..aff1f976e9 100644 --- a/usr/src/lib/libidmap/Makefile.com +++ b/usr/src/lib/libidmap/Makefile.com @@ -41,7 +41,7 @@ OBJECTS = $(LINT_OBJECTS) \ idmap_xdr.o include ../../Makefile.lib -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LIBS = $(DYNLIB) $(LINTLIB) LDLIBS += -lc -lavl -lnsl -lnvpair -luutil diff --git a/usr/src/lib/libilb/Makefile.com b/usr/src/lib/libilb/Makefile.com index abc7c7f1fa..dd8e50d040 100644 --- a/usr/src/lib/libilb/Makefile.com +++ b/usr/src/lib/libilb/Makefile.com @@ -40,7 +40,7 @@ LDLIBS += -lc SRCDIR = ../common $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += -mt $(CCVERBOSE) CPPFLAGS += $(INCS) diff --git a/usr/src/lib/libinetsvc/Makefile.com b/usr/src/lib/libinetsvc/Makefile.com index be13b64f96..4d12fdc942 100644 --- a/usr/src/lib/libinetsvc/Makefile.com +++ b/usr/src/lib/libinetsvc/Makefile.com @@ -35,7 +35,7 @@ LDLIBS += -lscf -lc -lsocket -lnsl -lmd -luutil SRCDIR = ../common $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -CFLAGS += $(CCVERBOSE) -Wp,-xc99=%all +CFLAGS += $(CCVERBOSE) -Wp,$(CSTD_GNU99) CPPFLAGS += -I../common -D_REENTRANT $(RELEASE_BUILD)CPPFLAGS += -DNDEBUG diff --git a/usr/src/lib/libipmi/Makefile.com b/usr/src/lib/libipmi/Makefile.com index eef10e59af..0942455097 100644 --- a/usr/src/lib/libipmi/Makefile.com +++ b/usr/src/lib/libipmi/Makefile.com @@ -56,7 +56,7 @@ CLEANFILES += $(SRCDIR)/ipmi_tables.c INCS += -I$(SRCDIR) LDLIBS += -lc -lm -lnvpair -lsocket -lnsl CPPFLAGS += $(INCS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-uninitialized diff --git a/usr/src/lib/libiscsit/Makefile.com b/usr/src/lib/libiscsit/Makefile.com index f733019450..3388c07123 100644 --- a/usr/src/lib/libiscsit/Makefile.com +++ b/usr/src/lib/libiscsit/Makefile.com @@ -39,7 +39,7 @@ SRCDIR = ../common INCS += -I$(SRCDIR) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LDLIBS += -lc -lnvpair -lstmf -luuid -lnsl -lscf CPPFLAGS += $(INCS) -D_REENTRANT diff --git a/usr/src/lib/libm/Makefile.libm.com b/usr/src/lib/libm/Makefile.libm.com index ffa6c888d4..93d071c377 100644 --- a/usr/src/lib/libm/Makefile.libm.com +++ b/usr/src/lib/libm/Makefile.libm.com @@ -23,9 +23,9 @@ ASSUFFIX_sparc = S 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 -xc99=%all, for instance, would link us with +# This is VERY IMPORTANT, as $(CSTD_GNU99), for instance, would link us with # values-xpg6, which would introduce an __xpg6 to our object with the C99 # flags set, causing us to default C99 libm behaviour on, breaking # compatibility. @@ -33,7 +33,7 @@ ASSUFFIX = $(ASSUFFIX_$(MACH)) # 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 += -_gcc=-std=gnu89 CFLAGS64 += -_gcc=-std=gnu89 @@ -55,7 +55,7 @@ CPPFLAGS += -I$(LIBMSRC)/C \ # GCC needs __C99FEATURES__ such that the implementations of isunordered, # isgreaterequal, islessequal, etc, exist. This is basically equivalent to # providing no -xc99 to Studio, in that it gets us the C99 language features, -# but not values-xpg6, the reason for which is outlined with C99MODE. +# but not values-xpg6, the reason for which is outlined with CSTD. CFLAGS += -_gcc=-D__C99FEATURES__ CFLAGS64 += -_gcc=-D__C99FEATURES__ diff --git a/usr/src/lib/libndmp/Makefile.com b/usr/src/lib/libndmp/Makefile.com index 0100610434..e96223b3ec 100644 --- a/usr/src/lib/libndmp/Makefile.com +++ b/usr/src/lib/libndmp/Makefile.com @@ -46,7 +46,7 @@ SRCDIR = ../common INCS += -I$(SRCDIR) INCS += -I$(SRC)/cmd/ndmpd/include -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LIBS= $(DYNLIB) $(LINTLIB) LDLIBS += -lc -lscf diff --git a/usr/src/lib/libnsctl/Makefile.com b/usr/src/lib/libnsctl/Makefile.com index fb0431310f..36042e4c6f 100644 --- a/usr/src/lib/libnsctl/Makefile.com +++ b/usr/src/lib/libnsctl/Makefile.com @@ -37,7 +37,7 @@ SRCDIR= ../common INCS += -I$(SRCDIR) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LDLIBS += -lc diff --git a/usr/src/lib/libnvpair/Makefile.com b/usr/src/lib/libnvpair/Makefile.com index c1c5e3210e..029dff2b7f 100644 --- a/usr/src/lib/libnvpair/Makefile.com +++ b/usr/src/lib/libnvpair/Makefile.com @@ -74,7 +74,7 @@ CERRWARN += -_gcc=-Wno-uninitialized CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/libproc/Makefile.com b/usr/src/lib/libproc/Makefile.com index 30790b7a6f..bf20ef40d5 100644 --- a/usr/src/lib/libproc/Makefile.com +++ b/usr/src/lib/libproc/Makefile.com @@ -85,7 +85,7 @@ SRCS = $(CMNOBJS:%.o=../common/%.c) $(ISAOBJS:%.o=%.c) LIBS = $(DYNLIB) $(LINTLIB) LDLIBS += -lrtld_db -lelf -lctf -lc -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += $($(MACH64)_CPPFLAGS) SRCDIR = ../common diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile index b53ce5c037..4b905e0c8f 100644 --- a/usr/src/lib/libresolv/Makefile +++ b/usr/src/lib/libresolv/Makefile @@ -47,7 +47,7 @@ include ../Makefile.rootfs SRCDIR = . -C99MODE= $(C99_DISABLE) +CSTD= $(CSTD_GNU89) # We really want to say this: # CPPFLAGS += -DDEBUG -DSYSV -D_REENTRANT -I. -I../common/inc diff --git a/usr/src/lib/librestart/Makefile.com b/usr/src/lib/librestart/Makefile.com index feb2b242ef..7f2ef884aa 100644 --- a/usr/src/lib/librestart/Makefile.com +++ b/usr/src/lib/librestart/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY = librestart.a VERS = .1 @@ -40,7 +38,7 @@ LDLIBS += -lpool -lproject -lsecdb -lnvpair -lsysevent -lscf -luutil -lc SRCDIR = ../common $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -CFLAGS += $(CCVERBOSE) -Wp,-xc99=%all +CFLAGS += $(CCVERBOSE) -Wp,$(CSTD_GNU99) CPPFLAGS += diff --git a/usr/src/lib/libsaveargs/tests/dump/Makefile b/usr/src/lib/libsaveargs/tests/dump/Makefile index 41c2f51cd9..8732f9c64e 100644 --- a/usr/src/lib/libsaveargs/tests/dump/Makefile +++ b/usr/src/lib/libsaveargs/tests/dump/Makefile @@ -25,7 +25,7 @@ CFLAGS += -m64 LDLIBS64 += -lctf -lelf -lsaveargs -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) $(PROG): $(OBJECTS) $(LINK.c) -o $@ $(OBJECTS) $(LDLIBS64) diff --git a/usr/src/lib/libscf/Makefile.com b/usr/src/lib/libscf/Makefile.com index 66b02c4fa7..9388f9cfb1 100644 --- a/usr/src/lib/libscf/Makefile.com +++ b/usr/src/lib/libscf/Makefile.com @@ -52,7 +52,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) COMDIR = ../../../common/svc -CFLAGS += $(CCVERBOSE) -Wp,-xc99=%all +CFLAGS += $(CCVERBOSE) -Wp,$(CSTD_GNU99) CPPFLAGS += -I../inc -I../../common/inc -I$(COMDIR) -I$(ROOTHDRDIR) $(NOT_RELEASE_BUILD) CPPFLAGS += -DFASTREBOOT_DEBUG diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com index 2f8aad345f..509ba0c662 100644 --- a/usr/src/lib/libshare/Makefile.com +++ b/usr/src/lib/libshare/Makefile.com @@ -43,7 +43,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) -C99MODE += $(C99_ENABLE) +CSTD += $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-switch diff --git a/usr/src/lib/libsmbfs/Makefile.com b/usr/src/lib/libsmbfs/Makefile.com index 0721dfc302..0521eba951 100644 --- a/usr/src/lib/libsmbfs/Makefile.com +++ b/usr/src/lib/libsmbfs/Makefile.com @@ -93,7 +93,7 @@ SRCS= $(OBJ_LIB:%.o=$(SRCDIR)/%.c) \ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LDLIBS += -lsocket -lnsl -lc -lmd -lpkcs11 -lkrb5 -lsec -lidmap diff --git a/usr/src/lib/libsrpt/Makefile.com b/usr/src/lib/libsrpt/Makefile.com index 4cc7d1d599..db3ff8edc6 100644 --- a/usr/src/lib/libsrpt/Makefile.com +++ b/usr/src/lib/libsrpt/Makefile.com @@ -37,7 +37,7 @@ SRPTMODDIR = ../../../uts/common/io/comstar/port/srpt INCS += -I$(SRCDIR) -I$(SRPTMODDIR) -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all LDLIBS += -lc -lnvpair -lstmf CPPFLAGS += $(INCS) -D_REENTRANT diff --git a/usr/src/lib/libstmf/Makefile.com b/usr/src/lib/libstmf/Makefile.com index 99ca037802..76ffd111de 100644 --- a/usr/src/lib/libstmf/Makefile.com +++ b/usr/src/lib/libstmf/Makefile.com @@ -36,7 +36,7 @@ SRCDIR = ../common INCS += -I$(SRCDIR) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LDLIBS += -lc -lnvpair -lscf -lm CPPFLAGS += $(INCS) -D_REENTRANT diff --git a/usr/src/lib/libstmfproxy/Makefile.com b/usr/src/lib/libstmfproxy/Makefile.com index b408eb4c4d..e54ba642f3 100644 --- a/usr/src/lib/libstmfproxy/Makefile.com +++ b/usr/src/lib/libstmfproxy/Makefile.com @@ -36,7 +36,7 @@ SRCDIR = ../common INCS += -I$(SRCDIR) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LDLIBS += -lc -lsocket -lnsl CPPFLAGS += $(INCS) -D_REENTRANT diff --git a/usr/src/lib/libv12n/sparc/Makefile b/usr/src/lib/libv12n/sparc/Makefile index 2d76647e9f..a4fcbfad35 100644 --- a/usr/src/lib/libv12n/sparc/Makefile +++ b/usr/src/lib/libv12n/sparc/Makefile @@ -40,7 +40,7 @@ OBJS += $(CMNOBJS) include ../Makefile.com -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LDLIBS += -luuid -lc diff --git a/usr/src/lib/libv12n/sparcv9/Makefile b/usr/src/lib/libv12n/sparcv9/Makefile index a03fd47ade..7edfc67227 100644 --- a/usr/src/lib/libv12n/sparcv9/Makefile +++ b/usr/src/lib/libv12n/sparcv9/Makefile @@ -41,7 +41,7 @@ OBJS += $(CMNOBJS) include ../Makefile.com include ../../Makefile.lib.64 -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LDLIBS += -luuid -lc diff --git a/usr/src/lib/libvrrpadm/Makefile.com b/usr/src/lib/libvrrpadm/Makefile.com index 004227bca4..9c26030c8b 100644 --- a/usr/src/lib/libvrrpadm/Makefile.com +++ b/usr/src/lib/libvrrpadm/Makefile.com @@ -41,7 +41,7 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -D_REENTRANT -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/lib/libzfs/Makefile.com b/usr/src/lib/libzfs/Makefile.com index 6eaf4332f2..c4a8af38b8 100644 --- a/usr/src/lib/libzfs/Makefile.com +++ b/usr/src/lib/libzfs/Makefile.com @@ -67,7 +67,7 @@ INCS += -I../../../uts/common/fs/zfs INCS += -I../../../common/zfs INCS += -I../../libc/inc -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LDLIBS += -lc -lm -ldevid -lgen -lnvpair -luutil -lavl -lefi \ -ladm -lidmap -ltsol -lmd -lumem -lzfs_core -lcmdutils diff --git a/usr/src/lib/libzfs_core/Makefile.com b/usr/src/lib/libzfs_core/Makefile.com index cd756d5be3..5f23a27a1a 100644 --- a/usr/src/lib/libzfs_core/Makefile.com +++ b/usr/src/lib/libzfs_core/Makefile.com @@ -47,7 +47,7 @@ INCS += -I../../../uts/common/fs/zfs INCS += -I../../../common/zfs INCS += -I../../libc/inc -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LDLIBS += -lc -lnvpair CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com index e4511dc50a..68a878d4d3 100644 --- a/usr/src/lib/libzpool/Makefile.com +++ b/usr/src/lib/libzpool/Makefile.com @@ -62,7 +62,7 @@ CLEANFILES += $(EXTPICS) $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) $(LINTLIB): ../common/zfs.h -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all CFLAGS += -g $(CCVERBOSE) $(CNOGLOBAL) diff --git a/usr/src/lib/nsswitch/mdns/Makefile.com b/usr/src/lib/nsswitch/mdns/Makefile.com index 00e335d732..dcd10ade20 100644 --- a/usr/src/lib/nsswitch/mdns/Makefile.com +++ b/usr/src/lib/nsswitch/mdns/Makefile.com @@ -21,8 +21,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # lib/nsswitch/mdns/Makefile.com LIBRARY = libnss_mdns.a @@ -35,7 +33,7 @@ OBJECTS = gethostent.o \ # include common nsswitch library definitions. include ../../Makefile.com -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) LDLIBS += -lnsl -ldns_sd -lscf DYNLIB1 = nss_mdns.so$(VERS) diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com index 020051c977..95ad6cdd73 100644 --- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com +++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com @@ -76,7 +76,7 @@ TSSINC=-I$(TSPIINCDIR) LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lcrypto CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC) CPPFLAGS64 += $(CPPFLAGS) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label diff --git a/usr/src/lib/policykit/Makefile.com b/usr/src/lib/policykit/Makefile.com index 77f2328313..89fd9296b7 100644 --- a/usr/src/lib/policykit/Makefile.com +++ b/usr/src/lib/policykit/Makefile.com @@ -30,7 +30,7 @@ CPPFLAGS = $(POLICYKIT_DBUS_CPPFLAGS) $(POLICYKIT_GLIB_CPPFLAGS) $(CPPFLAGS.mast CERRWARN += -_gcc=-Wno-unused-variable -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTLIBPCDIR = $(ROOT)/usr/lib/pkgconfig ROOTLIBPC = $(LIBPCSRC:%=$(ROOTLIBPCDIR)/%) diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com index 19240f56a5..3a2d866213 100644 --- a/usr/src/lib/pylibbe/Makefile.com +++ b/usr/src/lib/pylibbe/Makefile.com @@ -38,7 +38,7 @@ PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc) PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) ROOTPYBEFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) LIBS = $(DYNLIB) LDLIBS += -lbe -lnvpair -lc diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com index 7423665381..82bf87d09b 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -37,7 +37,7 @@ PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc) PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) ROOTPYSOLFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LIBS = $(DYNLIB) diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com index 668151416d..59720a8334 100644 --- a/usr/src/lib/pyzfs/Makefile.com +++ b/usr/src/lib/pyzfs/Makefile.com @@ -40,7 +40,7 @@ PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc) PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) ROOTPYZFSFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) -C99MODE= -xc99=%all +CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LIBS = $(DYNLIB) diff --git a/usr/src/lib/scsi/libscsi/Makefile.com b/usr/src/lib/scsi/libscsi/Makefile.com index c9dafcb29b..d8e18b1fb3 100644 --- a/usr/src/lib/scsi/libscsi/Makefile.com +++ b/usr/src/lib/scsi/libscsi/Makefile.com @@ -37,7 +37,7 @@ include ../../../Makefile.lib include ../../Makefile.defs SRCS = $(OBJECTS:%.o=../common/%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CFLAGS += $(CCVERBOSE) diff --git a/usr/src/lib/scsi/libses/Makefile.defs b/usr/src/lib/scsi/libses/Makefile.defs index e3615d0665..91c04eeeec 100644 --- a/usr/src/lib/scsi/libses/Makefile.defs +++ b/usr/src/lib/scsi/libses/Makefile.defs @@ -24,7 +24,7 @@ # SRCS = $(OBJECTS:%.o=../common/%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CFLAGS += $(CCVERBOSE) diff --git a/usr/src/lib/scsi/libsmp/Makefile.com b/usr/src/lib/scsi/libsmp/Makefile.com index 95b666e4fb..428e4e795c 100644 --- a/usr/src/lib/scsi/libsmp/Makefile.com +++ b/usr/src/lib/scsi/libsmp/Makefile.com @@ -36,7 +36,7 @@ include ../../../Makefile.lib include ../../Makefile.defs SRCS = $(OBJECTS:%.o=../common/%.c) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -I../common -I. -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CFLAGS += $(CCVERBOSE) diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine index 8a8941813d..12b742ef1a 100644 --- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine +++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" .KEEP_STATE: .SUFFIXES: @@ -60,7 +59,7 @@ DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln) APIMAP = ../../../../../libscsi/libscsi_api.map -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) CFLAGS += -G $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.lib b/usr/src/lib/scsi/plugins/ses/Makefile.lib index 719463197a..c8bbd52561 100644 --- a/usr/src/lib/scsi/plugins/ses/Makefile.lib +++ b/usr/src/lib/scsi/plugins/ses/Makefile.lib @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" .KEEP_STATE: .SUFFIXES: @@ -70,7 +69,7 @@ DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln) APIMAP = ../../../../libses/libses_api.map -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) CFLAGS += -G $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.lib b/usr/src/lib/scsi/plugins/smp/Makefile.lib index 1b44f8e4a6..3ef898705c 100644 --- a/usr/src/lib/scsi/plugins/smp/Makefile.lib +++ b/usr/src/lib/scsi/plugins/smp/Makefile.lib @@ -68,7 +68,7 @@ DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln) APIMAP = ../../../../libsmp/libsmp_api.map -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) CFLAGS += -G $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) diff --git a/usr/src/lib/smbsrv/Makefile.lib b/usr/src/lib/smbsrv/Makefile.lib index 625bde45c4..a6c75a4ab4 100644 --- a/usr/src/lib/smbsrv/Makefile.lib +++ b/usr/src/lib/smbsrv/Makefile.lib @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" # # Common Makefile definitions for smbsrv. @@ -40,7 +39,7 @@ ROOTLIBDIR64 = $(ROOT)/usr/lib/smbsrv/$(MACH64) SRCDIR= ../common NDLDIR= $(ROOT)/usr/include/smbsrv/ndl LIBS= $(DYNLIB) $(LINTLIB) -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all CPPFLAGS += -I$(SRCDIR) -I. LDLIBS32 += -L$(ROOT)/usr/lib/smbsrv diff --git a/usr/src/psm/stand/bootlst/common/Makefile.com b/usr/src/psm/stand/bootlst/common/Makefile.com index 25043b1c22..87eea5acd7 100644 --- a/usr/src/psm/stand/bootlst/common/Makefile.com +++ b/usr/src/psm/stand/bootlst/common/Makefile.com @@ -59,8 +59,8 @@ CPPINCS += -I$(STANDDIR)/lib/sa CPPFLAGS = $(CPPDEFS) $(CPPINCS) CPPFLAGS += $(CCYFLAG)$(STANDDIR) -C99MODE = $(C99_ENABLE) -CFLAGS = $(CCVERBOSE) -O $(C99MODE) +CSTD = $(CSTD_GNU99) +CFLAGS = $(CCVERBOSE) -O $(CSTD) ASFLAGS = -P -D_ASM $(CPPDEFS) -DLOCORE -D_LOCORE -D__STDC__ AS_CPPFLAGS = $(CPPINCS) $(CPPFLAGS.master) diff --git a/usr/src/psm/stand/cpr/common/Makefile.com b/usr/src/psm/stand/cpr/common/Makefile.com index d5c43bba43..ff5a9504af 100644 --- a/usr/src/psm/stand/cpr/common/Makefile.com +++ b/usr/src/psm/stand/cpr/common/Makefile.com @@ -63,8 +63,8 @@ CPPINCS += -I$(SYSDIR)/sun4 -I$(SYSDIR)/common -I$(TOPDIR)/head CPPFLAGS = $(CPPDEFS) $(CPPINCS) $(CPPFLAGS.master) CPPFLAGS += $(CCYFLAG)$(SYSDIR)/common -C99MODE = $(C99_ENABLE) -CFLAGS = $(CCVERBOSE) -O $(C99MODE) +CSTD = $(CSTD_GNU99) +CFLAGS = $(CCVERBOSE) -O $(CSTD) ASFLAGS = -P -D_ASM $(CPPDEFS) -DLOCORE -D_LOCORE -D__STDC__ AS_CPPFLAGS = $(CPPINCS) $(CPPFLAGS.master) diff --git a/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs b/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs index d0dc303420..28484e9a27 100644 --- a/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs +++ b/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs @@ -32,7 +32,7 @@ OBJS_KCF = $(OBJS_LOCAL) $(OBJS_COMDIR) $(COMMONDIR)/cryptotest_kcf.o SRCS = $(OBJS:%.o=%.c) PKCSLIBS = -lpkcs11 -lcryptoutil -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) CMDS = $(TESTDIR:%=%/$(PROG)) $(CMDS) := FILEMODE = 0555 diff --git a/usr/src/test/libc-tests/tests/Makefile.com b/usr/src/test/libc-tests/tests/Makefile.com index cdcd639620..919e2ac28f 100644 --- a/usr/src/test/libc-tests/tests/Makefile.com +++ b/usr/src/test/libc-tests/tests/Makefile.com @@ -27,7 +27,7 @@ $(BUILD64) PROG64= $(PROG).$(MACH64) $(OBJS_OVERRIDE)SRCS = $(PROG).c ../common/test_common.c -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) LINTFLAGS += -I../common -DARCH=\"ARCH\" -DLINT CPPFLAGS += -I$(ROOT)/usr/include -I../common diff --git a/usr/src/test/libc-tests/tests/select/Makefile b/usr/src/test/libc-tests/tests/select/Makefile index d7d6fa7641..c5b70a03af 100644 --- a/usr/src/test/libc-tests/tests/select/Makefile +++ b/usr/src/test/libc-tests/tests/select/Makefile @@ -22,7 +22,7 @@ ROOTBINDIR = $(ROOTOPTPKG)/bin PROGS= select_test -C99MODE= $(C99_ENABLE) +CSTD= $(CSTD_GNU99) select_test: select_test.c $(LINK64.c) -o $@ select_test.c $(LDLIBS64) diff --git a/usr/src/test/os-tests/tests/file-locking/Makefile b/usr/src/test/os-tests/tests/file-locking/Makefile index d85b20c365..aecf20edb4 100644 --- a/usr/src/test/os-tests/tests/file-locking/Makefile +++ b/usr/src/test/os-tests/tests/file-locking/Makefile @@ -22,7 +22,7 @@ PROGS = \ runtests \ acquire-lock -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) SRCS = $(PROGS:%=%.c) $(UTILS) PROGS32 = $(PROGS:%=%.32) diff --git a/usr/src/test/os-tests/tests/poll/Makefile b/usr/src/test/os-tests/tests/poll/Makefile index 14cc28b056..ae416f9628 100644 --- a/usr/src/test/os-tests/tests/poll/Makefile +++ b/usr/src/test/os-tests/tests/poll/Makefile @@ -23,7 +23,7 @@ SRCS = $(OBJS:%.o=%.c) poll_test := LDLIBS += -lsocket poll_test.ln := LDLIBS += -lsocket -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) ROOTOPTPKG = $(ROOT)/opt/os-tests TESTDIR = $(ROOTOPTPKG)/tests diff --git a/usr/src/test/os-tests/tests/sigqueue/Makefile b/usr/src/test/os-tests/tests/sigqueue/Makefile index a35908a136..a9166a5823 100644 --- a/usr/src/test/os-tests/tests/sigqueue/Makefile +++ b/usr/src/test/os-tests/tests/sigqueue/Makefile @@ -21,7 +21,7 @@ PROG = sigqueue_queue_size OBJS = $(PROG:%=%.o) SRCS = $(OBJS:%.o=%.c) -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) ROOTOPTPKG = $(ROOT)/opt/os-tests TESTDIR = $(ROOTOPTPKG)/tests/sigqueue diff --git a/usr/src/test/os-tests/tests/sockfs/Makefile b/usr/src/test/os-tests/tests/sockfs/Makefile index 08a4b4044b..08aecce191 100644 --- a/usr/src/test/os-tests/tests/sockfs/Makefile +++ b/usr/src/test/os-tests/tests/sockfs/Makefile @@ -22,7 +22,7 @@ PROG = conn dgram drop_priv nosignal sockpair LINTS = $(PROGS:%=%.ln) LDLIBS += -lsocket -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) CPPFLAGS += -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ nosignal := LDLIBS += -lnsl diff --git a/usr/src/test/os-tests/tests/spoof-ras/Makefile b/usr/src/test/os-tests/tests/spoof-ras/Makefile index c629a03594..395505da8c 100644 --- a/usr/src/test/os-tests/tests/spoof-ras/Makefile +++ b/usr/src/test/os-tests/tests/spoof-ras/Makefile @@ -21,7 +21,7 @@ OBJS = $(PROG:%=%.o) SRCS = $(OBJS:%.o=%.c) LDLIBS += -lsocket -lnsl -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) ROOTOPTPKG = $(ROOT)/opt/os-tests TESTDIR = $(ROOTOPTPKG)/tests diff --git a/usr/src/test/zfs-tests/cmd/Makefile.subdirs b/usr/src/test/zfs-tests/cmd/Makefile.subdirs index 0b1a353848..b6cd0d404c 100644 --- a/usr/src/test/zfs-tests/cmd/Makefile.subdirs +++ b/usr/src/test/zfs-tests/cmd/Makefile.subdirs @@ -24,7 +24,7 @@ SRCS = $(OBJS:%.o=%.c) CMDS = $(PROG:%=$(ROOTBIN)/%) $(CMDS) := FILEMODE = 0555 -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 all: $(PROG) diff --git a/usr/src/test/zfs-tests/tests/functional/channel_program/lua_core/Makefile b/usr/src/test/zfs-tests/tests/functional/channel_program/lua_core/Makefile index 21f3ff6c39..b31b9aa135 100644 --- a/usr/src/test/zfs-tests/tests/functional/channel_program/lua_core/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/channel_program/lua_core/Makefile @@ -26,7 +26,7 @@ PROGS = $(KSHPROGS) $(CPROGS) FILES :sh= ls *.zcp *.out *.err LDLIBS = $(LDLIBS.cmd) LDLIBS += -lzfs_core -lnvpair -C99MODE = -xc99=%all +CSTD = $(CSTD_GNU99) INSTPROGS = $(PROGS:%=$(TESTDIR)/%) INSTFILES = $(FILES:%=$(TESTDIR)/%) diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs b/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs index 45b39ef904..91a070369e 100644 --- a/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs +++ b/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs @@ -26,7 +26,7 @@ CMD64 = $(PROG:%=$(TESTDIR)/%.$(MACH64)) CMDS = $(CMD32) $(CMD64) $(CMDS) := FILEMODE = 0555 -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS += -I $(SRC)/uts/common -D_KERNEL LDLIBS += -lmd LINTFLAGS += -u diff --git a/usr/src/tools/btxld/Makefile b/usr/src/tools/btxld/Makefile index 9428eb1620..6165fb6017 100644 --- a/usr/src/tools/btxld/Makefile +++ b/usr/src/tools/btxld/Makefile @@ -27,7 +27,7 @@ MAN1ONBLDFILES= btxld.1onbld 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$(SRC)/uts/common -I$(COMMON_SRC) $(ROOTONBLDMAN1ONBLDFILES) := FILEMODE= 644 diff --git a/usr/src/tools/ctf/cvt/Makefile.com b/usr/src/tools/ctf/cvt/Makefile.com index 5385b3769f..5cdccf6dfc 100644 --- a/usr/src/tools/ctf/cvt/Makefile.com +++ b/usr/src/tools/ctf/cvt/Makefile.com @@ -83,7 +83,7 @@ CERRWARN += -_gcc=-Wno-unused CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-switch -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ctfconvert := LDFLAGS += $(DWARFLDFLAGS) diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts index e847ebd441..a210e48132 100644 --- a/usr/src/uts/Makefile.uts +++ b/usr/src/uts/Makefile.uts @@ -218,7 +218,7 @@ CERRWARN += -_gcc=-Wno-missing-field-initializers $(RELEASE_BUILD)CERRWARN += -_gcc=-Wno-unused $(RELEASE_BUILD)CERRWARN += -_gcc=-Wno-empty-body -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CFLAGS_uts = CFLAGS_uts += $(STAND_FLAGS_$(CLASS)) diff --git a/usr/src/uts/i86pc/Makefile.rules b/usr/src/uts/i86pc/Makefile.rules index 01e0e0d31e..030978fda8 100644 --- a/usr/src/uts/i86pc/Makefile.rules +++ b/usr/src/uts/i86pc/Makefile.rules @@ -223,7 +223,7 @@ DBOOT_MACH_32 = -D_BOOT_TARGET_i386 DBOOT_MACH_64 = -D_BOOT_TARGET_amd64 DBOOT_DEFS = -D_BOOT $(DBOOT_MACH_$(CLASS)) DBOOT_DEFS += -D_MACHDEP -U_KERNEL -D_I32LPx -DBOOT_FLAGS = $(CCVERBOSE) $(C99MODE) $(CERRWARN) $(CCNOAUTOINLINE) +DBOOT_FLAGS = $(CCVERBOSE) $(CSTD) $(CERRWARN) $(CCNOAUTOINLINE) DBOOT_CC_INCL = -I$(SRC)/common -I$(SRC)/common/util $(INCLUDE_PATH) DBOOT_AS_INCL = $(AS_INC_PATH) diff --git a/usr/src/uts/i86xpv/Makefile.rules b/usr/src/uts/i86xpv/Makefile.rules index a7be74569c..df2ff3b3b8 100644 --- a/usr/src/uts/i86xpv/Makefile.rules +++ b/usr/src/uts/i86xpv/Makefile.rules @@ -184,7 +184,7 @@ DBOOT_OBJS_DIR= dboot/$(OBJS_DIR) DBOOT_XARCH_32 = $(i386_XARCH) DBOOT_XARCH_64 = $(amd64_XARCH) -DBOOT_CFLAGS = $(DBOOT_XARCH_$(CLASS)) $(C99MODE) $(CERRWARN) \ +DBOOT_CFLAGS = $(DBOOT_XARCH_$(CLASS)) $(CSTD) $(CERRWARN) \ $(CCNOAUTOINLINE) -O DBOOT_AS_XARCH_32 = $(i386_AS_XARCH) 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 # diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc index 60e2a3a34e..b1f06de520 100644 --- a/usr/src/uts/sparc/Makefile.sparc +++ b/usr/src/uts/sparc/Makefile.sparc @@ -137,7 +137,7 @@ CFLAGS += $(CCMODE) CFLAGS += $(SPACEFLAG) CFLAGS += $(CERRWARN) CFLAGS += $(CTF_FLAGS_$(CLASS)) -CFLAGS += $(C99MODE) +CFLAGS += $(CSTD) CFLAGS += $(CCUNBOUND) CFLAGS += $(CCSTATICSYM) CFLAGS += $(CC32BITCALLERS) diff --git a/usr/src/uts/sparc/bnxe/Makefile b/usr/src/uts/sparc/bnxe/Makefile index d8e2b3ac60..ba59f51fee 100644 --- a/usr/src/uts/sparc/bnxe/Makefile +++ b/usr/src/uts/sparc/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/sparc/chxge/Makefile b/usr/src/uts/sparc/chxge/Makefile index 90c194aa9f..2a19c82e25 100644 --- a/usr/src/uts/sparc/chxge/Makefile +++ b/usr/src/uts/sparc/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/sparc/dca/Makefile b/usr/src/uts/sparc/dca/Makefile index f4420ccd16..1f4c8a7b2e 100644 --- a/usr/src/uts/sparc/dca/Makefile +++ b/usr/src/uts/sparc/dca/Makefile @@ -62,7 +62,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE) # lint pass one enforcement # CFLAGS += $(CCVERBOSE) -CFLAGS += $(C99_ENABLE) # # For now, disable these lint checks; maintainers should endeavor diff --git a/usr/src/uts/sparc/fct/Makefile b/usr/src/uts/sparc/fct/Makefile index 3281db0d10..b61a18873d 100644 --- a/usr/src/uts/sparc/fct/Makefile +++ b/usr/src/uts/sparc/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/sparc/iscsit/Makefile b/usr/src/uts/sparc/iscsit/Makefile index 1d61a81d72..73b9139ec9 100644 --- a/usr/src/uts/sparc/iscsit/Makefile +++ b/usr/src/uts/sparc/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/sparc/nsmb/Makefile b/usr/src/uts/sparc/nsmb/Makefile index 79515e3de4..7100a34dd9 100644 --- a/usr/src/uts/sparc/nsmb/Makefile +++ b/usr/src/uts/sparc/nsmb/Makefile @@ -87,7 +87,6 @@ INSTALL_TARGET_obj64 = $(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/sparc/pppt/Makefile b/usr/src/uts/sparc/pppt/Makefile index 78f8e8b7f7..f492a4d1b0 100644 --- a/usr/src/uts/sparc/pppt/Makefile +++ b/usr/src/uts/sparc/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/sparc/qlge/Makefile b/usr/src/uts/sparc/qlge/Makefile index 3883358dbf..d9951b0d1a 100644 --- a/usr/src/uts/sparc/qlge/Makefile +++ b/usr/src/uts/sparc/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/sparc/qlt/Makefile b/usr/src/uts/sparc/qlt/Makefile index 171ba3631d..f145c2e880 100644 --- a/usr/src/uts/sparc/qlt/Makefile +++ b/usr/src/uts/sparc/qlt/Makefile @@ -59,7 +59,6 @@ MODSTUBS_DIR = $(OBJS_DIR) LDFLAGS += -dy -Ndrv/fct -Ndrv/stmf CFLAGS += -DUNIQUE_FW_NAME -C99MODE= -xc99=%all C99LMODE= -Xc99=%all # diff --git a/usr/src/uts/sparc/sfe/Makefile b/usr/src/uts/sparc/sfe/Makefile index c01fa6ade3..235f9df0b7 100644 --- a/usr/src/uts/sparc/sfe/Makefile +++ b/usr/src/uts/sparc/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/sparc/smbfs/Makefile b/usr/src/uts/sparc/smbfs/Makefile index 88ad9dd4ef..9525c70171 100644 --- a/usr/src/uts/sparc/smbfs/Makefile +++ b/usr/src/uts/sparc/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/sparc/srpt/Makefile b/usr/src/uts/sparc/srpt/Makefile index 7c83e44453..424e85470e 100644 --- a/usr/src/uts/sparc/srpt/Makefile +++ b/usr/src/uts/sparc/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/sparc/stmf/Makefile b/usr/src/uts/sparc/stmf/Makefile index 1e45739dbb..50ec544cbb 100644 --- a/usr/src/uts/sparc/stmf/Makefile +++ b/usr/src/uts/sparc/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/sparc/stmf_sbd/Makefile b/usr/src/uts/sparc/stmf_sbd/Makefile index ac64b10708..4259f16b69 100644 --- a/usr/src/uts/sparc/stmf_sbd/Makefile +++ b/usr/src/uts/sparc/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/sparc/xge/Makefile b/usr/src/uts/sparc/xge/Makefile index d9d3ce531c..422a552783 100644 --- a/usr/src/uts/sparc/xge/Makefile +++ b/usr/src/uts/sparc/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/sparc/zfs/Makefile b/usr/src/uts/sparc/zfs/Makefile index f9d5d42165..f32b408306 100644 --- a/usr/src/uts/sparc/zfs/Makefile +++ b/usr/src/uts/sparc/zfs/Makefile @@ -75,7 +75,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/sparc/zut/Makefile b/usr/src/uts/sparc/zut/Makefile index 7df92bc696..23db5c4405 100644 --- a/usr/src/uts/sparc/zut/Makefile +++ b/usr/src/uts/sparc/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 # diff --git a/usr/src/uts/sun4u/Makefile.sun4u b/usr/src/uts/sun4u/Makefile.sun4u index a34dbed5de..d2b2b5cba7 100644 --- a/usr/src/uts/sun4u/Makefile.sun4u +++ b/usr/src/uts/sun4u/Makefile.sun4u @@ -204,7 +204,7 @@ CFLAGS += $(CCMODE) CFLAGS += $(SPACEFLAG) CFLAGS += $(CERRWARN) CFLAGS += $(CTF_FLAGS_$(CLASS)) -CFLAGS += $(C99MODE) +CFLAGS += $(CSTD) CFLAGS += $(CCUNBOUND) CFLAGS += $(CCNOAUTOINLINE) CFLAGS += $(CCSTATICSYM) diff --git a/usr/src/uts/sun4v/Makefile.sun4v b/usr/src/uts/sun4v/Makefile.sun4v index 14246eb05a..3a1b469d21 100644 --- a/usr/src/uts/sun4v/Makefile.sun4v +++ b/usr/src/uts/sun4v/Makefile.sun4v @@ -181,7 +181,7 @@ CFLAGS += $(CCMODE) CFLAGS += $(SPACEFLAG) CFLAGS += $(CERRWARN) CFLAGS += $(CTF_FLAGS_$(CLASS)) -CFLAGS += $(C99MODE) +CFLAGS += $(CSTD) CFLAGS += $(CCUNBOUND) CFLAGS += $(CCNOAUTOINLINE) CFLAGS += $(CCSTATICSYM) diff --git a/usr/src/uts/sun4v/vsw/Makefile b/usr/src/uts/sun4v/vsw/Makefile index 6e093ce7f0..bbc07208ef 100644 --- a/usr/src/uts/sun4v/vsw/Makefile +++ b/usr/src/uts/sun4v/vsw/Makefile @@ -75,17 +75,6 @@ CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -Nmisc/ldc -Nmisc/mac -Nmisc/platsvc # -# Re-enable C99 compilation to use stack allocation of variable-sized arrays. -# According to usr/src/uts/Makefile.uts, C99 is disabled until a problem seen -# on x86 machines can be fully diagnosed; presumably a sun4v (i.e., SPARC) -# module should be "safe". Furthermore, only the variable-sized array -# extension is needed/used. -# -# C99 mode also gives us macros such as __func__ -# -C99MODE = $(99_ENABLE) - -# # For now, disable these lint checks; maintainers should endeavor # to investigate and remove these for maximum lint coverage. # Please do not carry these forward to new Makefiles. |