summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorYuri Pankov <ypankov@tintri.com>2021-04-09 13:43:22 +0300
committerRobert Mustacchi <rm@fingolfin.org>2021-11-05 10:53:17 -0700
commit1e8d79d21400b4e47d64ce367181e7e5ce992649 (patch)
treec305631f03777994ebe47ec5497f45ec66ff95c6 /usr
parent6538c7b4c76e1d53fc801540cfe1dfe59d26bf29 (diff)
downloadillumos-joyent-1e8d79d21400b4e47d64ce367181e7e5ce992649.tar.gz
13707 remove C99LMODE cruft
13708 remove lint cruft from Makefile.master Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Andy Fiddaman <andy@omnios.org> Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr')
-rw-r--r--usr/src/Makefile.master52
-rw-r--r--usr/src/Makefile.master.644
-rw-r--r--usr/src/cmd/ctfdump/Makefile3
-rw-r--r--usr/src/cmd/file/Makefile3
-rw-r--r--usr/src/cmd/fs.d/ufs/fsck/Makefile24
-rw-r--r--usr/src/cmd/mdb/Makefile.libstandctf1
-rw-r--r--usr/src/cmd/mdb/Makefile.mdb34
-rw-r--r--usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile4
-rw-r--r--usr/src/cmd/mdb/intel/amd64/libmlsvc/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/amd64/libzpool/Makefile4
-rw-r--r--usr/src/cmd/mdb/intel/amd64/qlc/Makefile4
-rw-r--r--usr/src/cmd/mdb/intel/amd64/srpt/Makefile1
-rw-r--r--usr/src/cmd/mdb/intel/amd64/zfs/Makefile1
-rw-r--r--usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile4
-rw-r--r--usr/src/cmd/mdb/intel/ia32/libmlsvc/Makefile2
-rw-r--r--usr/src/cmd/mdb/intel/ia32/libzpool/Makefile4
-rw-r--r--usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile1
-rw-r--r--usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile4
-rw-r--r--usr/src/cmd/mdb/sparc/v7/libmlsvc/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v7/libzpool/Makefile4
-rw-r--r--usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile4
-rw-r--r--usr/src/cmd/mdb/sparc/v9/libmlsvc/Makefile2
-rw-r--r--usr/src/cmd/mdb/sparc/v9/libzpool/Makefile4
-rw-r--r--usr/src/cmd/mdb/sparc/v9/qlc/Makefile4
-rw-r--r--usr/src/cmd/mdb/sparc/v9/srpt/Makefile1
-rw-r--r--usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile1
-rw-r--r--usr/src/cmd/mdb/sparc/v9/zfs/Makefile1
-rw-r--r--usr/src/cmd/od/Makefile9
-rw-r--r--usr/src/cmd/smbsrv/Makefile.smbsrv.defs3
-rw-r--r--usr/src/cmd/smbsrv/fksmbd/Makefile8
-rw-r--r--usr/src/cmd/smbsrv/smbd/Makefile6
-rw-r--r--usr/src/cmd/smbsrv/test-msgbuf/Makefile8
-rw-r--r--usr/src/cmd/tail/Makefile4
-rw-r--r--usr/src/cmd/tr/Makefile4
-rwxr-xr-xusr/src/cmd/vscan/vscanadm/Makefile3
-rw-r--r--usr/src/cmd/vscan/vscand/Makefile4
-rw-r--r--usr/src/cmd/zstreamdump/Makefile7
-rw-r--r--usr/src/lib/libppt/Makefile.com1
-rw-r--r--usr/src/tools/ctf/ctfdump/Makefile.com3
-rw-r--r--usr/src/tools/ctf/libctf/Makefile.com1
-rw-r--r--usr/src/uts/i86pc/acpi_drv/Makefile5
-rw-r--r--usr/src/uts/intel/bnx/Makefile3
-rw-r--r--usr/src/uts/intel/bnxe/Makefile2
-rw-r--r--usr/src/uts/intel/ctf/Makefile2
-rw-r--r--usr/src/uts/intel/fct/Makefile2
-rw-r--r--usr/src/uts/intel/iscsit/Makefile2
-rw-r--r--usr/src/uts/intel/pppt/Makefile2
-rw-r--r--usr/src/uts/intel/qlge/Makefile2
-rw-r--r--usr/src/uts/intel/qlt/Makefile2
-rw-r--r--usr/src/uts/intel/srpt/Makefile2
-rw-r--r--usr/src/uts/intel/stmf/Makefile2
-rw-r--r--usr/src/uts/intel/stmf_sbd/Makefile2
-rw-r--r--usr/src/uts/intel/zfs/Makefile2
-rw-r--r--usr/src/uts/intel/zut/Makefile2
-rw-r--r--usr/src/uts/sparc/bnxe/Makefile2
-rw-r--r--usr/src/uts/sparc/ctf/Makefile2
-rw-r--r--usr/src/uts/sparc/fct/Makefile2
-rw-r--r--usr/src/uts/sparc/iscsit/Makefile2
-rw-r--r--usr/src/uts/sparc/pppt/Makefile2
-rw-r--r--usr/src/uts/sparc/qlge/Makefile2
-rw-r--r--usr/src/uts/sparc/qlt/Makefile2
-rw-r--r--usr/src/uts/sparc/srpt/Makefile2
-rw-r--r--usr/src/uts/sparc/stmf/Makefile2
-rw-r--r--usr/src/uts/sparc/stmf_sbd/Makefile2
-rw-r--r--usr/src/uts/sparc/zfs/Makefile2
-rw-r--r--usr/src/uts/sparc/zut/Makefile2
66 files changed, 9 insertions, 283 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index d4c6553024..72b20afaa0 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -523,11 +523,10 @@ CCERRWARN += -_gcc=-Wno-unknown-pragmas
CCERRWARN += -_gcc=-Wno-unused-parameter
CCERRWARN += -_gcc=-Wno-missing-field-initializers
-# C standard. Keep Studio flags until we get rid of lint.
+# C standard
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).
@@ -872,41 +871,6 @@ LINK.cc= $(CCC) $(CCFLAGS) $(CPPFLAGS) $(NORUNPATH) \
LINK64.cc= $(CCC) $(CCFLAGS64) $(CPPFLAGS) $(NORUNPATH) \
$(LDFLAGS) $(CCNEEDED64) $(LDCHECKS)
-#
-# lint macros
-#
-# Note that the undefine of __PRAGMA_REDEFINE_EXTNAME can be removed once
-# ON is built with a version of lint that has the fix for 4484186.
-#
-ALWAYS_LINT_DEFS = -errtags=yes -s
-ALWAYS_LINT_DEFS += -erroff=E_PTRDIFF_OVERFLOW
-ALWAYS_LINT_DEFS += -erroff=E_ASSIGN_NARROW_CONV
-ALWAYS_LINT_DEFS += -U__PRAGMA_REDEFINE_EXTNAME
-ALWAYS_LINT_DEFS += $(C99LMODE)
-ALWAYS_LINT_DEFS += -errsecurity=$(SECLEVEL)
-ALWAYS_LINT_DEFS += -erroff=E_SEC_CREAT_WITHOUT_EXCL
-ALWAYS_LINT_DEFS += -erroff=E_SEC_FORBIDDEN_WARN_CREAT
-# XX64 -- really only needed for amd64 lint
-ALWAYS_LINT_DEFS += -erroff=E_ASSIGN_INT_TO_SMALL_INT
-ALWAYS_LINT_DEFS += -erroff=E_CAST_INT_CONST_TO_SMALL_INT
-ALWAYS_LINT_DEFS += -erroff=E_CAST_INT_TO_SMALL_INT
-ALWAYS_LINT_DEFS += -erroff=E_CAST_TO_PTR_FROM_INT
-ALWAYS_LINT_DEFS += -erroff=E_COMP_INT_WITH_LARGE_INT
-ALWAYS_LINT_DEFS += -erroff=E_INTEGRAL_CONST_EXP_EXPECTED
-ALWAYS_LINT_DEFS += -erroff=E_PASS_INT_TO_SMALL_INT
-ALWAYS_LINT_DEFS += -erroff=E_PTR_CONV_LOSES_BITS
-
-# This forces lint to pick up note.h and sys/note.h from Devpro rather than
-# from the proto area. The note.h that ON delivers would disable NOTE().
-ONLY_LINT_DEFS = -I$(SPRO_VROOT)/prod/include/lint
-
-SECLEVEL= core
-LINT.c= $(LINT) $(ONLY_LINT_DEFS) $(LINTFLAGS) $(CPPFLAGS) \
- $(ALWAYS_LINT_DEFS)
-LINT64.c= $(LINT) $(ONLY_LINT_DEFS) $(LINTFLAGS64) $(CPPFLAGS) \
- $(ALWAYS_LINT_DEFS)
-LINT.s= $(LINT.c)
-
# For some future builds, NATIVE_MACH and MACH might be different.
# Therefore, NATIVE_MACH needs to be redefined in the
# environment as `uname -p` to override this macro.
@@ -935,13 +899,6 @@ CW_CCC_COMPILERS= $(PRIMARY_CCC:%=--primary %) $(SHADOW_CCCS:%=--shadow %)
CW_LINKER= --linker $(LD)
-# Till SS12u1 formally becomes the NV CBE, LINT is hard
-# coded to be picked up from the $SPRO_ROOT/sunstudio12.1/
-# location. Impacted variables are sparc_LINT, sparcv9_LINT,
-# i386_LINT, amd64_LINT.
-# Reset them when SS12u1 is rolled out.
-#
-
# Specify platform compiler versions for languages
# that we use (currently only c and c++).
#
@@ -951,18 +908,15 @@ BUILD_CC= $(CW) $(CW_LINKER) $(CW_CC_COMPILERS) --
BUILD_CCC= $(CW) -C $(CW_LINKER) $(CW_CCC_COMPILERS) --
BUILD_CPP= /usr/ccs/lib/cpp
BUILD_LD= $(ONBLD_TOOLS)/bin/$(MACH)/ld
-BUILD_LINT= $(SPRO_ROOT)/sunstudio12.1/bin/lint
$(MACH)_CC= $(BUILD_CC)
$(MACH)_CCC= $(BUILD_CCC)
$(MACH)_CPP= $(BUILD_CPP)
$(MACH)_LD= $(BUILD_LD)
-$(MACH)_LINT= $(BUILD_LINT)
$(MACH64)_CC= $(BUILD_CC)
$(MACH64)_CCC= $(BUILD_CCC)
$(MACH64)_CPP= $(BUILD_CPP)
$(MACH64)_LD= $(BUILD_LD)
-$(MACH64)_LINT= $(BUILD_LINT)
sparc_AS= /usr/ccs/bin/as -xregsym=no
sparcv9_AS= $($(MACH)_AS)
@@ -976,14 +930,12 @@ NATIVECCC= $($(NATIVE_MACH)_CCC)
NATIVECPP= $($(NATIVE_MACH)_CPP)
NATIVEAS= $($(NATIVE_MACH)_AS)
NATIVELD= $($(NATIVE_MACH)_LD)
-NATIVELINT= $($(NATIVE_MACH)_LINT)
NATIVECC64= $($(NATIVE_MACH64)_CC)
NATIVECCC64= $($(NATIVE_MACH64)_CCC)
NATIVECPP64= $($(NATIVE_MACH64)_CPP)
NATIVEAS64= $($(NATIVE_MACH64)_AS)
NATIVELD64= $($(NATIVE_MACH64)_LD)
-NATIVELINT64= $($(NATIVE_MACH64)_LINT)
#
# Makefile.master.64 overrides these settings
@@ -993,14 +945,12 @@ CCC= $(NATIVECCC)
CPP= $(NATIVECPP)
AS= $(NATIVEAS)
LD= $(NATIVELD)
-LINT= $(NATIVELINT)
CC64= $(NATIVECC64)
CCC64= $(NATIVECCC64)
CPP64= $(NATIVECPP64)
AS64= $(NATIVEAS64)
LD64= $(NATIVELD64)
-LINT64= $(NATIVELINT64)
# Pass -Y flag to cpp (method of which is release-dependent)
CCYFLAG= -Y I,
diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64
index 8cd12e5899..f203e4cce4 100644
--- a/usr/src/Makefile.master.64
+++ b/usr/src/Makefile.master.64
@@ -38,7 +38,6 @@ COMPILE.d= $(COMPILE64.d)
COMPILE.b= $(COMPILE64.b)
LINK.c= $(LINK64.c)
LINK.cc= $(LINK64.cc)
-LINT.c= $(LINT64.c)
NATIVE_CFLAGS= $(NATIVE_CFLAGS64)
NATIVE_CCFLAGS= $(NATIVE_CCFLAGS64)
@@ -58,14 +57,13 @@ LDLIBS.lib = $(LDLIBS64)
GCCLIBDIR= $(GCCLIBDIR64)
#
-# Override Makefile.master's settings of CC, CCC, AS and LINT
+# Override Makefile.master's settings
#
CC= $(CC64)
CCC= $(CCC64)
CPP= $(CPP64)
AS= $(AS64)
LD= $(LD64)
-LINT= $(LINT64)
NATIVECC= $(NATIVECC64)
NATIVECCC= $(NATIVECCC64)
NATIVECPP= $(NATIVECPP64)
diff --git a/usr/src/cmd/ctfdump/Makefile b/usr/src/cmd/ctfdump/Makefile
index 37a1ef4cc8..9d76d6675e 100644
--- a/usr/src/cmd/ctfdump/Makefile
+++ b/usr/src/cmd/ctfdump/Makefile
@@ -21,7 +21,6 @@ CFLAGS += $(CCVERBOSE)
LDLIBS += -lctf
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
.KEEP_STATE:
@@ -31,6 +30,4 @@ install: all $(ROOTPROG)
clean:
-lint: lint_PROG
-
include ../Makefile.targ
diff --git a/usr/src/cmd/file/Makefile b/usr/src/cmd/file/Makefile
index e11a4c0259..7236967e91 100644
--- a/usr/src/cmd/file/Makefile
+++ b/usr/src/cmd/file/Makefile
@@ -39,7 +39,6 @@ SRCS= file.c elf_read.c magicutils.c $(ELFCAP)/elfcap.c
include ../Makefile.cmd
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-type-limits
@@ -107,6 +106,4 @@ install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTETCMAGIC)
clean:
$(RM) $(OBJS) $(XPG4OBJS)
-lint: lint_SRCS
-
include ../Makefile.targ
diff --git a/usr/src/cmd/fs.d/ufs/fsck/Makefile b/usr/src/cmd/fs.d/ufs/fsck/Makefile
index 3c3724644c..bdeaf8e616 100644
--- a/usr/src/cmd/fs.d/ufs/fsck/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fsck/Makefile
@@ -62,29 +62,7 @@ $(LIBPROG): $(OBJS)
%.o: $(UFSDIR)/%.c
$(COMPILE.c) $< $(CTFCONVERT_HOOK)
-# Use DEVLINTFLAGS and the definition of LINT.c below for development
-# checking. Prior to putback, increase Nlevel to 4 for extra sanity.
-# Nlevel=2 is the default applied by lint.
-#
-# Remember to comment LINT.c out before doing the putback, as we shouldn't
-# be overriding the top-level settings under normal circumstances.
-#
-# Note that you have to have a proto area with populated usr/include and
-# usr/include/sys (or the parent workspace needs it). Otherwise lint gets
-# very confused. Unfortunately, we also have to tell it where its own
-# include directory is, or it gets the wrong version of note.h.
-
-SECLEVEL=core
-DEVLINTFLAGS = -errtags=yes -U__PRAGMA_REDEFINE_EXTNAME \
- $(C99LMODE) -errsecurity=$(SECLEVEL) \
- -x -Nlevel=2 \
- -I/net/tools-sparc/export/tools.sparc/on10-tools/SUNWspro/SOS8/prod/include/lint
-
-#LINT.c= $(LINT) $(DEVLINTFLAGS) $(CPPFLAGS)
-
-lint: lint_SRCS
-
-clean:
+clean:
$(RM) $(FSCKOBJS) $(UFSOBJS)
cscope.out tags: FRC
diff --git a/usr/src/cmd/mdb/Makefile.libstandctf b/usr/src/cmd/mdb/Makefile.libstandctf
index bab6231894..29803862a4 100644
--- a/usr/src/cmd/mdb/Makefile.libstandctf
+++ b/usr/src/cmd/mdb/Makefile.libstandctf
@@ -48,7 +48,6 @@ CPPFLAGS += -I$(SRC)/common/ctf -I../../../common -DCTF_OLD_VERSIONS -D_MDB \
-Dvsnprintf=ctf_vsnprintf -Dassfail=kmdb_prom_assfail
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
#
# We cannot currently use the stack protector in the kmdb standalone
diff --git a/usr/src/cmd/mdb/Makefile.mdb b/usr/src/cmd/mdb/Makefile.mdb
index 5772bed1fd..18770e87e0 100644
--- a/usr/src/cmd/mdb/Makefile.mdb
+++ b/usr/src/cmd/mdb/Makefile.mdb
@@ -99,7 +99,6 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
CPPFLAGS += -D_MDB -I. -I../.. -I../../../common
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
LDLIBS += -lcurses -lkvm -lproc -lrtld_db -lctf -lumem -ldisasm -lscf
LDLIBS += -ldemangle-sys
@@ -111,14 +110,6 @@ CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
-#
-# -erroff=E_INCONS_ARG_DECL2 works around a problem where lint gets confused
-# about how struct mdb_tgt_gregset is used in mdb_tgt_stack_f() and
-# mdb_tgt_stack_iter_f(). Will be resolved as part of fix for CR 6749868.
-#
-LINTFLAGS += -n -errtags=yes -erroff=E_INCONS_ARG_DECL2
-LINTFILES = $(SRCS:%.c=%.ln)
-
PROG = mdb
OBJS = $(SRCS:%.c=%.o) mdb_lex.o mdb_grammar.o
@@ -128,7 +119,7 @@ ROOTLINK32 = $(LINK:%=$(ROOTBIN32)/%)
ROOTLINK64 = $(LINK:%=$(ROOTBIN64)/%)
.NO_PARALLEL:
-.PARALLEL: $(OBJS) $(LINTFILES)
+.PARALLEL: $(OBJS)
all: $(PROG)
@@ -181,32 +172,11 @@ ffs.o ffs.ln := CPPFLAGS += -Dffs=mdb_ffs
$(COMPILE.c) $<
$(CTFCONVERT_O)
-clean.lint:
- $(RM) $(LINTFILES)
-
clean:
$(RM) $(OBJS)
$(RM) mdb_lex.c mdb_grammar.c mdb_grammar.h y.tab.h y.tab.c y.output
-clobber: clean clean.lint
+clobber: clean
$(RM) $(PROG)
-%.ln: ../../../common/mdb/%.c
- $(LINT.c) -c $<
-
-%.ln: ../../mdb/%.c
- $(LINT.c) -c $<
-
-%.ln: %.c
- $(LINT.c) -c $<
-
-%.ln: $(SRC)/common/net/util/%.c
- $(LINT.c) -c $<
-
-%.ln: $(SRC)/common/util/%.c
- $(LINT.c) -c $<
-
-lint: $(LINTFILES)
- $(LINT) $(LINTFLAGS) $(LINTFILES)
-
dmods:
diff --git a/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile b/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile
index e22390b335..2d71c1c626 100644
--- a/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile
@@ -46,11 +46,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common
CPPFLAGS += -I../../../../../uts/common
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
dmod/%.o: $(GENUNIX_DIR)/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-dmod/%.ln: $(GENUNIX_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/intel/amd64/libmlsvc/Makefile b/usr/src/cmd/mdb/intel/amd64/libmlsvc/Makefile
index 33157930f7..ed27cc29bd 100644
--- a/usr/src/cmd/mdb/intel/amd64/libmlsvc/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libmlsvc/Makefile
@@ -42,5 +42,3 @@ MODSRCS_DIR = ../../../common/modules/libmlsvc
CPPFLAGS += -I$(SRC)/uts/common
CSTD= $(CSTD_GNU99)
-C99MODE= -xc99=%all
-C99LMODE= -Xc99=%all
diff --git a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile
index b5bbd8467b..4f0c91b550 100644
--- a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile
@@ -46,13 +46,9 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \
-I../../../../../common/zfs
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-type-limits
dmod/%.o: $(GENUNIX_DIR)/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-dmod/%.ln: $(GENUNIX_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile
index d83124d648..1e1ab1beec 100644
--- a/usr/src/cmd/mdb/intel/amd64/qlc/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/qlc/Makefile
@@ -38,10 +38,6 @@ CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel
CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/fca/qlc
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
-
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-address
diff --git a/usr/src/cmd/mdb/intel/amd64/srpt/Makefile b/usr/src/cmd/mdb/intel/amd64/srpt/Makefile
index 94ea5e7130..4f3a088937 100644
--- a/usr/src/cmd/mdb/intel/amd64/srpt/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/srpt/Makefile
@@ -40,4 +40,3 @@ include ../../../Makefile.module
CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(SRPTBASE)
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 4ffa954410..e9a9985b28 100644
--- a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile
@@ -42,6 +42,5 @@ CPPFLAGS += -I../../../../../uts/common/fs/zfs/lua
CPPFLAGS += -I../../../../../common/zfs
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 cdc9c5d335..0cc681c694 100644
--- a/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/libfksmbsrv/Makefile
@@ -45,11 +45,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common
CPPFLAGS += -I../../../../../uts/common
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
dmod/%.o: $(GENUNIX_DIR)/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-dmod/%.ln: $(GENUNIX_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/intel/ia32/libmlsvc/Makefile b/usr/src/cmd/mdb/intel/ia32/libmlsvc/Makefile
index 0d889ab4ab..a3d4e11e1f 100644
--- a/usr/src/cmd/mdb/intel/ia32/libmlsvc/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/libmlsvc/Makefile
@@ -41,5 +41,3 @@ MODSRCS_DIR = ../../../common/modules/libmlsvc
CPPFLAGS += -I$(SRC)/uts/common
CSTD= $(CSTD_GNU99)
-C99MODE= -xc99=%all
-C99LMODE= -Xc99=%all
diff --git a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile
index c19d9c56a5..1507bd38d9 100644
--- a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile
@@ -47,13 +47,9 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \
-I../../../../../common/zfs
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-type-limits
dmod/%.o: $(GENUNIX_DIR)/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-dmod/%.ln: $(GENUNIX_DIR)/%.c
- $(LINT.c) -c $<
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 bae116d95e..c184013fef 100644
--- a/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile
+++ b/usr/src/cmd/mdb/intel/modules/mdb_kb/amd64/Makefile
@@ -35,7 +35,6 @@ include ../../../../intel/Makefile.amd64
include ../../../../Makefile.module
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CPPFLAGS += -DMP -D_MACHDEP -D_MDB -D__xpv
CPPFLAGS += -U_KERNEL -D_KMEMUSER
diff --git a/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile b/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile
index 1ff6f2bca4..a7d454669d 100644
--- a/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile
+++ b/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile
@@ -47,11 +47,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common
CPPFLAGS += -I../../../../../uts/common
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
dmod/%.o: $(GENUNIX_DIR)/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-dmod/%.ln: $(GENUNIX_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v7/libmlsvc/Makefile b/usr/src/cmd/mdb/sparc/v7/libmlsvc/Makefile
index 047773589a..715093e443 100644
--- a/usr/src/cmd/mdb/sparc/v7/libmlsvc/Makefile
+++ b/usr/src/cmd/mdb/sparc/v7/libmlsvc/Makefile
@@ -42,5 +42,3 @@ MODSRCS_DIR = ../../../common/modules/libmlsvc
CPPFLAGS += -I$(SRC)/uts/common
CSTD= $(CSTD_GNU99)
-C99MODE= -xc99=%all
-C99LMODE= -Xc99=%all
diff --git a/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile b/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile
index 5b24c538e4..0e94002bd0 100644
--- a/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile
+++ b/usr/src/cmd/mdb/sparc/v7/libzpool/Makefile
@@ -45,13 +45,9 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \
-I../../../../../common/zfs
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-type-limits
dmod/%.o: $(GENUNIX_DIR)/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-dmod/%.ln: $(GENUNIX_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile b/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile
index 2c3589005e..4be3d997e0 100644
--- a/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile
@@ -48,11 +48,7 @@ CPPFLAGS.first += -I../../../../../lib/libfakekernel/common
CPPFLAGS += -I../../../../../uts/common
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
dmod/%.o: $(GENUNIX_DIR)/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-dmod/%.ln: $(GENUNIX_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v9/libmlsvc/Makefile b/usr/src/cmd/mdb/sparc/v9/libmlsvc/Makefile
index 0144f56208..01d5ede4eb 100644
--- a/usr/src/cmd/mdb/sparc/v9/libmlsvc/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libmlsvc/Makefile
@@ -43,5 +43,3 @@ MODSRCS_DIR = ../../../common/modules/libmlsvc
CPPFLAGS += -I$(SRC)/uts/common
CSTD= $(CSTD_GNU99)
-C99MODE= -xc99=%all
-C99LMODE= -Xc99=%all
diff --git a/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile b/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile
index f512dc4c10..eba6fbfd5b 100644
--- a/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libzpool/Makefile
@@ -46,13 +46,9 @@ CPPFLAGS += -I../../../../../lib/libzpool/common \
-I../../../../../common/zfs
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-type-limits
dmod/%.o: $(GENUNIX_DIR)/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-dmod/%.ln: $(GENUNIX_DIR)/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v9/qlc/Makefile b/usr/src/cmd/mdb/sparc/v9/qlc/Makefile
index 926d1a809a..9bfb4fe5b4 100644
--- a/usr/src/cmd/mdb/sparc/v9/qlc/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/qlc/Makefile
@@ -38,10 +38,6 @@ CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel
CPPFLAGS += -I$(SRC)/uts/common/sys/fibre-channel/fca/qlc
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
-
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-address
diff --git a/usr/src/cmd/mdb/sparc/v9/srpt/Makefile b/usr/src/cmd/mdb/sparc/v9/srpt/Makefile
index 75448c947d..987cdbf5b4 100644
--- a/usr/src/cmd/mdb/sparc/v9/srpt/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/srpt/Makefile
@@ -40,4 +40,3 @@ include ../../../Makefile.module
CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(SRPTBASE)
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 7a15e833f6..d7fa4d8769 100644
--- a/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/stmf_sbd/Makefile
@@ -39,4 +39,3 @@ include ../../../Makefile.module
CPPFLAGS += -I$(UTSBASE)/common -I$(UTSBASE)/common/sys -I$(STMFSBDBASE)
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 e2407effa9..b105a86b4f 100644
--- a/usr/src/cmd/mdb/sparc/v9/zfs/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/zfs/Makefile
@@ -42,6 +42,5 @@ CPPFLAGS += -I../../../../../uts/common/fs/zfs/lua
CPPFLAGS += -I../../../../../common/zfs
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CERRWARN += -_gcc=-Wno-type-limits
diff --git a/usr/src/cmd/od/Makefile b/usr/src/cmd/od/Makefile
index 6f449c96d1..62799f2962 100644
--- a/usr/src/cmd/od/Makefile
+++ b/usr/src/cmd/od/Makefile
@@ -12,6 +12,7 @@
#
# Copyright 2010 Nexenta Systems, Inc. All rights reserved.
#
+
PROG= od
XPG4PROG= $(PROG)
@@ -22,11 +23,9 @@ include ../Makefile.cmd
CLOBBERFILES= $(PROG)
-
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
+
CPPFLAGS += -D__EXTENSIONS__ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-LINTFLAGS += -D__EXTENSIONS__
# install rules
$(ROOTINC)/% : %
@@ -36,7 +35,7 @@ $(ROOTINC)/% : %
.PARALLEL: $(OBJS)
-all: $(PROG)
+all: $(PROG)
$(PROG): $(OBJS)
$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
@@ -48,8 +47,6 @@ $(ROOTXPG4PROG):
-$(RM) $@
-$(LN) -s ../../bin/$(PROG) $@
-lint: lint_SRCS
-
clean:
$(RM) $(OBJS)
diff --git a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs
index 050a8e6255..f6da533cfc 100644
--- a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs
+++ b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs
@@ -29,10 +29,7 @@
OBJS= $(SRCS:%.c=%.o)
-LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-
CFLAGS += $(CCVERBOSE)
$(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
diff --git a/usr/src/cmd/smbsrv/fksmbd/Makefile b/usr/src/cmd/smbsrv/fksmbd/Makefile
index 61b8758011..b6ba5d1938 100644
--- a/usr/src/cmd/smbsrv/fksmbd/Makefile
+++ b/usr/src/cmd/smbsrv/fksmbd/Makefile
@@ -67,7 +67,6 @@ INCS += -I../../../common/smbsrv
INCS += -I $(ROOT)/usr/include/kerberosv5
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
@@ -88,11 +87,6 @@ LDLIBS += -lmlsvc -lmlrpc -lsmbns -lsmb -lsmbfs -lgss
LDLIBS += -lzfs -lbsm -lscf -lcmdutils -lsocket -lnsl -lumem
$(PROG) := LDLIBS += -lkrb5
-LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-LINTFLAGS += -xerroff=E_NAME_USED_NOT_DEF2
-LINTFLAGS += -xerroff=E_INCONS_ARG_DECL2
-LINTFLAGS += -xerroff=E_INCONS_VAL_TYPE_DECL2
-
ROOTSMBDDIR = $(ROOTLIB)/smbsrv
ROOTSMBDFILE = $(PROG:%=$(ROOTSMBDDIR)/%)
@@ -107,8 +101,6 @@ $(PROG): $(OBJS)
clean:
-$(RM) $(OBJS)
-lint: lint_SRCS
-
include ../../Makefile.targ
install: all $(ROOTSMBDFILE)
diff --git a/usr/src/cmd/smbsrv/smbd/Makefile b/usr/src/cmd/smbsrv/smbd/Makefile
index 32585574e3..cd351db2e3 100644
--- a/usr/src/cmd/smbsrv/smbd/Makefile
+++ b/usr/src/cmd/smbsrv/smbd/Makefile
@@ -59,9 +59,6 @@ $(ROOTMANIFEST):= FILEMODE = 0444
$(ROOTSVCMETHOD):= FILEMODE = 0555
$(ROOTVARSMBDLL):= FILEMODE = 0755
-LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-LINTFLAGS += -xerroff=E_NAME_USED_NOT_DEF2
-
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -D_IPP_PRIVATE_STRUCTURES
CPPFLAGS += -D_REENTRANT
@@ -75,7 +72,6 @@ CPPFLAGS += -I $(ROOT)/usr/include/kerberosv5
SMOFF += all_func_returns,deref_check
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
LDFLAGS += -R/usr/lib/smbsrv
LDLIBS += -L$(ROOT)/usr/lib/smbsrv
@@ -103,8 +99,6 @@ all: $(PROG)
clean:
$(RM) $(OBJS)
-lint: lint_SRCS
-
$(PROG): $(OBJS)
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
diff --git a/usr/src/cmd/smbsrv/test-msgbuf/Makefile b/usr/src/cmd/smbsrv/test-msgbuf/Makefile
index 96ab0292d1..04496a42ed 100644
--- a/usr/src/cmd/smbsrv/test-msgbuf/Makefile
+++ b/usr/src/cmd/smbsrv/test-msgbuf/Makefile
@@ -52,7 +52,6 @@ INCS += -I../../../uts/common/smbsrv
INCS += -I../../../common/smbsrv
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CFLAGS += $(CCVERBOSE)
CFLAGS64 += $(CCVERBOSE)
@@ -71,11 +70,6 @@ LDFLAGS += $(ZNOLAZYLOAD)
LDFLAGS += '-R$$ORIGIN/..'
LDLIBS += -lfakekernel -lcmdutils
-LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-LINTFLAGS += -xerroff=E_NAME_USED_NOT_DEF2
-LINTFLAGS += -xerroff=E_INCONS_ARG_DECL2
-LINTFLAGS += -xerroff=E_INCONS_VAL_TYPE_DECL2
-
ROOTSMBDDIR = $(ROOTLIB)/smbsrv
ROOTSMBDFILE = $(PROG:%=$(ROOTSMBDDIR)/%)
@@ -90,8 +84,6 @@ $(PROG): $(OBJS)
clean:
-$(RM) $(OBJS)
-lint: # lint_SRCS
-
include ../../Makefile.targ
install: all $(ROOTSMBDFILE)
diff --git a/usr/src/cmd/tail/Makefile b/usr/src/cmd/tail/Makefile
index 6f50c71fb7..49b4a042b5 100644
--- a/usr/src/cmd/tail/Makefile
+++ b/usr/src/cmd/tail/Makefile
@@ -27,8 +27,6 @@ CLOBBERFILES= $(PROG)
CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
-LINTFLAGS += -I. -erroff=E_CONSTANT_CONDITION
SMOFF += leaks
@@ -52,8 +50,6 @@ $(ROOTXPG4PROG):
-$(RM) $@
-$(LN) -s ../../bin/$(PROG) $@
-lint: lint_SRCS
-
clean:
$(RM) $(OBJS)
diff --git a/usr/src/cmd/tr/Makefile b/usr/src/cmd/tr/Makefile
index 0da9ab2094..26bbcca052 100644
--- a/usr/src/cmd/tr/Makefile
+++ b/usr/src/cmd/tr/Makefile
@@ -27,9 +27,7 @@ CLOBBERFILES= $(PROG)
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CPPFLAGS += -D_ILLUMOS_PRIVATE -I.
-LINTFLAGS += -D_ILLUMOS_PRIVATE -I.
# install rules
$(ROOTINC)/% : %
@@ -51,8 +49,6 @@ $(ROOTXPG4PROG) $(ROOTXPG6PROG):
-$(RM) $@
-$(LN) -s ../../bin/$(PROG) $@
-lint: lint_SRCS
-
clean:
$(RM) $(OBJS)
diff --git a/usr/src/cmd/vscan/vscanadm/Makefile b/usr/src/cmd/vscan/vscanadm/Makefile
index f27f4a22e4..5cf9fb1e78 100755
--- a/usr/src/cmd/vscan/vscanadm/Makefile
+++ b/usr/src/cmd/vscan/vscanadm/Makefile
@@ -34,7 +34,6 @@ LDFLAGS += -R/usr/lib/vscan
CFLAGS += $(CCVERBOSE)
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
.KEEP_STATE:
@@ -43,8 +42,6 @@ all: $(PROG)
clean:
$(RM) $(OBJS)
-lint: lint_SRCS
-
$(PROG): $(OBJS)
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
diff --git a/usr/src/cmd/vscan/vscand/Makefile b/usr/src/cmd/vscan/vscand/Makefile
index 6b4e85550d..4446ed400e 100644
--- a/usr/src/cmd/vscan/vscand/Makefile
+++ b/usr/src/cmd/vscan/vscand/Makefile
@@ -50,9 +50,7 @@ CERRWARN += -_gcc=-Wno-switch
# not linted
SMATCH=off
-LINTFLAGS += -mu
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
MANIFEST = vscan.xml
ROOTMANIFESTDIR= $(ROOTSVCSYSTEM)/filesystem
@@ -76,8 +74,6 @@ all: $(PROG)
clean:
$(RM) $(OBJS)
-lint: lint_SRCS
-
$(PROG): $(OBJS)
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
diff --git a/usr/src/cmd/zstreamdump/Makefile b/usr/src/cmd/zstreamdump/Makefile
index 92d7ed4da3..2019ccc031 100644
--- a/usr/src/cmd/zstreamdump/Makefile
+++ b/usr/src/cmd/zstreamdump/Makefile
@@ -37,15 +37,10 @@ INCS += -I../../common/zfs
LDLIBS += -lzfs -lnvpair
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS)
$(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-# lint complains about unused _umem_* functions
-LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-LINTFLAGS64 += -xerroff=E_NAME_DEF_NOT_USED2
-
CERRWARN += -_gcc=-Wno-switch
# not linted
@@ -66,8 +61,6 @@ install: all $(ROOTUSRSBINPROG)
clean:
$(RM) $(OBJS)
-lint: lint_SRCS
-
FRC:
include ../Makefile.targ
diff --git a/usr/src/lib/libppt/Makefile.com b/usr/src/lib/libppt/Makefile.com
index 3d5e96f436..4f4551232f 100644
--- a/usr/src/lib/libppt/Makefile.com
+++ b/usr/src/lib/libppt/Makefile.com
@@ -26,7 +26,6 @@ LIBS = $(DYNLIB)
SRCS = $(SRCDIR)/libppt.c
CSTD= $(CSTD_GNU99)
-C99LMODE= -Xc99=%all
LDLIBS += -lpcidb -ldevinfo -lcmdutils -lnvpair -lc
diff --git a/usr/src/tools/ctf/ctfdump/Makefile.com b/usr/src/tools/ctf/ctfdump/Makefile.com
index 3efd986e16..a9ca87b5c9 100644
--- a/usr/src/tools/ctf/ctfdump/Makefile.com
+++ b/usr/src/tools/ctf/ctfdump/Makefile.com
@@ -16,7 +16,6 @@ SRCS = ctfdump.c
include ../../Makefile.ctf
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
CFLAGS += $(CCVERBOSE)
LDLIBS += -lctf
NATIVE_LIBS += libctf.so libc.so
@@ -44,6 +43,6 @@ $(ROOTONBLDMACHPROG): $(PROG)
install: $(ROOTONBLDMACHPROG)
clean:
- $(RM) $(OBJS) $(LINTFILES)
+ $(RM) $(OBJS)
include $(SRC)/tools/Makefile.targ
diff --git a/usr/src/tools/ctf/libctf/Makefile.com b/usr/src/tools/ctf/libctf/Makefile.com
index f132031de5..60fd36ee9c 100644
--- a/usr/src/tools/ctf/libctf/Makefile.com
+++ b/usr/src/tools/ctf/libctf/Makefile.com
@@ -17,7 +17,6 @@ include $(SRC)/lib/libctf/Makefile.shared.com
include ../../Makefile.ctf
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
CPPFLAGS += -I$(SRC)/lib/libctf/common/ \
-I$(SRC)/lib/libdwarf/common/ \
diff --git a/usr/src/uts/i86pc/acpi_drv/Makefile b/usr/src/uts/i86pc/acpi_drv/Makefile
index d5d60fdc72..6f8228c666 100644
--- a/usr/src/uts/i86pc/acpi_drv/Makefile
+++ b/usr/src/uts/i86pc/acpi_drv/Makefile
@@ -70,11 +70,6 @@ $(OBJS_DIR)/acpi_video.o := SMOFF += all_func_returns
LDFLAGS += -dy -N misc/acpica
#
-# Overrides
-#
-C99LMODE= -Xc99=%all
-
-#
# Default build targets.
#
.KEEP_STATE:
diff --git a/usr/src/uts/intel/bnx/Makefile b/usr/src/uts/intel/bnx/Makefile
index 46eeadef7a..b4bb3f18fd 100644
--- a/usr/src/uts/intel/bnx/Makefile
+++ b/usr/src/uts/intel/bnx/Makefile
@@ -47,9 +47,6 @@ include $(UTSBASE)/intel/Makefile.intel
ALL_TARGET = $(BINARY) $(CONFMOD)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
-C99MODE= -xc99=%all
-C99LMODE= -Xc99=%all
-
#
# Driver-specific flags
#
diff --git a/usr/src/uts/intel/bnxe/Makefile b/usr/src/uts/intel/bnxe/Makefile
index e084215302..3f6034b38a 100644
--- a/usr/src/uts/intel/bnxe/Makefile
+++ b/usr/src/uts/intel/bnxe/Makefile
@@ -47,8 +47,6 @@ include $(UTSBASE)/intel/Makefile.intel
ALL_TARGET = $(BINARY) $(CONFMOD)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
-C99LMODE= -Xc99=%all
-
#
# Driver-specific flags
# XXX inline bits were originally set to inline
diff --git a/usr/src/uts/intel/ctf/Makefile b/usr/src/uts/intel/ctf/Makefile
index 52968662ff..5a91c2cd66 100644
--- a/usr/src/uts/intel/ctf/Makefile
+++ b/usr/src/uts/intel/ctf/Makefile
@@ -36,8 +36,6 @@ include $(UTSBASE)/intel/Makefile.intel
ALL_TARGET = $(BINARY)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
-C99LMODE= -Xc99=%all
-
CPPFLAGS += -I$(SRC)/common/ctf -DCTF_OLD_VERSIONS
LDFLAGS += $(BREDUCE) -M$(UTSBASE)/common/ctf/mapfile -dy
diff --git a/usr/src/uts/intel/fct/Makefile b/usr/src/uts/intel/fct/Makefile
index adfd7e4cc0..bf6e9946c1 100644
--- a/usr/src/uts/intel/fct/Makefile
+++ b/usr/src/uts/intel/fct/Makefile
@@ -57,8 +57,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/stmf
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/intel/iscsit/Makefile b/usr/src/uts/intel/iscsit/Makefile
index b92aaf3e0a..8db8d8742b 100644
--- a/usr/src/uts/intel/iscsit/Makefile
+++ b/usr/src/uts/intel/iscsit/Makefile
@@ -55,8 +55,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/stmf -Nmisc/idm -Nfs/sockfs -Nmisc/md5 -Nmisc/ksocket
-C99LMODE= -Xc99=%all
-
CERRWARN += -_gcc=-Wno-switch
CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/intel/pppt/Makefile b/usr/src/uts/intel/pppt/Makefile
index fd2e3d3aec..55b149c18b 100644
--- a/usr/src/uts/intel/pppt/Makefile
+++ b/usr/src/uts/intel/pppt/Makefile
@@ -58,8 +58,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/stmf
-C99LMODE= -Xc99=%all
-
CERRWARN += -_gcc=-Wno-switch
CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/uts/intel/qlge/Makefile b/usr/src/uts/intel/qlge/Makefile
index 1121b9d596..97811f922a 100644
--- a/usr/src/uts/intel/qlge/Makefile
+++ b/usr/src/uts/intel/qlge/Makefile
@@ -60,8 +60,6 @@ INC_PATH += -I$(UTSBASE)/common/sys/fibre-channel/fca/qlge
LDFLAGS += -dy -Nmisc/mac -Ndrv/ip
-C99LMODE= -Xc99=%all
-
CERRWARN += -_gcc=-Wno-switch
CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/uts/intel/qlt/Makefile b/usr/src/uts/intel/qlt/Makefile
index cd5989db35..9543155cb5 100644
--- a/usr/src/uts/intel/qlt/Makefile
+++ b/usr/src/uts/intel/qlt/Makefile
@@ -57,8 +57,6 @@ MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/fct -Ndrv/stmf
CFLAGS += -DUNIQUE_FW_NAME
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/intel/srpt/Makefile b/usr/src/uts/intel/srpt/Makefile
index 3a030aa82f..11b94f103f 100644
--- a/usr/src/uts/intel/srpt/Makefile
+++ b/usr/src/uts/intel/srpt/Makefile
@@ -57,8 +57,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/stmf -Nmisc/ibtl -Nmisc/ibcm
-C99LMODE= -Xc99=%all
-
CERRWARN += -_gcc=-Wno-unused-label
# needs work
diff --git a/usr/src/uts/intel/stmf/Makefile b/usr/src/uts/intel/stmf/Makefile
index 2ef50bc67a..8c34d1cd10 100644
--- a/usr/src/uts/intel/stmf/Makefile
+++ b/usr/src/uts/intel/stmf/Makefile
@@ -58,8 +58,6 @@ CERRWARN += -erroff=E_STATEMENT_NOT_REACHED
# needs work
SMATCH=off
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/intel/stmf_sbd/Makefile b/usr/src/uts/intel/stmf_sbd/Makefile
index cd6f841ccd..2cdb872f4b 100644
--- a/usr/src/uts/intel/stmf_sbd/Makefile
+++ b/usr/src/uts/intel/stmf_sbd/Makefile
@@ -59,8 +59,6 @@ LDFLAGS += -dy -Ndrv/stmf -Nfs/zfs
INC_PATH += -I$(UTSBASE)/common/fs/zfs
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/intel/zfs/Makefile b/usr/src/uts/intel/zfs/Makefile
index 0ead0381dc..7cf93d6f2b 100644
--- a/usr/src/uts/intel/zfs/Makefile
+++ b/usr/src/uts/intel/zfs/Makefile
@@ -71,8 +71,6 @@ INC_PATH += -I$(SRC)/common
INC_PATH += -I$(COMMONBASE)/zfs
INC_PATH += -I$(UTSBASE)/i86pc
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/intel/zut/Makefile b/usr/src/uts/intel/zut/Makefile
index 1d1ee7d054..f3fcc5630d 100644
--- a/usr/src/uts/intel/zut/Makefile
+++ b/usr/src/uts/intel/zut/Makefile
@@ -60,8 +60,6 @@ INC_PATH += -I$(UTSBASE)/common/fs/zut
INC_PATH += -I$(SRC)/common
INC_PATH += -I$(COMMONBASE)/zut
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/sparc/bnxe/Makefile b/usr/src/uts/sparc/bnxe/Makefile
index 3071f4c145..76d2de96f4 100644
--- a/usr/src/uts/sparc/bnxe/Makefile
+++ b/usr/src/uts/sparc/bnxe/Makefile
@@ -47,8 +47,6 @@ include $(UTSBASE)/sparc/Makefile.sparc
ALL_TARGET = $(BINARY) $(CONFMOD)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
-C99LMODE= -Xc99=%all
-
#
# Driver-specific flags
# XXX inline bits were originally set to inline
diff --git a/usr/src/uts/sparc/ctf/Makefile b/usr/src/uts/sparc/ctf/Makefile
index 88982e1b9e..91ed878b82 100644
--- a/usr/src/uts/sparc/ctf/Makefile
+++ b/usr/src/uts/sparc/ctf/Makefile
@@ -36,8 +36,6 @@ include $(UTSBASE)/sparc/Makefile.sparc
ALL_TARGET = $(BINARY)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
-C99LMODE= -Xc99=%all
-
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRC)/common/ctf -DCTF_OLD_VERSIONS
LDFLAGS += $(BREDUCE) -M$(UTSBASE)/common/ctf/mapfile -dy
diff --git a/usr/src/uts/sparc/fct/Makefile b/usr/src/uts/sparc/fct/Makefile
index 42ec698329..6660228946 100644
--- a/usr/src/uts/sparc/fct/Makefile
+++ b/usr/src/uts/sparc/fct/Makefile
@@ -58,8 +58,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/stmf
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/sparc/iscsit/Makefile b/usr/src/uts/sparc/iscsit/Makefile
index 379ab9195f..0cd707d1e8 100644
--- a/usr/src/uts/sparc/iscsit/Makefile
+++ b/usr/src/uts/sparc/iscsit/Makefile
@@ -58,8 +58,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/stmf -Nmisc/idm -Nfs/sockfs -Nmisc/md5 -Nmisc/ksocket
-C99LMODE= -Xc99=%all
-
CERRWARN += -_gcc=-Wno-switch
CERRWARN += $(CNOWARN_UNINIT)
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/uts/sparc/pppt/Makefile b/usr/src/uts/sparc/pppt/Makefile
index fd2e3d3aec..55b149c18b 100644
--- a/usr/src/uts/sparc/pppt/Makefile
+++ b/usr/src/uts/sparc/pppt/Makefile
@@ -58,8 +58,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/stmf
-C99LMODE= -Xc99=%all
-
CERRWARN += -_gcc=-Wno-switch
CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/uts/sparc/qlge/Makefile b/usr/src/uts/sparc/qlge/Makefile
index 3489a36dd4..703c290925 100644
--- a/usr/src/uts/sparc/qlge/Makefile
+++ b/usr/src/uts/sparc/qlge/Makefile
@@ -59,8 +59,6 @@ INC_PATH += -I$(UTSBASE)/common/sys/fibre-channel/fca/qlge
LDFLAGS += -dy -Nmisc/mac -Ndrv/ip
-C99LMODE= -Xc99=%all
-
CERRWARN += -_gcc=-Wno-switch
CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/uts/sparc/qlt/Makefile b/usr/src/uts/sparc/qlt/Makefile
index cd5989db35..9543155cb5 100644
--- a/usr/src/uts/sparc/qlt/Makefile
+++ b/usr/src/uts/sparc/qlt/Makefile
@@ -57,8 +57,6 @@ MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/fct -Ndrv/stmf
CFLAGS += -DUNIQUE_FW_NAME
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/sparc/srpt/Makefile b/usr/src/uts/sparc/srpt/Makefile
index 4243dec8db..de423e3a32 100644
--- a/usr/src/uts/sparc/srpt/Makefile
+++ b/usr/src/uts/sparc/srpt/Makefile
@@ -58,8 +58,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
LDFLAGS += -dy -Ndrv/stmf -Nmisc/ibtl -Nmisc/ibcm
-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 21788784aa..d6261e67c8 100644
--- a/usr/src/uts/sparc/stmf/Makefile
+++ b/usr/src/uts/sparc/stmf/Makefile
@@ -56,8 +56,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
MODSTUBS_DIR = $(OBJS_DIR)
CERRWARN += -erroff=E_STATEMENT_NOT_REACHED
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/sparc/stmf_sbd/Makefile b/usr/src/uts/sparc/stmf_sbd/Makefile
index cd6f841ccd..2cdb872f4b 100644
--- a/usr/src/uts/sparc/stmf_sbd/Makefile
+++ b/usr/src/uts/sparc/stmf_sbd/Makefile
@@ -59,8 +59,6 @@ LDFLAGS += -dy -Ndrv/stmf -Nfs/zfs
INC_PATH += -I$(UTSBASE)/common/fs/zfs
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/sparc/zfs/Makefile b/usr/src/uts/sparc/zfs/Makefile
index 1379e5e87d..f72e65fecf 100644
--- a/usr/src/uts/sparc/zfs/Makefile
+++ b/usr/src/uts/sparc/zfs/Makefile
@@ -75,8 +75,6 @@ INC_PATH += -I$(SRC)/common
INC_PATH += -I$(COMMONBASE)/zfs
INC_PATH += -I$(UTSBASE)/sun4
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.
diff --git a/usr/src/uts/sparc/zut/Makefile b/usr/src/uts/sparc/zut/Makefile
index 1d1ee7d054..f3fcc5630d 100644
--- a/usr/src/uts/sparc/zut/Makefile
+++ b/usr/src/uts/sparc/zut/Makefile
@@ -60,8 +60,6 @@ INC_PATH += -I$(UTSBASE)/common/fs/zut
INC_PATH += -I$(SRC)/common
INC_PATH += -I$(COMMONBASE)/zut
-C99LMODE= -Xc99=%all
-
#
# For now, disable these warnings; maintainers should endeavor
# to investigate and remove these for maximum coverage.