[illumos-gate merge]

commit 5801b0f01c3c34499a929ed96164a5a68b470945
    12217 add ld assert-deflib and guidance to gate build
commit 948761701ebc8a0cf820a973780b2fbb931c4390
    12262 Suboptimal vmem hash table slows down boot
commit cdd7a662d2c0914e93e1daa44cebae7003c99777
    12254 python changes have broken the zfs test suite

	Conflicts:
	usr/src/lib/libzonecfg/Makefile.com
	usr/src/lib/libc/sparcv9/Makefile.com
	usr/src/lib/libc/sparc/Makefile.com
	usr/src/lib/libc/i386/Makefile.com
	usr/src/lib/libc/amd64/Makefile
	usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
	usr/src/lib/Makefile
	usr/src/cmd/sendmail/src/Makefile
	usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile

7 files changed, 11 insertions, 9 deletions

diff --git a/usr/src/tools/ctf/ctfconvert/Makefile.com b/usr/src/tools/ctf/ctfconvert/Makefile.com
index 33268bd979..dd79ce02b0 100644
--- a/usr/src/tools/ctf/ctfconvert/Makefile.com
+++ b/usr/src/tools/ctf/ctfconvert/Makefile.com
@@ -16,10 +16,12 @@ include ../../Makefile.ctf
 
 CFLAGS += $(CCVERBOSE)
 LDLIBS += -lctf -lelf
+NATIVE_LIBS += libelf.so libc.so
 
 LDFLAGS = \
 	-L$(ROOTONBLDLIBMACH) \
 	'-R$$ORIGIN/../../lib/$(MACH)' \
+	$(BDIRECT) $(ZLAZYLOAD)
 
 CPPFLAGS += -include ../../common/ctf_headers.h
 
diff --git a/usr/src/tools/ctf/ctfdiff/Makefile.com b/usr/src/tools/ctf/ctfdiff/Makefile.com
index 3c5e19fb6e..6ceb863e66 100644
--- a/usr/src/tools/ctf/ctfdiff/Makefile.com
+++ b/usr/src/tools/ctf/ctfdiff/Makefile.com
@@ -16,10 +16,12 @@ include ../../Makefile.ctf
 
 CFLAGS += $(CCVERBOSE)
 LDLIBS += -lctf
+NATIVE_LIBS += libc.so
 
 LDFLAGS = \
 	-L$(ROOTONBLDLIBMACH) \
 	'-R$$ORIGIN/../../lib/$(MACH)' \
+	$(BDIRECT)
 
 CPPFLAGS += -include ../../common/ctf_headers.h
 
diff --git a/usr/src/tools/ctf/ctfdump/Makefile.com b/usr/src/tools/ctf/ctfdump/Makefile.com
index 66e7a170c4..3efd986e16 100644
--- a/usr/src/tools/ctf/ctfdump/Makefile.com
+++ b/usr/src/tools/ctf/ctfdump/Makefile.com
@@ -19,10 +19,12 @@ CSTD = $(CSTD_GNU99)
 C99LMODE = -Xc99=%all
 CFLAGS += $(CCVERBOSE)
 LDLIBS += -lctf
+NATIVE_LIBS += libctf.so libc.so
 
 LDFLAGS = \
 	-L$(ROOTONBLDLIBMACH) \
 	'-R$$ORIGIN/../../lib/$(MACH)' \
+	$(BDIRECT)
 
 CPPFLAGS += -include ../../common/ctf_headers.h
 
diff --git a/usr/src/tools/ctf/ctfmerge/Makefile.com b/usr/src/tools/ctf/ctfmerge/Makefile.com
index a073007cb4..84eb3c5969 100644
--- a/usr/src/tools/ctf/ctfmerge/Makefile.com
+++ b/usr/src/tools/ctf/ctfmerge/Makefile.com
@@ -21,6 +21,7 @@ LDFLAGS += \
 	-L$(ROOTONBLDLIBMACH) \
 	'-R$$ORIGIN/../../lib/$(MACH)' \
 
+NATIVE_LIBS += libelf.so
 CPPFLAGS += -include ../../common/ctf_headers.h
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += $(CNOWARN_UNINIT)
diff --git a/usr/src/tools/ctf/dwarf/Makefile.com b/usr/src/tools/ctf/dwarf/Makefile.com
index 52aedda3a7..374dee98f1 100644
--- a/usr/src/tools/ctf/dwarf/Makefile.com
+++ b/usr/src/tools/ctf/dwarf/Makefile.com
@@ -83,6 +83,7 @@ SMATCH=off
 
 DYNFLAGS += '-R$$ORIGIN/../../lib/$(MACH)'
 LDLIBS = -lelf -lc
+NATIVE_LIBS += libelf.so libc.so
 
 .KEEP_STATE:
 .PARALLEL:
diff --git a/usr/src/tools/ctf/libctf/Makefile.com b/usr/src/tools/ctf/libctf/Makefile.com
index 89769c5521..31b5d19f4d 100644
--- a/usr/src/tools/ctf/libctf/Makefile.com
+++ b/usr/src/tools/ctf/libctf/Makefile.com
@@ -26,6 +26,7 @@ CPPFLAGS +=	-I$(SRC)/lib/libctf/common/ \
 		-DCTF_OLD_VERSIONS \
 		-DCTF_TOOLS_BUILD
 LDLIBS += -lc -lelf -L$(ROOTONBLDLIBMACH) -ldwarf -lavl
+NATIVE_LIBS += libelf.so libavl.so libc.so
 DYNFLAGS += '-R$$ORIGIN/../../lib/$(MACH)'
 
 .KEEP_STATE:
diff --git a/usr/src/tools/ctf/stabs/Makefile.com b/usr/src/tools/ctf/stabs/Makefile.com
index 97d9cddb77..901acd2584 100644
--- a/usr/src/tools/ctf/stabs/Makefile.com
+++ b/usr/src/tools/ctf/stabs/Makefile.com
@@ -39,16 +39,15 @@ SRCS = \
 include ../../Makefile.ctf
 
 LDLIBS += -lctf
+NATIVE_LIBS += libctf.so
 
 OBJS = $(SRCS:%.c=%.o)
-LINTFILES = $(SRCS:%.c=%.ln)
 
-LINTFLAGS = -mnux -L$(ROOT)/usr/lib
 CERRWARN += $(CNOWARN_UNINIT)
 CERRWARN += -_gcc=-Wno-unused
 
 .NO_PARALLEL:
-.PARALLEL: $(OBJS) $(LINTFILES)
+.PARALLEL: $(OBJS)
 
 all: $(PROG)
 
@@ -66,10 +65,4 @@ install: $(ROOTONBLDMACHPROG)
 clean:
 	$(RM) $(OBJS) $(LINTFILES)
 
-%.ln: ../common/%.c
-	$(LINT.c) -c $<
-
-lint: $(LINTFILES)
-	$(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS)
-
 include ../../Makefile.ctf.targ