11461 should use a native link-editor during the build
11463 SUNWonld has passed its use-by date
11464 cmd/sgs/tools should contain tools, not common code
11465 sgsmsg should be built with the rest of the build tools

@@ -27,17 +27,17 @@
 
 RTLD=           ld.so.1
 
 AVLOBJ=         avl.o
 DTROBJ=         dtrace_data.o
-TOOLOBJS=       alist.o strhash.o
+SGSCOMMONOBJ=   alist.o strhash.o
 BLTOBJ=         msg.o
 ELFCAPOBJ=      elfcap.o
 OBJECTS=        $(BLTOBJ) \
                 $(AVLOBJ) \
                 $(DTROBJ) \
-                $(TOOLOBJS) \
+                $(SGSCOMMONOBJ) \
                 $(ELFCAPOBJ) \
                 $(P_ASOBJS)   $(P_COMOBJS)   $(P_MACHOBJS)   $(G_MACHOBJS)  \
                 $(S_ASOBJS)   $(S_COMOBJS)   $(S_MACHOBJS)   $(CP_MACHOBJS)
 
 COMOBJS=        $(P_COMOBJS)  $(S_COMOBJS)

@@ -73,14 +73,14 @@
 ROOTDYNLIB64=   $(RTLD:%=$(ROOTFS_LIBDIR64)/%)
 
 
 FILEMODE =      755
 
-CPPFLAGS +=     -I$(SRCBASE)/lib/libc/inc \
-                -I$(SRCBASE)/uts/common/krtld \
-                -I$(SRCBASE)/uts/$(PLAT) \
-                -I$(SRCBASE)/uts/$(PLAT)/krtld \
+CPPFLAGS +=     -I$(SRC)/lib/libc/inc \
+                -I$(SRC)/uts/common/krtld \
+                -I$(SRC)/uts/$(PLAT) \
+                -I$(SRC)/uts/$(PLAT)/krtld \
                 -I$(SRC)/common/sgsrtcid \
                 -I$(ELFCAP) \
                  $(CPPFEATUREMACROS)
 
 ASFLAGS=        -P -D_ASM $(CPPFLAGS)

@@ -99,15 +99,15 @@
 # This is required for the system's self-consistency in any case.
 CPICLIB =       $(VAR_RTLD_CPICLIB)
 CPICLIB64 =     $(VAR_RTLD_CPICLIB64)
 CLIB =          -lc_pic
 
-LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) \
+LDLIBS +=       $(CONVLIBDIR) -lconv \
                 $(CPICLIB) $(CLIB) \
-                $(LDDBGLIBDIR) $(LDDBG_LIB) \
+                $(LDDBGLIBDIR) -llddbg \
                 $(RTLDLIB) -lrtld \
-                $(LDLIB) $(LD_LIB)
+                $(LDLIB) -lld
 
 DYNFLAGS +=     -i -e _rt_boot $(VERSREF) $(ZNODLOPEN) \
                 $(ZINTERPOSE) -zdtrace=dtrace_data '-R$$ORIGIN'
 
 BUILD.s=        $(AS) $(ASFLAGS) $< -o $@

@@ -136,13 +136,13 @@
 SGSMSGFLAGS1=   $(SGSMSGFLAGS) -m $(BLTMESG)
 SGSMSGFLAGS2=   $(SGSMSGFLAGS) -h $(BLTDEFS) -d $(BLTDATA) -n rtld_msg
 
 SRCS=           $(AVLOBJ:%.o=$(VAR_AVLDIR)/%.c) \
                 $(DTROBJ:%.o=$(VAR_DTRDIR)/%.c) \
-                $(TOOLOBJS:%.o=$(SGSTOOLS)/common/%.c) \
+                $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) \
                 $(COMOBJS:%.o=../common/%.c)  $(MACHOBJS:%.o=%.c) $(BLTDATA) \
-                $(G_MACHOBJS:%.o=$(SRCBASE)/uts/$(PLAT)/krtld/%.c) \
+                $(G_MACHOBJS:%.o=$(SRC)/uts/$(PLAT)/krtld/%.c) \
                 $(CP_MACHOBJS:%.o=../$(MACH)/%.c) \
                 $(ASOBJS:%.o=%.s)
 
 CLEANFILES +=   $(CRTS) $(BLTFILES)
 CLOBBERFILES += $(RTLD)