--- a/usr/src/Makefile.env	Thu Jun 02 13:52:10 2011 -0400
+++ b/usr/src/Makefile.env	Thu Jun 02 22:13:41 2011 -0700
@@ -30,6 +30,7 @@
 PRE_POUND =	pre\#
 POUND_SIGN =	$(PRE_POUND:pre\%=%)
 
+DIRMODE = 755
 FILEMODE = 0444
 
 # Installation directories
@@ -66,17 +67,11 @@
 PROTO_VP_DIR      = $(ROOT)$(VP_DIR)
 PROTO_INCLUDE     = $(ROOT)/usr/include
 
-ROOTHDRDIR        = $(PROTO_INCLUDE)
-ROOTHDRS          = $(HDRS:%=$(ROOTHDRDIR)/%)
-
-TOOLS_DIR = $(SRC)/tools
-
 # Files generated during build removed during "make clean/clobber"
 CLEAN_FILES =
 CLOBBER_FILES = $(CLEAN_FILES)
 
 # Install macros
-DIRMODE = 755
 INS.dir = $(INS) -s -d -m $(DIRMODE) $@
 INS.file = $(INS) -s -d -m $(DIRMODE) $(@D); \
 	$(RM) -- $@; $(INS) -s -m $(FILEMODE) -f $(@D) $<
@@ -121,22 +116,48 @@
 ADRLOC=$(SRC)/java/adr/adr.jar
 ADRGEN=java -classpath $(ADRLOC) org.opensolaris.os.adr.adrgen.ADRGen
 
-# Cribbed from ON
-ALWAYS_LINT_DEFS +=     -erroff=E_PTRDIFF_OVERFLOW
-ALWAYS_LINT_DEFS +=     -erroff=E_ASSIGN_NARROW_CONV
-ALWAYS_LINT_DEFS +=     -erroff=E_SEC_CREAT_WITHOUT_EXCL
-ALWAYS_LINT_DEFS +=     -erroff=E_SEC_FORBIDDEN_WARN_CREAT
-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
+# Lint
+LINTFLAGS = -s -errtags=yes -errsecurity=core -errwarn=%all
+
+# Mapfiles
+MAPFILES_i386 = /usr/lib/ld/map.noexdata
+MAPFILES_sparc =
+MAPFILES = $(MAPFILES_$(ISA)) /usr/lib/ld/map.pagealign
+
+MAPOPTS = $(MAPFILES:%=-M%)
+
+# Libraries
+LIBNAME = $(LIBRARY:lib%.a=%)
+DYNLIB = $(LIBRARY:.a=.so$(VERS))
+SOLIB = $(LIBRARY:.a=.so)
+
+LLINK = 32
+LINTLIB = llib-l$(LIBNAME).ln
+LINTSRC = $(LINTLIB:%.ln=%)
+LINTOUT = lint.out
+LINTSRCS = $(SRCS)
 
-# Needed for generated files
-ALWAYS_LINT_DEFS +=     -erroff=E_NAME_DEF_NOT_USED2
+LIBDIR64_i386=amd64
+LIBDIR64_sparc=sparcv9
+LIBDIR64=$(LIBDIR64_$(ISA))
+
+ROOTHDRDIR	= $(PROTO_INCLUDE)
+ROOTHDRS	= $(HDRS:%=$(ROOTHDRDIR)/%)
+
+ROOTLIBBASE	= $(PROTO_LIB)
+
+ROOTLINTDIR	= $(ROOTLIBBASE)
+ROOTLINT	= $(LINTSRC:%=$(ROOTLINTDIR)/%)
+
+ROOTLIBDIR32	= $(ROOTLIBBASE)
+ROOTLIBDIR64	= $(ROOTLIBBASE)/$(LIBDIR64)
+ROOTLIBDIR	= $(ROOTLIBDIR$(LLINK))
+ROOTLIBS	= $(LIBS:%=$(ROOTLIBDIR)/%)
+
+ROOTLIBLINK32	= $(ROOTLIBBASE)/32
+ROOTLIBLINK64	= $(ROOTLIBBASE)/64
+ROOTLIBTGT32	= .
+ROOTLIBTGT64	= $(LIBDIR64)
 
 # Default to all subdirectories with a Makefile
 SUBDIRS_CMD = $(LS) -1 */Makefile 2>/dev/null | $(SED) 's@/Makefile$$@@'