[illumos-gate merge]

commit ea78de644e058ee2f6b1c6bb50fcc07da6e4d7ac
    13272 64-bit secflags test has wrong ldlibs
commit d7e2bdfa66e3574ffcce3665a4cd1136fc6cb6a1
    13271 64-bit crypto tests have wrong library search path
commit dd49d7b32f2281b4a30555d0ef9bf80720bbb67f
    13270 cmd/spell native build incomplete
commit 6d9ec342f3d7cd1b0259ab010949b9011e571ad9
    13269 esc needs a native build
commit 217f7406cb5a102a47f8ad05f1a14d967486671b
    13268 lp native build forgot CFLAGS
commit 90f7985f020eb82d06bd0d75396ff794105f7528
    13267 tools libld build picks up normal sgs libs
commit 6f9fa98c81a60fc52e8a0a97930ac709e7272727
    13266 mdb build tools should use native tools
commit 421390e5fa91e88e795394c89567b48874788f9f
    13265 libmp.so.1 missing library search path
commit 9894d69ccc165ef74bf6ccce5a722cdefc922f18
    13264 perl Makefiles place object files after libraries
commit 42c24f1c09b6b8d403ee0940c6f1362249a8b738
    13263 startd needs to search $(ROOT)/usr/lib/fm for deps
commit a235f1f94b85df48c92dd2323e777f49ad38afea
    13262 rcm_daemon missing library search paths
commit 4fcda281302fdcc1753c1f266173e7b59a500c3c
    13261 libdbus-1 deps missing libbsm
commit d9328cd43f1300af79f6fc8a3ad4760137618c63
    13260 librtld_db demo should be built separately

66 files changed, 233 insertions, 52 deletions

diff --git a/usr/src/cmd/fm/eversholt/Makefile b/usr/src/cmd/fm/eversholt/Makefile
index 5280f19c5c..c1b10c3939 100644
--- a/usr/src/cmd/fm/eversholt/Makefile
+++ b/usr/src/cmd/fm/eversholt/Makefile
@@ -23,14 +23,13 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 debug := TARGET += debug
 
-SUBDIRS = esc eftinfo files
+SUBDIRS = esc eftinfo native files
 
 include ../Makefile.subdirs
 
 debug: $(SUBDIRS)
 
-files: esc
+files: native
diff --git a/usr/src/cmd/fm/eversholt/Makefile.esc.com b/usr/src/cmd/fm/eversholt/Makefile.esc.com
index ffda5bbe11..b7a947f4b7 100644
--- a/usr/src/cmd/fm/eversholt/Makefile.esc.com
+++ b/usr/src/cmd/fm/eversholt/Makefile.esc.com
@@ -39,12 +39,9 @@ CMNOBJS = alloc.o check.o eftread.o esclex.o io.o literals.o lut.o \
 COMMONOBJS = escparse.o $(CMNOBJS)
 COMMONSRCS = $(COMMONOBJS:%.o=$(EVERCMNSRC)/%.c)
 
