6117 Many small bugs prevent a clean build on SPARC

@@ -17,10 +17,11 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
+# Copyright 2015 Gary Mills
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 PROG=           lex

@@ -56,11 +57,16 @@
 LIBSRCS =       $(LIBOBJS:%.o=../common/%.c)
 SRCS=           $(MACHSRCS) $(LIBSRCS)
 
 LIBS =          $(DYNLIB) $(LINTLIB)
 
+# Append to LINTFLAGS and LINTFLAGS64 from lib/Makefile.lib
+LINTFLAGS +=    -erroff=E_NAME_MULTIPLY_DEF2 -erroff=E_FUNC_RET_MAYBE_IGNORED2
+LINTFLAGS64 +=  -erroff=E_NAME_MULTIPLY_DEF2 -erroff=E_FUNC_RET_MAYBE_IGNORED2
+
 LINTSRCS=       ../common/llib-l$(LIBNAME)
+$(LINTLIB):=    SRCS = $(SRCDIR)/$(LINTSRC)
 
 INCLIST=        $(INCLIST_$(MACH)) -I../../include -I../../include/$(MACH)
 DEFLIST=        -DELF
 
 # It is not very clean to base the conditional definitions as below, but

@@ -74,14 +80,13 @@
 objs/%_e.o:=    DEFLIST = -DEUC -DJLSLEX  -DEOPTION -D$*=$*_e
 pics/%_e.o:=    DEFLIST = -DEUC -DJLSLEX  -DEOPTION -D$*=$*_e
 
 CPPFLAGS=       $(INCLIST) $(DEFLIST) $(CPPFLAGS.master)
 BUILD.AR=       $(AR) $(ARFLAGS) $@ `$(LORDER) $(OBJS) | $(TSORT)`
-LINTFLAGS=      -amux
+
 LINTPOUT=       lint.out
 
-$(LINTLIB):=    LINTFLAGS = -nvx
 $(ROOTPROG):=   FILEMODE = 0555
 
 ROOTFORMS=      $(FORMS:%=$(ROOTSHLIBCCS)/%)
 
 ROOTLINTDIR=    $(ROOTLIBDIR)

@@ -92,9 +97,11 @@
 
 # Need to make sure lib-make's are warning free
 $(DYNLIB) :=    CFLAGS += $(CCVERBOSE)
 $(DYNLIB) :=    CFLAGS64 += $(CCVERBOSE)
 
-$(DYNLIB) :=    LDLIBS += -lc
+LDLIBS += -lc
 
 CLEANFILES +=   ../common/parser.c $(LINTPOUT)
 CLOBBERFILES += $(LIBS) $(LIBRARY)
+
+lint: lintcheck