6683064 check_rtime could do with some spring cleaning

41 files changed, 195 insertions, 165 deletions

diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib
index 4a500cb0a3..57e5fe8d23 100644
--- a/usr/src/lib/Makefile.lib
+++ b/usr/src/lib/Makefile.lib
@@ -170,7 +170,7 @@ SONAME=		$(DYNLIB)
 
 
 HSONAME=	-h$(SONAME)
-DYNFLAGS=	$(HSONAME) $(ZTEXT) $(ZDEFS) $(ZCOMBRELOC) $(BDIRECT) \
+DYNFLAGS=	$(HSONAME) $(ZTEXT) $(ZDEFS) $(BDIRECT) \
 		$(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
 
 LDLIBS=		$(LDLIBS.lib)
@@ -244,7 +244,7 @@ HSONAMECCC=	-h $(SONAMECCC)
 #
 # Keep in sync with the standard DYNFLAGS
 #
-$(DYNLIBCCC):=	DYNFLAGS = $(HSONAMECCC) $(ZTEXT) $(ZDEFS) $(ZCOMBRELOC) \
+$(DYNLIBCCC):=	DYNFLAGS = $(HSONAMECCC) $(ZTEXT) $(ZDEFS) \
 		$(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) \
 		$(BDIRECT) $(NORUNPATH)
 
diff --git a/usr/src/lib/efcode/extend/sparcv9/Makefile b/usr/src/lib/efcode/extend/sparcv9/Makefile
index 1c13ef5f37..4c18f69631 100644
--- a/usr/src/lib/efcode/extend/sparcv9/Makefile
+++ b/usr/src/lib/efcode/extend/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,6 +28,6 @@
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
-DYNFLAGS += $(FCODE64)
+DYNFLAGS += $(FCODE64) -Mmapfile-extern
 
 install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/efcode/extend/sparcv9/mapfile-extern b/usr/src/lib/efcode/extend/sparcv9/mapfile-extern
new file mode 100644
index 0000000000..ae176a022d
--- /dev/null
+++ b/usr/src/lib/efcode/extend/sparcv9/mapfile-extern
@@ -0,0 +1,31 @@
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (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
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# External interface requirements
+{
+	global:
+		env =	EXTERN;
+};
diff --git a/usr/src/lib/efcode/packages/Makefile.com b/usr/src/lib/efcode/packages/Makefile.com
index d481808477..6fd40ec136 100644
--- a/usr/src/lib/efcode/packages/Makefile.com
+++ b/usr/src/lib/efcode/packages/Makefile.com
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,4 +35,4 @@ include ../../Makefile.efcode
 # and we have to compile one of them first.  Since no one other than fcdriver
 # directly links with fcpackage, this is the simplest way out.
 #
-ZDEFS	=
+MAPFILE-EXT = ../mapfile-extern
diff --git a/usr/src/lib/efcode/packages/mapfile-extern b/usr/src/lib/efcode/packages/mapfile-extern
new file mode 100644
index 0000000000..172e39cc61
--- /dev/null
+++ b/usr/src/lib/efcode/packages/mapfile-extern
@@ -0,0 +1,32 @@
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (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
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# External interface requirements
+{
+	global:
+		fc_run_priv =		EXTERN;
+		search_for_fcode_file =	EXTERN;
+};
diff --git a/usr/src/lib/efcode/packages/sparcv9/Makefile b/usr/src/lib/efcode/packages/sparcv9/Makefile
index 1c13ef5f37..9147403a9e 100644
--- a/usr/src/lib/efcode/packages/sparcv9/Makefile
+++ b/usr/src/lib/efcode/packages/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,6 +28,6 @@
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
-DYNFLAGS += $(FCODE64)
+DYNFLAGS += $(FCODE64) -M$(MAPFILE-EXT)
 
 install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/fm/topo/libtopo/sparc/Makefile b/usr/src/lib/fm/topo/libtopo/sparc/Makefile
index 45d8e4685f..ddd13b2c7d 100644
--- a/usr/src/lib/fm/topo/libtopo/sparc/Makefile
+++ b/usr/src/lib/fm/topo/libtopo/sparc/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,6 +29,5 @@ include ../Makefile.com
 
 CPPFLAGS += -I $(ROOT)/usr/platform/sun4v/include
 LDLIBS += -L$(ROOTLIBDIR)
-DYNFLAGS += -R/usr/lib/fm
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile b/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile
index 52138386fe..0db0f4bdc2 100644
--- a/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile
+++ b/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -30,6 +30,5 @@ include ../../../../Makefile.lib.64
 
 CPPFLAGS += -I $(ROOT)/usr/platform/sun4v/include
 LDLIBS += -L$(ROOTLIBDIR64)
-DYNFLAGS += -R/usr/lib/fm/$(MACH64)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 b/usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
index 977f56b62a..1b9d0ed726 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
@@ -1,5 +1,5 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -27,8 +27,10 @@ KCLNTLIB = $(ROOT)$(KERBLIBDIR)/libkadm5clnt.so
 KCLNTLIB64 = $(ROOT)$(KERBLIBDIR64)/libkadm5clnt.so
 
 # Run-time library seach path
-KRUNPATH = -R$(KLIBDIR) -R$(KERBLIBDIR)
-KRUNPATH64 = -R$(KLIBDIR64) -R$(KERBLIBDIR64)
+KRUNPATH = -R$(KLIBDIR)
+KRUNPATH64 = -R$(KLIBDIR64)
+KERBRUNPATH = -R$(KERBLIBDIR)
+KERBRUNPATH64 = -R$(KERBLIBDIR64)
 
 CPPFLAGS +=	-DKRB5_DNS_LOOKUP \
 		-DKRB5_DNS_LOOKUP_KDC
diff --git a/usr/src/lib/krb5/kadm5/srv/i386/Makefile b/usr/src/lib/krb5/kadm5/srv/i386/Makefile
index ecc8937a36..135b1cfbc1 100644
--- a/usr/src/lib/krb5/kadm5/srv/i386/Makefile
+++ b/usr/src/lib/krb5/kadm5/srv/i386/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,7 +28,7 @@
 include ../Makefile.com
 
 # library dependency
-DYNFLAGS += $(KRUNPATH) $(KMECHLIB)
+DYNFLAGS += $(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
 DYNFLAGS += $(KRB5LIB)/libkdb.so $(KRB5LIB)/libdyn.so
 LDLIBS += -L $(ROOTLIBDIR) -lgss -lnsl -lc -lsocket
 
diff --git a/usr/src/lib/krb5/kadm5/srv/sparc/Makefile b/usr/src/lib/krb5/kadm5/srv/sparc/Makefile
index ecc8937a36..135b1cfbc1 100644
--- a/usr/src/lib/krb5/kadm5/srv/sparc/Makefile
+++ b/usr/src/lib/krb5/kadm5/srv/sparc/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,7 +28,7 @@
 include ../Makefile.com
 
 # library dependency
-DYNFLAGS += $(KRUNPATH) $(KMECHLIB)
+DYNFLAGS += $(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
 DYNFLAGS += $(KRB5LIB)/libkdb.so $(KRB5LIB)/libdyn.so
 LDLIBS += -L $(ROOTLIBDIR) -lgss -lnsl -lc -lsocket
 
diff --git a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
index ba189df3fa..19ae7f9e4f 100644
--- a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
+++ b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
@@ -67,7 +67,7 @@ CPPFLAGS += 	-DHAVE_CONFIG_H -DHAVE_BT_RSEQ \
 
 CFLAGS +=	$(CCVERBOSE)
 
-DYNFLAGS +=	$(KRUNPATH) $(KMECHLIB)
+DYNFLAGS +=	$(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
 LDLIBS +=	-L $(ROOTLIBDIR) -ldb2 -lkdb -lkadm5srv -lc -lnsl
 
 .KEEP_STATE:
diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com
index b6347d2a3c..6d7d551406 100644
--- a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com
+++ b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -62,7 +62,7 @@ CPPFLAGS += 	-DHAVE_CONFIG_H \
 
 CFLAGS +=	$(CCVERBOSE)
 
-DYNFLAGS +=	$(KRUNPATH)
+DYNFLAGS +=	$(KERBRUNPATH)
 # setting -L $(ROOT)/usr/lib/gss because libkdb_ldap needs mech_krb5
 LDLIBS +=	-L $(ROOT)/usr/lib/gss -L $(ROOTLIBDIR) -lkdb_ldap -lc
 
diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com
index e3272ab396..aa7e830953 100644
--- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com
+++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -76,7 +76,7 @@ CPPFLAGS += 	-DHAVE_CONFIG_H \
 		-DUSE_KADM5_API_VERSION=2
 
 CFLAGS +=	$(CCVERBOSE) -I..
-DYNFLAGS += $(KRUNPATH) $(KMECHLIB)
+DYNFLAGS +=	$(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
 LDLIBS +=	-L $(ROOTLIBDIR) -lkadm5srv -lc -lnsl -lldap
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libast/Makefile.com b/usr/src/lib/libast/Makefile.com
index b982eee7d5..1f490de47c 100644
--- a/usr/src/lib/libast/Makefile.com
+++ b/usr/src/lib/libast/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -655,9 +655,7 @@ SRCS=		$(OBJECTS:%.o=../%.c)
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
-LDLIBS += \
-	-z lazyload -lsocket -z nolazyload \
-	-lm -lc
+LDLIBS +=	-lsocket -lm -lc
 
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
diff --git a/usr/src/lib/libbsm/Makefile.com b/usr/src/lib/libbsm/Makefile.com
index 9f8d068b06..3c69d8da97 100644
--- a/usr/src/lib/libbsm/Makefile.com
+++ b/usr/src/lib/libbsm/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -88,10 +88,7 @@ ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
 CLEANFILES +=	$(LINTOUT) $(LINTLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
-
-LAZYLIBS =	$(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD)
-LDLIBS +=	-lsocket -lnsl -lmd -lc -lsecdb $(LAZYLIBS)
-lint :=		LAZYLIBS = -ltsol
+LDLIBS +=	-lsocket -lnsl -lmd -lc -lsecdb -ltsol
 
 COMDIR=		../common
 
diff --git a/usr/src/lib/libc_db/Makefile.com b/usr/src/lib/libc_db/Makefile.com
index 179e75b3c4..ecd5baa67e 100644
--- a/usr/src/lib/libc_db/Makefile.com
+++ b/usr/src/lib/libc_db/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,9 +37,6 @@ OBJECTS = $(CRTI) $(CMNOBJS) $(CRTN)
 include	../../Makefile.lib
 include ../../Makefile.rootfs
 
-# Override defaults
-ZDEFS =
-
 LIBS = $(DYNLIB) $(LINTLIB)
 
 SRCDIR =	../common
diff --git a/usr/src/lib/libc_db/common/mapfile-vers b/usr/src/lib/libc_db/common/mapfile-vers
index 12cf359416..e01525abd4 100644
--- a/usr/src/lib/libc_db/common/mapfile-vers
+++ b/usr/src/lib/libc_db/common/mapfile-vers
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -145,3 +145,23 @@ SUNWprivate_1.1 {
     local:
 	*;
 };
+
+# External interface requirements
+
+{
+    global:
+	ps_lcontinue =		EXTERN;
+	ps_lgetfpregs =		EXTERN;
+	ps_lgetregs =		EXTERN;
+	ps_lgetxregs =		EXTERN;
+	ps_lgetxregsize =	EXTERN;
+	ps_lsetfpregs =		EXTERN;
+	ps_lsetregs =		EXTERN;
+	ps_lsetxregs =		EXTERN;
+	ps_lstop =		EXTERN;
+	ps_pcontinue =		EXTERN;
+	ps_pdread =		EXTERN;
+	ps_pdwrite =		EXTERN;
+	ps_pglobal_lookup =	EXTERN;
+	ps_pstop =		EXTERN;
+};
diff --git a/usr/src/lib/libcmd/Makefile.com b/usr/src/lib/libcmd/Makefile.com
index b87ad23c8c..388e72a927 100644
--- a/usr/src/lib/libcmd/Makefile.com
+++ b/usr/src/lib/libcmd/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -85,9 +85,7 @@ include ../../../Makefile.ast
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
-LDLIBS += \
-	-z lazyload -last -lsocket -lnsl -z nolazyload \
-	-lc
+LDLIBS +=	-last -lsocket -lnsl -lc
 
 SRCDIR =	../common
 
diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com
index 74447da003..4d8653fdaa 100644
--- a/usr/src/lib/libkmf/libkmf/Makefile.com
+++ b/usr/src/lib/libkmf/libkmf/Makefile.com
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -58,15 +58,12 @@ LIBS=	$(DYNLIB) $(LINTLIB)
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 
-LAZYLIBS=	$(ZLAZYLOAD) -lpkcs11 $(ZNOLAZYLOAD)
-lint		:=	LAZYLIBS =	-lpkcs11
-
-LDLIBS		+=	$(BERDERLIB) $(CRYPTOUTILLIB) -lmd $(LAZYLIBS) -lnsl -lsocket -lc 
-LDLIBS64	+=	$(BERDERLIB64) $(CRYPTOUTILLIB64) -lmd $(LAZYLIBS) -lnsl -lsocket -lc 
+LDLIBS	+=	$(BERDERLIB) $(CRYPTOUTILLIB) -lmd -lpkcs11 -lnsl -lsocket -lc 
+LDLIBS6	+=	$(BERDERLIB64) $(CRYPTOUTILLIB64) -lmd -lpkcs11 -lnsl -lsocket -lc 
 
 # DYNLIB libraries do not have lint libs and are not linted
-$(DYNLIB) :=    LDLIBS += $(ZLAZYLOAD) -lxml2 $(ZNOLAZYLOAD)
-$(DYNLIB64) :=  LDLIBS64 += $(ZLAZYLOAD) -lxml2 $(ZNOLAZYLOAD)
+$(DYNLIB) :=    LDLIBS += -lxml2
+$(DYNLIB64) :=  LDLIBS64 += -lxml2
 
 CPPFLAGS	+=	-I$(INCDIR) -I/usr/include/libxml2 -I../../ber_der/inc -I$(SRCDIR)
 
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
index ce639da0e1..acb4c3229a 100644
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,11 +36,8 @@ include $(SRC)/lib/openssl/Makefile.openssl
 
 LIBLINKS=	$(DYNLIB:.so.1=.so)
 KMFINC=		-I../../../include -I../../../ber_der/inc
-LAZYLIBS=	$(ZLAZYLOAD) -lkmf $(ZNOLAZYLOAD) -lkmfberder
 
-lint:=	LAZYLIBS	=	-lkmf -lkmfberder
-
-BERLIB=		$(LAZYLIBS)
+BERLIB=		-lkmf -lkmfberder
 BERLIB64=	$(BERLIB)
 
 OPENSSLLIBS=	$(BERLIB) $(OPENSSL_DYNFLAGS) $(OPENSSL_LDFLAGS) -lcrypto -lcryptoutil -lc
diff --git a/usr/src/lib/libmd/common/mapfile-vers b/usr/src/lib/libmd/common/mapfile-vers
index c7c94a6083..4963c5f1dd 100644
--- a/usr/src/lib/libmd/common/mapfile-vers
+++ b/usr/src/lib/libmd/common/mapfile-vers
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -44,9 +44,9 @@ SUNW_1.1 {
 	MD4Init;
 	MD4Update;
 	md5_calc;
-	MD5Final;
-	MD5Init;
-	MD5Update;
+	MD5Final =	NODIRECT;	# Address interposition from testsuite
+	MD5Init =	NODIRECT;	# Address interposition from testsuite
+	MD5Update =	NODIRECT;	# Address interposition from testsuite
 	SHA1Final;
 	SHA1Init;
 	SHA1Update;
diff --git a/usr/src/lib/libmp/i386/Makefile b/usr/src/lib/libmp/i386/Makefile
index 9c62a2b7ac..ee90826c9b 100644
--- a/usr/src/lib/libmp/i386/Makefile
+++ b/usr/src/lib/libmp/i386/Makefile
@@ -41,7 +41,7 @@ $(ROOTLIBDIR)/$(OLIBRARY) :=	FILEMODE= 755
 
 $(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 -M$(OMAPFILE) \
+	    $(BDIRECT) pics/pics_mp.o libmp.so.2 -M$(OMAPFILE) \
 	    $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
 	$(POST_PROCESS_SO)
 
diff --git a/usr/src/lib/libnsl/Makefile.com b/usr/src/lib/libnsl/Makefile.com
index ecea2a5007..55a8299ee7 100644
--- a/usr/src/lib/libnsl/Makefile.com
+++ b/usr/src/lib/libnsl/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -204,10 +204,9 @@ CPPFLAGS +=	-I$(SRC)/lib/common/inc -I$(SRC)/lib/libnsl/include -D_REENTRANT
 CPPFLAGS +=	-I$(SRC)/lib/libnsl/dial
 
 CFLAGS +=	$(CCVERBOSE)
+LDLIBS +=	-lmp -lmd -lscf -lc
 
-LAZYLIBS = $(ZLAZYLOAD) -lmp -lmd -lscf $(ZNOLAZYLOAD)
-lint := LAZYLIBS = -lmd
-LDLIBS +=	$(LAZYLIBS) -lc
+lint :=		LDLIBS = -lmd -lscf -lc
 
 $(LINTLIB):=	SRCS=$(SRCDIR)/$(LINTSRC)
 LINTFLAGS +=	-m -DPORTMAP
diff --git a/usr/src/lib/libproject/Makefile.com b/usr/src/lib/libproject/Makefile.com
index 454a72f3e5..f40d9365e2 100644
--- a/usr/src/lib/libproject/Makefile.com
+++ b/usr/src/lib/libproject/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -50,10 +50,7 @@ CLEANFILES +=	$(LINTOUT) $(LINTLIB)
 
 CPPFLAGS +=	-D_REENTRANT
 CFLAGS +=	$(CCVERBOSE)
-LDLIBS +=	-lc -lsecdb -lproc
-
-lint :=		LDLIBS += -lpool
-$(LIBS) :=	LDLIBS += $(ZLAZYLOAD) -lpool $(ZNOLAZYLOAD)
+LDLIBS +=	-lc -lsecdb -lproc -lpool
 
 $(LINTLIB) :=	SRCS = ../common/llib-lproject
 
diff --git a/usr/src/lib/librestart/Makefile.com b/usr/src/lib/librestart/Makefile.com
index 88115f928c..feb2b242ef 100644
--- a/usr/src/lib/librestart/Makefile.com
+++ b/usr/src/lib/librestart/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -35,14 +35,7 @@ include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
-START_LAZY =	$(ZLAZYLOAD)
-END_LAZY =	$(ZNOLAZYLOAD)
-
-lintcheck := START_LAZY =
-lintcheck := END_LAZY =
-
-LDLIBS +=	$(START_LAZY) -lpool -lproject $(END_LAZY) \
-		-lsecdb -lnvpair -lsysevent -lscf -luutil -lc
+LDLIBS +=	-lpool -lproject -lsecdb -lnvpair -lsysevent -lscf -luutil -lc
 
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libshell/Makefile.com b/usr/src/lib/libshell/Makefile.com
index 6645641727..3e071f416a 100644
--- a/usr/src/lib/libshell/Makefile.com
+++ b/usr/src/lib/libshell/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -118,14 +118,7 @@ MAPFILES=       ../mapfile-vers
 include ../../../Makefile.ast
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-
-# load dll, socket, and secdb libraries on demand
-LDLIBS += \
-	-lcmd \
-	-z lazyload -ldll -z nolazyload \
-	-last \
-	-z lazyload -lsocket -lsecdb -z nolazyload \
-	-lm -lc
+LDLIBS +=	-lcmd -ldll -last -lsocket -lsecdb -lm -lc
 
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
diff --git a/usr/src/lib/libtsnet/Makefile.com b/usr/src/lib/libtsnet/Makefile.com
index 6e8d1e3105..5e73758b4e 100644
--- a/usr/src/lib/libtsnet/Makefile.com
+++ b/usr/src/lib/libtsnet/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -44,9 +44,7 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-LAZYLIBS =	$(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD)
-LDLIBS +=	-lsocket -lnsl -lc -lsecdb $(LAZYLIBS)
-lint :=		LAZYLIBS = -ltsol
+LDLIBS +=	-lsocket -lnsl -lc -lsecdb -ltsol
 
 LIBTSOLINC =	$(SRC)/lib/libtsol/common
 
diff --git a/usr/src/lib/libvscan/Makefile.com b/usr/src/lib/libvscan/Makefile.com
index ad64aef81b..8d856c1182 100644
--- a/usr/src/lib/libvscan/Makefile.com
+++ b/usr/src/lib/libvscan/Makefile.com
@@ -42,7 +42,6 @@ ROOTLIBDIR = $(ROOT)/usr/lib/vscan
 LDLIBS += -lc -lscf -lsecdb -lnsl -lm
 CFLAGS += $(CCVERBOSE)
 CPPFLAGS += -I$(SRCDIR)
-DYNFLAGS += -R/usr/lib/vscan
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/lvm/libpreen/Makefile.com b/usr/src/lib/lvm/libpreen/Makefile.com
index 8e15d6d753..964492389d 100644
--- a/usr/src/lib/lvm/libpreen/Makefile.com
+++ b/usr/src/lib/lvm/libpreen/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,8 +34,7 @@ include $(SRC)/lib/lvm/Makefile.lvm
 ROOTLIBDIR=	$(ROOT)/usr/lib/drv
 LIBS=		$(DYNLIB) 	# don't build a static lib
 CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
-LDLIBS +=	-lmeta -lc
-ZDEFS=
+LDLIBS +=	-lmeta -ldevid -lc
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/lvm/libpreen/common/mapfile-vers b/usr/src/lib/lvm/libpreen/common/mapfile-vers
index 4273789ce2..3db9d71b5e 100644
--- a/usr/src/lib/lvm/libpreen/common/mapfile-vers
+++ b/usr/src/lib/lvm/libpreen/common/mapfile-vers
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -31,3 +31,11 @@ SUNWprivate_1.1 {
     local:
 	*;
 };
+
+# External interface requirements
+
+{
+    global:
+	preen_addunit =	EXTERN;
+	preen_subdev =	EXTERN;
+};
diff --git a/usr/src/lib/pam_modules/krb5/amd64/Makefile b/usr/src/lib/pam_modules/krb5/amd64/Makefile
index 4703d1ce13..b1a5f12f9c 100644
--- a/usr/src/lib/pam_modules/krb5/amd64/Makefile
+++ b/usr/src/lib/pam_modules/krb5/amd64/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,6 +31,6 @@ include ../../../Makefile.lib.64
 LDLIBS +=	-lpam -lnsl -lc
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) \
-		$(KRUNPATH64) -lkadm5clnt -lmech_krb5
+		$(KRUNPATH64) $(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/pam_modules/krb5/i386/Makefile b/usr/src/lib/pam_modules/krb5/i386/Makefile
index 53d3a2ede2..2d32d64b6f 100644
--- a/usr/src/lib/pam_modules/krb5/i386/Makefile
+++ b/usr/src/lib/pam_modules/krb5/i386/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,19 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/i386/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 
 LDLIBS +=	-lpam -lnsl -lc
-DYNFLAGS +=   -L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) \
-              $(KRUNPATH) -lkadm5clnt -lmech_krb5
 
+DYNFLAGS +=	-L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) \
+		$(KRUNPATH) $(KERBRUNPATH) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pam_modules/krb5/sparc/Makefile b/usr/src/lib/pam_modules/krb5/sparc/Makefile
index 6d2d306d65..2d32d64b6f 100644
--- a/usr/src/lib/pam_modules/krb5/sparc/Makefile
+++ b/usr/src/lib/pam_modules/krb5/sparc/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,18 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/sparc/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 
 LDLIBS +=	-lpam -lnsl -lc
+
 DYNFLAGS +=	-L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) \
-		$(KRUNPATH) -lkadm5clnt -lmech_krb5
+		$(KRUNPATH) $(KERBRUNPATH) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pam_modules/krb5/sparcv9/Makefile b/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
index c7763c06df..b1a5f12f9c 100644
--- a/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
+++ b/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,19 +19,18 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/sparcv9/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
 LDLIBS +=	-lpam -lnsl -lc
+
 DYNFLAGS +=	-L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) \
-		$(KRUNPATH64) -lkadm5clnt -lmech_krb5
+		$(KRUNPATH64) $(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile b/usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile
index e90a8c7833..ea87dcb26a 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile
-#
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) $(KRUNPATH64) \
-		-lkadm5clnt -lmech_krb5
+		$(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/pam_modules/krb5_migrate/i386/Makefile b/usr/src/lib/pam_modules/krb5_migrate/i386/Makefile
index 9b339a1101..da4c6d1c57 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/i386/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/i386/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/i386/Makefile
-#
 
 include ../Makefile.com
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) $(KRUNPATH) \
-		-lkadm5clnt -lmech_krb5
+		$(KERBRUNPATH) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile b/usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile
index d800db7cb8..da4c6d1c57 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile
-#
 
 include ../Makefile.com
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) $(KRUNPATH) \
-		-lkadm5clnt -lmech_krb5
+		$(KERBRUNPATH) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile b/usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile
index b631cd25d0..ea87dcb26a 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # 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.
+# Common Development and Distribution License (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.
@@ -20,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile
-#
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) $(KRUNPATH64) \
-		-lkadm5clnt -lmech_krb5
+		$(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine
index f48357fef2..8a8941813d 100644
--- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine
+++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine
@@ -68,7 +68,7 @@ CFLAGS64 += -G $(XREGSFLAG)
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 CPPFLAGS += -I../../../../../libscsi/common
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZIGNORE)
+LDFLAGS += $(ZTEXT) $(ZIGNORE)
 
 $(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP)
 $(PROG) := LDLIBS += -lc
diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.lib b/usr/src/lib/scsi/plugins/ses/Makefile.lib
index d83642254e..719463197a 100644
--- a/usr/src/lib/scsi/plugins/ses/Makefile.lib
+++ b/usr/src/lib/scsi/plugins/ses/Makefile.lib
@@ -77,7 +77,7 @@ CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
 CFLAGS64 += -G $(XREGSFLAG) 
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZIGNORE)
+LDFLAGS += $(ZTEXT) $(ZIGNORE)
 
 $(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP)
 $(PROG) := LDLIBS += -lc -lnvpair