-LINTSRCS = $(CMNOBJS:%.o=$(EVERCMNSRC)/%.c)
-LINTFLAGS = -mnux
-
-$(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-
-CPPFLAGS += -I$(EVERCMNSRC) -I.
+BASECPPFLAGS = -I$(EVERCMNSRC) -I.
+$(NOT_RELEASE_BUILD)BASECPPFLAGS += -DDEBUG
+CPPFLAGS += $(BASECPPFLAGS)
 CFLAGS += $(CCVERBOSE)
 CERRWARN += $(CNOWARN_UNINIT)
 CERRWARN += -_gcc=-Wno-unused-label
@@ -62,13 +59,8 @@ debug := COPTFLAG64 =
 ROOTPDIR = $(ROOT)/usr/lib/fm
 ROOTPROG = $(ROOTPDIR)/$(PROG)
 
-install: $(PROG) $(ROOTPROG)
-
 install_h: $(ROOTHDIR) $(ROOTHDRS)
 
-lint:	$(LINTSRCS)
-	$(LINT.c) $(LINTSRCS) $(LDLIBS)
-
 %.o: %.c
 	$(COMPILE.c) $<
 	$(CTFCONVO)
@@ -87,4 +79,3 @@ $(ROOTPDIR):
 
 $(ROOTPDIR)/%: % $(ROOTPDIR)
 	$(INS.file)
-
diff --git a/usr/src/cmd/fm/eversholt/esc/Makefile.com b/usr/src/cmd/fm/eversholt/esc/Makefile.com
index 73980a9f87..61a394c382 100644
--- a/usr/src/cmd/fm/eversholt/esc/Makefile.com
+++ b/usr/src/cmd/fm/eversholt/esc/Makefile.com
@@ -43,8 +43,6 @@ all debug: $(PROG)
 
 install: all $(ROOTPROG)
 
-LINTSRCS += $(LOCALOBJS:%.o=../common/%.c)
-
 $(PROG): $(OBJS)
 	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 	$(CTFMRG)
diff --git a/usr/src/cmd/fm/eversholt/files/Makefile.com b/usr/src/cmd/fm/eversholt/files/Makefile.com
index 928ea34284..706beeaea7 100644
--- a/usr/src/cmd/fm/eversholt/files/Makefile.com
+++ b/usr/src/cmd/fm/eversholt/files/Makefile.com
@@ -25,7 +25,7 @@
 
 .SUFFIXES: .eft .esc
 
-ESC=$(SRC)/cmd/fm/eversholt/esc/$(MACH)/esc
+ESC=$(SRC)/cmd/fm/eversholt/native/$(MACH)/esc
 
 include $(SRC)/cmd/Makefile.cmd
 
diff --git a/usr/src/cmd/fm/eversholt/native/Makefile b/usr/src/cmd/fm/eversholt/native/Makefile
new file mode 100644
index 0000000000..7c16b47a3e
--- /dev/null
+++ b/usr/src/cmd/fm/eversholt/native/Makefile
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+SUBDIRS = $(MACH)
+
+#
+# We don't currently support the debug target for the native build.
+#
+debug:
+
+include ../../Makefile.subdirs
diff --git a/usr/src/cmd/fm/eversholt/native/Makefile.com b/usr/src/cmd/fm/eversholt/native/Makefile.com
new file mode 100644
index 0000000000..1f6481f699
--- /dev/null
+++ b/usr/src/cmd/fm/eversholt/native/Makefile.com
@@ -0,0 +1,69 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+.KEEP_STATE:
+
+PROG = esc
+
+include $(SRC)/cmd/fm/eversholt/Makefile.esc.com
+
+#
+# This is a version of esc we're going to use in the build. Change most
+# things to be their native counterparts.
+#
+CC = $(NATIVECC)
+LD = $(NATIVELD)
+
+EFTCLASS = writer
+LOCALOBJS = escmain.o
+OBJS = $(LOCALOBJS) $(COMMONOBJS)
+SRCS = $(LOCALOBJS:.o=.c) $(COMMONSRCS)
+
+CPPFLAGS = $(NATIVE_CPPFLAGS) $(BASECPPFLAGS) -I../../esc/common
+CFLAGS = $(NATIVE_CFLAGS) -DESC $(CTF_FLAGS)
+LDLIBS = -lumem
+NATIVE_LIBS = libumem.so libc.so
+
+all: $(PROG)
+
+install: all
+
+$(PROG): $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+	$(CTFMRG)
+	$(POST_PROCESS)
+
+clean:
+	$(RM) $(OBJS) y.output y.tab.c y.tab.h
+
+clobber: clean
+	$(RM) $(PROG)
+
+esclex.o: escparse.o
+
+%.o: ../../esc/common/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVO)
diff --git a/usr/src/cmd/fm/eversholt/native/i386/Makefile b/usr/src/cmd/fm/eversholt/native/i386/Makefile
new file mode 100644
index 0000000000..9af309e868
--- /dev/null
+++ b/usr/src/cmd/fm/eversholt/native/i386/Makefile
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+include ../../../../Makefile.cmd
+include ../Makefile.com
diff --git a/usr/src/cmd/fm/eversholt/native/sparc/Makefile b/usr/src/cmd/fm/eversholt/native/sparc/Makefile
new file mode 100644
index 0000000000..9af309e868
--- /dev/null
+++ b/usr/src/cmd/fm/eversholt/native/sparc/Makefile
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+include ../../../../Makefile.cmd
+include ../Makefile.com
diff --git a/usr/src/cmd/lp/filter/postscript/font/Makefile b/usr/src/cmd/lp/filter/postscript/font/Makefile
index 25d3ffcfd0..17da810be2 100644
--- a/usr/src/cmd/lp/filter/postscript/font/Makefile
+++ b/usr/src/cmd/lp/filter/postscript/font/Makefile
@@ -47,6 +47,7 @@ NATIVEDIR =		native
 NATIVEPROG =		$(NATIVEDIR)/$(PROG)
 NATIVE_LIBS +=		libc.so
 $(NATIVEPROG) :=	CC=$(NATIVECC)
