12217 add ld assert-deflib and guidance to gate build

Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>

6 files changed, 15 insertions, 48 deletions

diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile.com b/usr/src/lib/fm/libfmd_snmp/Makefile.com
index e43b2a4152..dc5b046c12 100644
--- a/usr/src/lib/fm/libfmd_snmp/Makefile.com
+++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com
@@ -40,7 +40,7 @@ include ../../../Makefile.lib
 include ../../Makefile.lib
 
 SRCS = $(LIBSRCS:%.c=../common/%.c)
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
 
 SRCDIR =	../common
 
@@ -51,31 +51,18 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 
-# No lint libraries are delivered for Net-SNMP yet
 SNMPLIBS = -lnetsnmp -lnetsnmphelpers -lnetsnmpagent
-lint := SNMPLIBS=
+NATIVE_LIBS += libnetsnmp.so libnetsnmphelpers.so libnetsnmpagent.so
 
 LDLIBS += $(MACH_LDLIBS)
 LDLIBS += -lfmd_adm -luutil -lnvpair -ltopo
 LDLIBS += $(SNMPLIBS)
 LDLIBS += -lc
 
-LINTFLAGS = -msux $(C99LMODE)
-LINTFLAGS64 = -msux -m64 $(C99LMODE)
-
-# Net-SNMP's headers use do {} while (0) a lot
-LINTCHECKFLAGS += -erroff=E_CONSTANT_CONDITION
-
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
-$(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
-
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: $(LINTLIB) lintcheck
-
 pics/%.o: ../$(MACH)/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/lib/fm/libldom/Makefile b/usr/src/lib/fm/libldom/Makefile
index 970b336f1f..36a5ff1dce 100644
--- a/usr/src/lib/fm/libldom/Makefile
+++ b/usr/src/lib/fm/libldom/Makefile
@@ -31,18 +31,17 @@ HDRDIR = sparc
 
 ROOTFMHDRDIR = $(ROOT)/usr/platform/sun4v/include/sys/fm
 
-SUBDIRS = $(MACH) 
+SUBDIRS = $(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all := TARGET = all
 clean := TARGET = clean
 clobber := TARGET = clobber
 install := TARGET = install
-lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber lint: $(SUBDIRS)
+all clean clobber: $(SUBDIRS)
 
 install: install_h .WAIT $(SUBDIRS)
 
diff --git a/usr/src/lib/fm/libldom/Makefile.com b/usr/src/lib/fm/libldom/Makefile.com
index 859a177363..49e9ad5a41 100644
--- a/usr/src/lib/fm/libldom/Makefile.com
+++ b/usr/src/lib/fm/libldom/Makefile.com
@@ -35,7 +35,7 @@ include ../../Makefile.lib
 SRCS = $(LIBSRCS:%.c=../sparc/%.c)
 SRCDIR = ../sparc
 
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
 
 CPPFLAGS += -I. -I$(SRC)/uts/sun4v -I$(ROOT)/usr/platform/sun4v/include \
 	-I$(ADJUNCT_PROTO)/usr/include/libxml2
@@ -44,24 +44,15 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 
 CERRWARN += -_gcc=-Wno-parentheses
 
-$(DYNLIB) := LDLIBS += $(MACH_LDLIBS)
-$(DYNLIB) := LDLIBS += -lfmd_agent -lnvpair -lscf -lmdesc -lc -lxml2 -lsocket \
-	-lumem
-
-LINTFLAGS = -msux
-LINTFLAGS64 = -msux -m64
-
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
-$(LINTLIB) := LINTFLAGS = -nsvx -I$(ROOT)/usr/platform/sun4v/include
-$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 \
-	-I$(ROOT)/usr/platform/sun4v/include
+LDLIBS += $(MACH_LDLIBS)
+LDLIBS += -lfmd_agent -lnvpair -lscf -lmdesc -lc -lxml2
+LDLIBS += -lsocket -lumem
+NATIVE_LIBS += libxml2.so
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: $(LINTLIB) lintcheck
-
 pics/%.o: ../$(MACH)/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/lib/fm/libseslog/common/mapfile-vers b/usr/src/lib/fm/libseslog/common/mapfile-vers
index bfd2d7b580..fa603e1a0e 100644
--- a/usr/src/lib/fm/libseslog/common/mapfile-vers
+++ b/usr/src/lib/fm/libseslog/common/mapfile-vers
@@ -37,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
         access_ses_log;
     local:
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile b/usr/src/lib/fm/topo/libtopo/Makefile
index 1990c740d9..556eddfdc4 100644
--- a/usr/src/lib/fm/topo/libtopo/Makefile
+++ b/usr/src/lib/fm/topo/libtopo/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"
-#
 
 include ../../../Makefile.lib
 include ../../Makefile.lib
@@ -38,11 +36,10 @@ all := TARGET = all
 clean := TARGET = clean
 clobber := TARGET = clobber
 install := TARGET = install
-lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber lint: $(SUBDIRS)
+all clean clobber: $(SUBDIRS)
 
 install: install_h .WAIT $(SUBDIRS)
 
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com
index d50d99434d..e3b18ffa3a 100644
--- a/usr/src/lib/fm/topo/libtopo/Makefile.com
+++ b/usr/src/lib/fm/topo/libtopo/Makefile.com
@@ -69,7 +69,7 @@ include ../../../../Makefile.lib
 include ../../../Makefile.lib
 
 SRCS = $(BUILTINSRCS:%.c=../common/%.c) $(LIBSRCS:%.c=../common/%.c)
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
 
 SRCDIR =	../common
 
@@ -84,24 +84,15 @@ CERRWARN += $(CNOWARN_UNINIT)
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-parentheses
 
-LINTFLAGS = -msux
-LINTFLAGS64 = -msux -m64
-
 $(DYNLIB)  := LDLIBS += \
 	-lnvpair -lelf -lumem -lxml2 -lkstat -luuid -ldevinfo \
 	-lsmbios -lc -ldevid -lipmi -lscf -lpcidb
-
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
-$(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
-$(LINTLIB) := LDLIBS += -lnvpair -lumem -lc
+NATIVE_LIBS +=	libxml2.so
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: $(LINTLIB) lintcheck
-
 pics/%.o: ../$(MACH)/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)