Index: b/usr/src/cmd/sgs/rtld/Makefile.targ
===================================================================
--- a/usr/src/cmd/sgs/rtld/Makefile.targ
+++ b/usr/src/cmd/sgs/rtld/Makefile.targ
@@ -67,7 +67,7 @@ pics/elfcap.o:	$(ELFCAP)/elfcap.c
 		$(POST_PROCESS_O)
 
 $(RTLD):	pics $(PICS) $(CRTS)
-		$(LD_USE_PROTO)ld -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \
+		$(LD) -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \
 		    $(LDLIBS) $(CRTN)
 		$(POST_PROCESS_SO)
 
Index: b/usr/src/cmd/sgs/rtld/amd64/Makefile
===================================================================
--- a/usr/src/cmd/sgs/rtld/amd64/Makefile
+++ b/usr/src/cmd/sgs/rtld/amd64/Makefile
@@ -69,7 +69,7 @@ ADBGENCFLAGS +=	-erroff=%all
 ADBSUB=		$(ADBSUB64)
 CPPFLAGS +=	-D_ELF64
 LINTFLAGS64 +=	$(VAR_LINTFLAGS64)
-SONAME=		/lib/amd64/ld.so.1
+SONAME=		$(DEB_LIBDIR_64)/ld.so.1
 
 SGSMSGTARG +=	$(SGSMSGINTEL) $(SGSMSGINTEL64) $(SGSMSG64)
 
Index: b/usr/src/cmd/sgs/rtld/i386/Makefile
===================================================================
--- a/usr/src/cmd/sgs/rtld/i386/Makefile
+++ b/usr/src/cmd/sgs/rtld/i386/Makefile
@@ -66,7 +66,7 @@ include		$(SRC)/cmd/sgs/rtld/Makefile.co
 ADBGENCFLAGS +=	-erroff=%all
 ADBGENFLAGS +=	-milp32
 ADBSUB=		$(ADBSUB32)
-SONAME=		/lib/ld.so.1
+SONAME=		$(DEB_LIBDIR_32)/ld.so.1
 
 SGSMSGTARG +=	$(SGSMSGINTEL) $(SGSMSGINTEL32) $(SGSMSG32)
 
Index: b/usr/src/cmd/sgs/rtld/Makefile
===================================================================
--- a/usr/src/cmd/sgs/rtld/Makefile
+++ b/usr/src/cmd/sgs/rtld/Makefile
@@ -25,6 +25,6 @@
 
 include		$(SRC)/cmd/sgs/Makefile.com
 
-EXTRASUBDIRS =	mdbmod
+EXTRASUBDIRS =
 
 include		$(SRC)/cmd/sgs/Makefile.sub
Index: b/usr/src/cmd/sgs/rtld/common/elf.c
===================================================================
--- a/usr/src/cmd/sgs/rtld/common/elf.c
+++ b/usr/src/cmd/sgs/rtld/common/elf.c
@@ -139,9 +139,9 @@ elf_fix_name(const char *name, Rt_map *c
 	if (((*name == '/') &&
 	/* BEGIN CSTYLED */
 #if	defined(_ELF64)
-	    (strcmp(name, MSG_ORIG(MSG_PTH_RTLD_64)) == 0)) ||
+	    (strcmp(name, DEB_LIBDIR_64 "/ld.so.1") == 0)) ||
 #else
-	    (strcmp(name, MSG_ORIG(MSG_PTH_RTLD)) == 0)) ||
+	    (strcmp(name, DEB_LIBDIR_32 "/ld.so.1") == 0)) ||
 #endif
 	    (strcmp(name, MSG_ORIG(MSG_FIL_RTLD)) == 0)) {
 		/* END CSTYLED */
@@ -986,9 +986,9 @@ _elf_lookup_filtee(Slookup *slp, Sresult
 			 * libdl.so.1, which is a filter on ld.so.1.
 			 */
 #if	defined(_ELF64)
-			if (strcmp(filtee, MSG_ORIG(MSG_PTH_RTLD_64)) == 0) {
+			if (strcmp(filtee, DEB_LIBDIR_64 "/ld.so.1") == 0) {
 #else
-			if (strcmp(filtee, MSG_ORIG(MSG_PTH_RTLD)) == 0) {
+			if (strcmp(filtee, DEB_LIBDIR_32 "/ld.so.1") == 0) {
 #endif
 				uint_t	hflags, rdflags, cdflags;