+$(NATIVEPROG) :=	CFLAGS=$(NATIVE_CFLAGS)
 $(NATIVEPROG) :=	LDLIBS=
 $(NATIVEPROG) :=	CPPFLAGS.master=
 
diff --git a/usr/src/cmd/mdb/tools/findfp/Makefile.com b/usr/src/cmd/mdb/tools/findfp/Makefile.com
index 16e692d598..7258550fb6 100644
--- a/usr/src/cmd/mdb/tools/findfp/Makefile.com
+++ b/usr/src/cmd/mdb/tools/findfp/Makefile.com
@@ -43,18 +43,18 @@ include ../../common/Makefile.util
 # running kernel's includes and libraries.
 #
 CPPFLAGS = -I../../common -I../common
-CFLAGS += $(CCVERBOSE)
+CFLAGS = $(NATIVE_CFLAGS) $(CCVERBOSE)
 CERRWARN += $(CNOWARN_UNINIT)
-LDFLAGS = $(ZLAZYLOAD) $(BDIRECT)
-LDFLAGS += $(ZASSERTDEFLIB)=libelf.so $(ZASSERTDEFLIB)=libc.so
+LDFLAGS = $(NATIVE_LDFLAGS) $(ZLAZYLOAD) $(BDIRECT)
 LDLIBS = -lelf
-
-LINTFILES = $(SRCS:%.c=%.ln)
+CC = $(NATIVECC)
+LD = $(NATIVELD)
+NATIVE_LIBS += libelf.so libc.so
 
 install all: $(PROG)
 
 clobber clean:
-	$(RM) $(OBJS) $(LINTFILES) $(PROG)
+	$(RM) $(OBJS) $(PROG)
 
 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
diff --git a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
index f7eb93fb8f..daccc2b61e 100644
--- a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
+++ b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
@@ -42,10 +42,12 @@ include ../../common/Makefile.util
 # running kernel's includes and libraries.
 #
 CPPFLAGS = -I../../common
-CFLAGS += $(CCVERBOSE)
+CFLAGS = $(NATIVE_CFLAGS) $(CCVERBOSE)
 CERRWARN += $(CNOWARN_UNINIT)
-LDFLAGS = $(ZLAZYLOAD) $(BDIRECT)
-LDLIBS	= -lelf
+LDFLAGS = $(NATIVE_LDFLAGS) $(ZLAZYLOAD) $(BDIRECT)
+LDLIBS = -lelf
+CC = $(NATIVECC)
+LD = $(NATIVELD)
 NATIVE_LIBS += libelf.so libc.so
 
 install all: $(PROG)
diff --git a/usr/src/cmd/perl/Makefile.targ b/usr/src/cmd/perl/Makefile.targ
index d2a04232d7..eec6742e0d 100644
--- a/usr/src/cmd/perl/Makefile.targ
+++ b/usr/src/cmd/perl/Makefile.targ
@@ -14,7 +14,9 @@
 # Copyright (c) 2018, Joyent, Inc.
 
 # Link against libc as per solaris specs
+$(PERLEXT):= PICS = $(MACH)/$(MODULE).o
 $(PERLEXT):= LDLIBS += -lc
+$(PERLEXT64):= PICS = $(MACH64)/$(MODULE).o
 $(PERLEXT64):= LDLIBS += -lc
 
 # Allow for undefined symbols satisfied by perl
@@ -38,10 +40,10 @@ $(MACH) $(MACH64):
 	$(INS.dir)
 
 $(PERLEXT): $(MACH)/$(MODULE).o
-	$(BUILD.SO) $(MACH)/$(MODULE).o
+	$(BUILD.SO)
 
 $(PERLEXT64): $(MACH64)/$(MODULE).o
-	$(BUILD64.SO) $(MACH64)/$(MODULE).o
+	$(BUILD64.SO)
 
 $(MACH)/$(MODULE).o: $(MACH)/$(MODULE).c
 	$(COMPILE.c) $(PCFLAGS) $(C_PICFLAGS) -I$(PERLINCDIR) $< -o $@
diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com
index 424f59bfb1..a11c03bc4b 100644
--- a/usr/src/cmd/rcm_daemon/Makefile.com
+++ b/usr/src/cmd/rcm_daemon/Makefile.com
@@ -124,18 +124,18 @@ SMATCH=off
 MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
 rcm_daemon := LDFLAGS += $(MAPFILES:%=-Wl,-M%)
 
-LDLIBS_MODULES =
-SUNW_pool_rcm.so := LDLIBS_MODULES += -L$(ROOT)/usr/lib -lpool -lnvpair
-SUNW_network_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair -ldevinfo
-SUNW_vlan_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
-SUNW_vnic_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
-SUNW_ibpart_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
-SUNW_aggr_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
-SUNW_ip_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -ldladm -lipmp -lipadm -lnvpair -lsocket -lgen
-SUNW_ip_anon_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil
-SUNW_bridge_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
+LDLIBS_MODULES = -L$(ROOT)/lib -L$(ROOT)/usr/lib
+SUNW_pool_rcm.so := LDLIBS_MODULES += -lpool -lnvpair
+SUNW_network_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair -ldevinfo
+SUNW_vlan_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
+SUNW_vnic_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
+SUNW_ibpart_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
+SUNW_aggr_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
+SUNW_ip_rcm.so := LDLIBS_MODULES += -linetutil -ldladm -lipmp -lipadm -lnvpair -lsocket -lgen
+SUNW_ip_anon_rcm.so := LDLIBS_MODULES += -linetutil
+SUNW_bridge_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
 SUNW_mpxio_rcm.so := LDLIBS_MODULES += -ldevinfo
-LDLIBS_MODULES += -L$(ROOT)/lib -lrcm -lc
+LDLIBS_MODULES += -lrcm -lc
 
 LDLIBS += -lrcm -lnvpair
 
diff --git a/usr/src/cmd/sgs/Makefile b/usr/src/cmd/sgs/Makefile
index e0a53e9cca..dbe8137b97 100644
--- a/usr/src/cmd/sgs/Makefile
+++ b/usr/src/cmd/sgs/Makefile
@@ -77,7 +77,9 @@ SUBDIRS-common= libconv		\
 		symorder	\
 		tsort		\
 		unifdef		\
-		yacc
+		yacc		\
+		.WAIT		\
+		demo_rdb
 
 SUBDIRS-i386=
 SUBDIRS-sparc=	rtld.4.x
diff --git a/usr/src/cmd/sgs/librtld_db/demo/00README b/usr/src/cmd/sgs/demo_rdb/00README
index 74c3be4775..74c3be4775 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/00README
+++ b/usr/src/cmd/sgs/demo_rdb/00README
diff --git a/usr/src/cmd/sgs/librtld_db/demo/Makefile b/usr/src/cmd/sgs/demo_rdb/Makefile
index f61bf6796b..f61bf6796b 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/Makefile
+++ b/usr/src/cmd/sgs/demo_rdb/Makefile
diff --git a/usr/src/cmd/sgs/librtld_db/demo/Makefile.com b/usr/src/cmd/sgs/demo_rdb/Makefile.com
index 6bb248ced9..300e0601a7 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/Makefile.com
+++ b/usr/src/cmd/sgs/demo_rdb/Makefile.com
@@ -25,7 +25,7 @@
 PROG=		rdb
 
 # DEMO DELETE START
-include		../../../../Makefile.cmd
+include		../../../Makefile.cmd
 # DEMO DELETE END
 
 MACH:sh=	uname -p
@@ -54,7 +54,6 @@ MV =		mv
 
 CPPFLAGS=	-I../common -I. $(CPPFLAGS.master)
 LDLIBS +=	$(BDIRECT) $(ZLAZYLOAD) -lrtld_db -lelf -ll -ly
-NATIVE_LIBS +=	libelf.so liby.so libl.so
 
 CLEANFILES +=	$(BLTSRC) $(BLTHDR) simp libsub.so.1
 
diff --git a/usr/src/cmd/sgs/librtld_db/demo/Makefile.targ b/usr/src/cmd/sgs/demo_rdb/Makefile.targ
index 82de1a0deb..82de1a0deb 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/Makefile.targ
+++ b/usr/src/cmd/sgs/demo_rdb/Makefile.targ
diff --git a/usr/src/cmd/sgs/librtld_db/demo/amd64/Makefile b/usr/src/cmd/sgs/demo_rdb/amd64/Makefile
index 1428252d8b..63466647fb 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/amd64/Makefile
+++ b/usr/src/cmd/sgs/demo_rdb/amd64/Makefile
@@ -60,5 +60,5 @@ $(OBJDIR)/%.o:	../i386/%.c
 		$(POST_PROCESS_O)
 
 # DEMO DELETE START
-include		../../../../../Makefile.master.64
+include		../../../../Makefile.master.64
 # DEMO DELETE END
diff --git a/usr/src/cmd/sgs/librtld_db/demo/amd64/rdb_mach.h b/usr/src/cmd/sgs/demo_rdb/amd64/rdb_mach.h
index 91248132eb..91248132eb 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/amd64/rdb_mach.h
+++ b/usr/src/cmd/sgs/demo_rdb/amd64/rdb_mach.h
diff --git a/usr/src/cmd/sgs/librtld_db/demo/amd64/regs.c b/usr/src/cmd/sgs/demo_rdb/amd64/regs.c
index 81d139312d..81d139312d 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/amd64/regs.c
+++ b/usr/src/cmd/sgs/demo_rdb/amd64/regs.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/bpt.c b/usr/src/cmd/sgs/demo_rdb/common/bpt.c
index dfaf3caa42..dfaf3caa42 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/bpt.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/bpt.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/callstack.c b/usr/src/cmd/sgs/demo_rdb/common/callstack.c
index 72b43a3343..72b43a3343 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/callstack.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/callstack.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/dis.c b/usr/src/cmd/sgs/demo_rdb/common/dis.c
index e08236f739..e08236f739 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/dis.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/dis.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/disasm.c b/usr/src/cmd/sgs/demo_rdb/common/disasm.c
index 5adc49d13f..5adc49d13f 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/disasm.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/disasm.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/disasm.h b/usr/src/cmd/sgs/demo_rdb/common/disasm.h
index e543b680f9..e543b680f9 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/disasm.h
+++ b/usr/src/cmd/sgs/demo_rdb/common/disasm.h
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/globals.c b/usr/src/cmd/sgs/demo_rdb/common/globals.c
index 16566b2087..16566b2087 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/globals.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/globals.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/gram.y b/usr/src/cmd/sgs/demo_rdb/common/gram.y
index d8366eba9d..d8366eba9d 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/gram.y
+++ b/usr/src/cmd/sgs/demo_rdb/common/gram.y
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/help.c b/usr/src/cmd/sgs/demo_rdb/common/help.c
index 49204b33ef..49204b33ef 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/help.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/help.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/lex.l b/usr/src/cmd/sgs/demo_rdb/common/lex.l
index 2d1b1b9bd1..2d1b1b9bd1 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/lex.l
+++ b/usr/src/cmd/sgs/demo_rdb/common/lex.l
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/main.c b/usr/src/cmd/sgs/demo_rdb/common/main.c
index 67e5d90023..67e5d90023 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/main.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/main.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/maps.c b/usr/src/cmd/sgs/demo_rdb/common/maps.c
index 51fd97cf0b..51fd97cf0b 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/maps.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/maps.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/ps.c b/usr/src/cmd/sgs/demo_rdb/common/ps.c
index fa602d63a6..fa602d63a6 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/ps.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/ps.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/rdb.h b/usr/src/cmd/sgs/demo_rdb/common/rdb.h
index 28bda1bdd1..28bda1bdd1 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/rdb.h
+++ b/usr/src/cmd/sgs/demo_rdb/common/rdb.h
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/rdb.man b/usr/src/cmd/sgs/demo_rdb/common/rdb.man
index 14b9f463e3..14b9f463e3 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/rdb.man
+++ b/usr/src/cmd/sgs/demo_rdb/common/rdb.man
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/syms.c b/usr/src/cmd/sgs/demo_rdb/common/syms.c
index 3805c642e0..3805c642e0 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/syms.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/syms.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/common/utils.c b/usr/src/cmd/sgs/demo_rdb/common/utils.c
index 5b6c194b3a..5b6c194b3a 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/common/utils.c
+++ b/usr/src/cmd/sgs/demo_rdb/common/utils.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/i386/Makefile b/usr/src/cmd/sgs/demo_rdb/i386/Makefile
index 1112eb1ca3..1112eb1ca3 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/i386/Makefile
+++ b/usr/src/cmd/sgs/demo_rdb/i386/Makefile
diff --git a/usr/src/cmd/sgs/librtld_db/demo/i386/m_utils.c b/usr/src/cmd/sgs/demo_rdb/i386/m_utils.c
index 43962b1a86..43962b1a86 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/i386/m_utils.c
+++ b/usr/src/cmd/sgs/demo_rdb/i386/m_utils.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/i386/rdb_mach.h b/usr/src/cmd/sgs/demo_rdb/i386/rdb_mach.h
index 8b7dcdfb20..8b7dcdfb20 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/i386/rdb_mach.h
+++ b/usr/src/cmd/sgs/demo_rdb/i386/rdb_mach.h
diff --git a/usr/src/cmd/sgs/librtld_db/demo/i386/regs.c b/usr/src/cmd/sgs/demo_rdb/i386/regs.c
index 457e6a3fac..457e6a3fac 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/i386/regs.c
+++ b/usr/src/cmd/sgs/demo_rdb/i386/regs.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparc/Makefile b/usr/src/cmd/sgs/demo_rdb/sparc/Makefile
index 1112eb1ca3..1112eb1ca3 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/sparc/Makefile
+++ b/usr/src/cmd/sgs/demo_rdb/sparc/Makefile
diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparc/m_utils.c b/usr/src/cmd/sgs/demo_rdb/sparc/m_utils.c
index d900fb1119..d900fb1119 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/sparc/m_utils.c
+++ b/usr/src/cmd/sgs/demo_rdb/sparc/m_utils.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparc/rdb_mach.h b/usr/src/cmd/sgs/demo_rdb/sparc/rdb_mach.h
index 2867bc5016..2867bc5016 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/sparc/rdb_mach.h
+++ b/usr/src/cmd/sgs/demo_rdb/sparc/rdb_mach.h
diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparc/regs.c b/usr/src/cmd/sgs/demo_rdb/sparc/regs.c
index 93589cbc2f..93589cbc2f 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/sparc/regs.c
+++ b/usr/src/cmd/sgs/demo_rdb/sparc/regs.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/Makefile b/usr/src/cmd/sgs/demo_rdb/sparcv9/Makefile
index b1b3f38d32..b1b3f38d32 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/Makefile
+++ b/usr/src/cmd/sgs/demo_rdb/sparcv9/Makefile
diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/m_utils.c b/usr/src/cmd/sgs/demo_rdb/sparcv9/m_utils.c
index d900fb1119..d900fb1119 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/m_utils.c
+++ b/usr/src/cmd/sgs/demo_rdb/sparcv9/m_utils.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/rdb_mach.h b/usr/src/cmd/sgs/demo_rdb/sparcv9/rdb_mach.h
index 993edbf060..993edbf060 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/rdb_mach.h
+++ b/usr/src/cmd/sgs/demo_rdb/sparcv9/rdb_mach.h
diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/regs.c b/usr/src/cmd/sgs/demo_rdb/sparcv9/regs.c
index 3b85479b29..3b85479b29 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/regs.c
+++ b/usr/src/cmd/sgs/demo_rdb/sparcv9/regs.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/tests/breaks b/usr/src/cmd/sgs/demo_rdb/tests/breaks
index acb0f2f2c5..acb0f2f2c5 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/tests/breaks
+++ b/usr/src/cmd/sgs/demo_rdb/tests/breaks
diff --git a/usr/src/cmd/sgs/librtld_db/demo/tests/loadmaps b/usr/src/cmd/sgs/demo_rdb/tests/loadmaps
index f655a07c4b..f655a07c4b 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/tests/loadmaps
+++ b/usr/src/cmd/sgs/demo_rdb/tests/loadmaps
diff --git a/usr/src/cmd/sgs/librtld_db/demo/tests/object_padding_maps b/usr/src/cmd/sgs/demo_rdb/tests/object_padding_maps
index 82e3bb607a..82e3bb607a 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/tests/object_padding_maps
+++ b/usr/src/cmd/sgs/demo_rdb/tests/object_padding_maps
diff --git a/usr/src/cmd/sgs/librtld_db/demo/tests/plt_skip b/usr/src/cmd/sgs/demo_rdb/tests/plt_skip
index 93fa89cd39..93fa89cd39 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/tests/plt_skip
+++ b/usr/src/cmd/sgs/demo_rdb/tests/plt_skip
diff --git a/usr/src/cmd/sgs/librtld_db/demo/tests/simp.c b/usr/src/cmd/sgs/demo_rdb/tests/simp.c
index 0bc1c9a09c..0bc1c9a09c 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/tests/simp.c
+++ b/usr/src/cmd/sgs/demo_rdb/tests/simp.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/tests/steps b/usr/src/cmd/sgs/demo_rdb/tests/steps
index a823556ace..a823556ace 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/tests/steps
+++ b/usr/src/cmd/sgs/demo_rdb/tests/steps
diff --git a/usr/src/cmd/sgs/librtld_db/demo/tests/sub.c b/usr/src/cmd/sgs/demo_rdb/tests/sub.c
index 27f64d0ae5..27f64d0ae5 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/tests/sub.c
+++ b/usr/src/cmd/sgs/demo_rdb/tests/sub.c
diff --git a/usr/src/cmd/sgs/librtld_db/demo/tests/test-sparc-regs b/usr/src/cmd/sgs/demo_rdb/tests/test-sparc-regs
index ac1b360207..ac1b360207 100644
--- a/usr/src/cmd/sgs/librtld_db/demo/tests/test-sparc-regs
+++ b/usr/src/cmd/sgs/demo_rdb/tests/test-sparc-regs
diff --git a/usr/src/cmd/sgs/librtld_db/Makefile b/usr/src/cmd/sgs/librtld_db/Makefile
index 8a631836e9..c2aa96f906 100644
--- a/usr/src/cmd/sgs/librtld_db/Makefile
+++ b/usr/src/cmd/sgs/librtld_db/Makefile
@@ -21,5 +21,4 @@
 #
 # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 
-EXTRASUBDIRS =	demo
 include		$(SRC)/cmd/sgs/Makefile.sub
diff --git a/usr/src/cmd/spell/Makefile b/usr/src/cmd/spell/Makefile
index 410d3df258..0aab579243 100644
--- a/usr/src/cmd/spell/Makefile
+++ b/usr/src/cmd/spell/Makefile
@@ -75,9 +75,13 @@ $(ROOTSPELLD)/hlista :=	FILEMODE =	0644
 $(ROOTVARADMF) :=	FILEMODE =	0666
 
 spellin1 hashmk1 := CC = $(NATIVECC)
+spellin1 hashmk1 := LD = $(NATIVELD)
+spellin1 hashmk1 := CFLAGS = $(NATIVE_CFLAGS)
 spellin1 hashmk1 := POST_PROCESS =
 spellin1 hashmk1 := CPPFLAGS =
+spellin1 hashmk1 := LDLIBS =
 spellin1 hashmk1 := LDFLAGS = $(BDIRECT)
+spellin1 hashmk1 := NATIVE_LIBS = libc.so
 
 $(ROOTSPELLD)/% $(ROOTVARADMD)/% : %
 	$(INS.file)
diff --git a/usr/src/cmd/svc/startd/Makefile b/usr/src/cmd/svc/startd/Makefile
index d9b1c523a7..8b15034344 100644
--- a/usr/src/cmd/svc/startd/Makefile
+++ b/usr/src/cmd/svc/startd/Makefile
@@ -98,9 +98,17 @@ LDLIBS += \
 	-lumem \
 	-luutil
 
+#
+# While svc.startd only searches for libfmevent, which is in
+# $(ROOT)/lib/fm, when resolving dependencies it needs to know to search
+# for those in $(ROOT)/usr/lib/fm. However, we don't need a runpath
+# because libfmevent has that properly set already, but it doesn't help
+# us during the build.
+#
 LDLIBS_i386 +=	-lbe
-LDLIBS +=	$(LDLIBS_$(MACH)) -L $(ROOT)/lib/fm -lfmevent
-LDFLAGS +=	-R /lib/fm
+LDLIBS +=	$(LDLIBS_$(MACH)) -L$(ROOT)/lib/fm -lfmevent \
+		-L$(ROOT)/usr/lib/fm
+LDFLAGS +=	-R/lib/fm
 
 FILEMODE = 0555
 
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 4afeeacfd7..d6d16ece16 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -590,7 +590,8 @@ basedeps :=	TARGET=install
 
 # The following dependencies are currently required by libdbus-1 and should
 # be used for anything linking against it.
-dbusdeps:	libsecdb libtsol libinetutil libscf libuutil libgen libsmbios
+dbusdeps:	libsecdb libtsol libinetutil libscf libuutil libgen libsmbios \
+		libbsm
 
 # The following dependencies don't need to be listed below as they are built
 # before everything else:
diff --git a/usr/src/lib/libmp/i386/Makefile b/usr/src/lib/libmp/i386/Makefile
index 172ce9cf3a..c27bfc4e56 100644
--- a/usr/src/lib/libmp/i386/Makefile
+++ b/usr/src/lib/libmp/i386/Makefile
@@ -39,10 +39,14 @@ $(ROOTLIBDIR)/$(OLIBRARY) :=	FILEMODE= 755
 
 .KEEP_STATE:
 
+#
+# Note the use of LDLIBS.lib as opposed to LDLIBS is so we can get the
+# search path, but not the actual additional libraries.
+#
 $(OLIBRARY):	pics/pics_mp.o libmp.so.2 $(OMAPFILE)
 	$(CC) $(CFLAGS) -o $@ $(GSHARED) -h $(OLIBRARY) $(ZTEXT) $(ZDEFS) \
 	    $(BDIRECT) pics/pics_mp.o libmp.so.2 -Wl,-M$(OMAPFILE) \
-	    $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%)
+	    $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) $(LDLIBS.lib)
 	$(POST_PROCESS_SO)
 
 pics/pics_mp.o:
diff --git a/usr/src/lib/libmp/sparc/Makefile b/usr/src/lib/libmp/sparc/Makefile
index 7f903f338d..52e0423d64 100644
--- a/usr/src/lib/libmp/sparc/Makefile
+++ b/usr/src/lib/libmp/sparc/Makefile
@@ -39,10 +39,14 @@ $(ROOTLIBDIR)/$(OLIBRARY) :=	FILEMODE= 755
 
 .KEEP_STATE:
 
+#
+# Note the use of LDLIBS.lib as opposed to LDLIBS is so we can get the
+# search path, but not the actual additional libraries.
+#
 $(OLIBRARY):	pics/pics_mp.o libmp.so.2 $(OMAPFILE)
 	$(CC) $(CFLAGS) -o $@ $(GSHARED) -h $(OLIBRARY) $(ZTEXT) $(ZDEFS) \
 	    $(BDIRECT) $(ZCOMBRELOC) pics/pics_mp.o libmp.so.2 -Wl,-M$(OMAPFILE) \
-	    $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%)
+	    $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) $(LDLIBS.lib)
 	$(POST_PROCESS_SO)
 
 pics/pics_mp.o:
diff --git a/usr/src/test/crypto-tests/tests/Makefile.crypto b/usr/src/test/crypto-tests/tests/Makefile.crypto
index 4105983e94..5f33fbe635 100644
--- a/usr/src/test/crypto-tests/tests/Makefile.crypto
+++ b/usr/src/test/crypto-tests/tests/Makefile.crypto
@@ -43,6 +43,7 @@ $(PROGS_32) := OBJS += $(BASEPROG:%=%.32.o) $(COMMON_OBJS_32)
 $(PROGS_64) := OBJS += $(BASEPROG:%=%.64.o) $(COMMON_OBJS_64)
 $(PROGS_32) := OBJS += $(COMMONDIR)/testfuncs.32.o
 $(PROGS_64) := OBJS += $(COMMONDIR)/testfuncs.64.o
+$(PROGS_64) := LDLIBS.cmd = $(LDLIBS64)
 $(CRYPTO_pkcs)$(BASEPROG)_32_pkcs := OBJS += $(COMMONDIR)/cryptotest_pkcs.32.o
 $(CRYPTO_pkcs)$(BASEPROG)_64_pkcs := OBJS += $(COMMONDIR)/cryptotest_pkcs.64.o
 $(CRYPTO_kcf)$(BASEPROG)_32_kcf	:= OBJS += $(COMMONDIR)/cryptotest_kcf.32.o
diff --git a/usr/src/test/os-tests/tests/secflags/Makefile b/usr/src/test/os-tests/tests/secflags/Makefile
index b4271a4b50..094c9a7b9e 100644
--- a/usr/src/test/os-tests/tests/secflags/Makefile
+++ b/usr/src/test/os-tests/tests/secflags/Makefile
@@ -43,7 +43,7 @@ addrs-32: addrs.c
 	$(POST_PROCESS)
 
 addrs-64: addrs.c
-	$(LINK64.c) addrs.c -o $@ $(LDLIBS)
+	$(LINK64.c) addrs.c -o $@ $(LDLIBS64)
 	$(POST_PROCESS)
 
 stacky := MAPFILE.NES=			# Will foil the test, clearly
diff --git a/usr/src/tools/sgs/libld/Makefile b/usr/src/tools/sgs/libld/Makefile
index 2760ed34dc..6897a0b18d 100644
--- a/usr/src/tools/sgs/libld/Makefile
+++ b/usr/src/tools/sgs/libld/Makefile
@@ -31,12 +31,19 @@ include		$(SGSHOME)/libld/Makefile.com
 
 .KEEP_STATE:
 
+#
+# By using libld's Makefile.com LDLIBS ends up pointing to the proto
+# area and many of the directories of cmd/sgs. As such, we need to reset
+# that and just make sure to find everything relative to the tools proto
+# area.
+#
+LDLIBS =
 CW_LINKER =
 
 CPPFLAGS = $(NATIVE_CPPFLAGS) -DUSE_LIBLD_MALLOC -I$(SRC)/lib/libc/inc \
 		    -I$(SRC)/uts/common/krtld -I$(SRC)/uts/sparc \
 		    $(VAR_LIBLD_CPPFLAGS)
-LDLIBS +=	-L$(ROOTONBLDLIBMACH) -L../libconv -lconv -llddbg -lelf -lc
+LDLIBS +=	-L../libconv -lconv -L$(ROOTONBLDLIBMACH) -llddbg -lelf -lc
 NATIVE_LIBS +=	libc.so
 
 DYNFLAGS +=	$(VERSREF) '-R$$ORIGIN'