diff options
| author | rie <none@none> | 2008-05-02 15:01:06 -0700 |
|---|---|---|
| committer | rie <none@none> | 2008-05-02 15:01:06 -0700 |
| commit | 67e3a03ed4a2813074d36330f062ed6e593a4937 (patch) | |
| tree | 0771dd676aaf74320c2a78fd424decf4c07347b9 | |
| parent | 5c0a55ff7158dbb6220c31dda253139cf9cf5fde (diff) | |
| download | illumos-joyent-67e3a03ed4a2813074d36330f062ed6e593a4937.tar.gz | |
6683064 check_rtime could do with some spring cleaning
130 files changed, 709 insertions, 557 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 9826cef17b..4983c818f5 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -747,7 +747,6 @@ BNODIRECT= -Bnodirect BREDUCE= -Breduce BSTATIC= -Bstatic -ZCOMBRELOC= -zcombreloc ZDEFS= -zdefs ZDIRECT= -zdirect ZIGNORE= -zignore diff --git a/usr/src/cmd/allocate/Makefile b/usr/src/cmd/allocate/Makefile index 005b180983..cd572ed03e 100644 --- a/usr/src/cmd/allocate/Makefile +++ b/usr/src/cmd/allocate/Makefile @@ -20,7 +20,7 @@ # # -# 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" @@ -104,13 +104,13 @@ $(ROOTSECLIB)/% := FILEMODE = 0555 $(ROOTSECLIB)/% := OWNER = root $(ROOTSECLIB)/% := GROUP = sys -LAZYLIBS = $(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD) -lint := LDLIBS += -lbsm -lsec -lsecdb -ltsol -ldevinfo -$(PROGalloc) := LDLIBS += -lbsm -lsec -lsecdb -ldevinfo $(LAZYLIBS) +lint := LDLIBS += -lbsm -lsec -lsecdb -ldevinfo -ltsol + +$(PROGalloc) := LDLIBS += -lbsm -lsec -lsecdb -ldevinfo -ltsol $(PROGmkdevalloc) := LDLIBS += -lbsm $(PROGdminfo) := LDLIBS += -lbsm $(PROGaudio) := LDLIBS += -lbsm -$(PROGaddalloc) := LDLIBS += -lbsm -lsecdb $(LAZYLIBS) +$(PROGaddalloc) := LDLIBS += -lbsm -lsecdb -ltsol CLOBBERFILES += $(SCRIPTS) diff --git a/usr/src/cmd/auditreduce/Makefile b/usr/src/cmd/auditreduce/Makefile index 3b5c54b5e9..a740ee24a1 100644 --- a/usr/src/cmd/auditreduce/Makefile +++ b/usr/src/cmd/auditreduce/Makefile @@ -21,7 +21,7 @@ # # -# 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" @@ -40,9 +40,7 @@ POFILE=auditreduce.po POFILES=main.po option.po proc.po time.po token.po CPPFLAGS += -I$(TABLEDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -LAZYLIBS = $(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD) -lint := LAZYLIBS = -ltsol -LDLIBS += -lnsl -lbsm -lscf $(LAZYLIBS) +LDLIBS += -lnsl -lbsm -lscf -ltsol .KEEP_STATE: diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile index 06ea43d4aa..9ff966839b 100644 --- a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile +++ b/usr/src/cmd/cmd-crypto/cryptoadm/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 2005 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" @@ -47,7 +46,6 @@ POFILE = $(PROG)_all.po CFLAGS += $(CCVERBOSE) LDLIBS += -lcryptoutil -LDFLAGS += $(ZLAZYLOAD) .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.bin/Makefile b/usr/src/cmd/cmd-inet/usr.bin/Makefile index a60635e6cb..2caa4f7d9a 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/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" @@ -88,7 +88,7 @@ whois := LDLIBS += -lnsl -lsocket include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 $(KCMDPROGS) := LDLIBS += -lnsl -lmech_krb5 -$(KCMDPROGS) := LDFLAGS += $(ZIGNORE) $(ZLAZYLOAD) $(KRUNPATH) \ +$(KCMDPROGS) := LDFLAGS += $(ZIGNORE) $(KRUNPATH) \ -L$(ROOT)$(KLIBDIR_DO) \ -L$(ROOT)$(KLIBDIR_GL) KCMDLINTS= $(KCMDPROGS:%=lint-%) diff --git a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile index 15c7cee29f..9bbee08d18 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/ftp/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" @@ -45,7 +45,7 @@ LDLIBS += -lsocket -lnsl -lgss # ftp defines its own delete and glob - localize all symbols to prevent a # name clash. -LDFLAGS += $(ZLAZYLOAD) $(MAPFILE.NGB:%=-M%) +LDFLAGS += $(MAPFILE.NGB:%=-M%) .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile b/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile index 85bc6e1376..f8a34d2f01 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/netstat/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" @@ -42,9 +42,7 @@ COMMONSRCS= $(CMDINETCOMMONDIR)/$(COMMONOBJS:%.o=%.c) SRCS= $(LOCALSRCS) $(COMMONSRCS) CPPFLAGS += -DNDEBUG -I$(CMDINETCOMMONDIR) -LAZYLIBS = $(ZLAZYLOAD) -ltsnet -ltsol $(ZNOLAZYLOAD) -lint := LAZYLIBS = -ltsnet -ltsol -LDLIBS += -ldhcpagent -lsocket -lnsl -lkstat $(LAZYLIBS) +LDLIBS += -ldhcpagent -lsocket -lnsl -lkstat -ltsnet -ltsol .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile b/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile index a79bc82266..4f33b95eca 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/rdist/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" @@ -38,7 +38,7 @@ include ../../Makefile.cmd-inet CPPFLAGS += -DSYSV -DSTRNET -DBSD_COMP LDLIBS += -lsocket -lnsl -LDFLAGS += $(ZLAZYLOAD) $(MAPFILE.NGB:%=-M%) +LDFLAGS += $(MAPFILE.NGB:%=-M%) include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 LDFLAGS += $(KRUNPATH) -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL) diff --git a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile b/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile index 34c599123e..8d5643aad2 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/telnet/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" @@ -49,7 +48,6 @@ CPPFLAGS += $(AUTH_INCLUDES) LDLIBS += -lsocket -lnsl -ltermlib LDLIBS += -lmech_krb5 LDFLAGS += $(KRUNPATH) -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL) -LDFLAGS += $(ZLAZYLOAD) .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile index a520551b69..c6d37ea1f0 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile @@ -160,7 +160,7 @@ $(NSLPROG) := LDLIBS += -lnsl $(AUDITPROG) := LDLIBS += -lbsm $(PAMPROG) := LDLIBS += -lpam $(RPCSVCPROG) := LDLIBS += -lrpcsvc -$(K5PROGS) := LDFLAGS += $(ZLAZYLOAD) $(KRUNPATH) \ +$(K5PROGS) := LDFLAGS += $(KRUNPATH) \ -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL) $(K5PROGS) := K5LIBS= -lmech_krb5 $(K5PROGS) := CPPFLAGS += -I$(SRC)/head \ @@ -169,7 +169,7 @@ $(K5PROGS) := CPPFLAGS += -I$(SRC)/head \ -I$(SRC)/lib/gss_mechs/mech_krb5/include \ -I$(SRC)/lib/pam_modules/krb5 LDLIBS += $(K5LIBS) -$(TSNETPROG) := LDLIBS += $(ZLAZYLOAD) -ltsnet $(ZNOLAZYLOAD) +$(TSNETPROG) := LDLIBS += -ltsnet in.rarpd := LDLIBS += -linetutil -ldlpi route := CPPFLAGS += -DNDEBUG diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile index 405d4bbe03..f2c16c8c21 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile @@ -21,7 +21,7 @@ # # -# 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" @@ -48,7 +48,7 @@ HDRS= snoop.h snoop_mip.h at.h snoop_ospf.h snoop_ospf6.h include ../../../Makefile.cmd CPPFLAGS += -I. -I$(SRC)/common/net/dhcp -LDLIBS += -ldhcputil -ldlpi -lsocket -lnsl $(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD) +LDLIBS += -ldhcputil -ldlpi -lsocket -lnsl -ltsol LDFLAGS += $(MAPFILE.NGB:%=-M%) .KEEP_STATE: diff --git a/usr/src/cmd/csh/i386/Makefile b/usr/src/cmd/csh/i386/Makefile index 462c692306..c580f9f0b4 100644 --- a/usr/src/cmd/csh/i386/Makefile +++ b/usr/src/cmd/csh/i386/Makefile @@ -1,4 +1,4 @@ -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T @@ -27,9 +27,7 @@ DEFS = -DVFORK -DFILEC -DBSD_COMP -DFIVE # No TELL when MBCHAR CPPFLAGS= -I. $(DEFS) $(MBCHAR) $(CPPFLAGS.master) CPPFLAGS += -I../../sh CPPFLAGS += -D_FILE_OFFSET_BITS=64 -LAZYLIBS = $(ZLAZYLOAD) -lsecdb $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lsecdb -LDLIBS += -lcurses $(LAZYLIBS) +LDLIBS += -lcurses -lsecdb MAPFILES = ../mapfile-intf $(MAPFILE.NGB) LDFLAGS += $(MAPFILES:%=-M%) diff --git a/usr/src/cmd/csh/sparc/Makefile b/usr/src/cmd/csh/sparc/Makefile index 5096a15cc7..8a5bf81e4c 100644 --- a/usr/src/cmd/csh/sparc/Makefile +++ b/usr/src/cmd/csh/sparc/Makefile @@ -1,4 +1,4 @@ -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T @@ -27,9 +27,7 @@ DEFS = -DVFORK -DFILEC -DBSD_COMP -DFIVE # No TELL when MBCHAR CPPFLAGS= -I. $(DEFS) $(MBCHAR) $(CPPFLAGS.master) CPPFLAGS += -I../../sh CPPFLAGS += -D_FILE_OFFSET_BITS=64 -LAZYLIBS = $(ZLAZYLOAD) -lsecdb $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lsecdb -LDLIBS += -lcurses $(LAZYLIBS) +LDLIBS += -lcurses -lsecdb MAPFILES = ../mapfile-intf $(MAPFILE.NGB) LDFLAGS += $(MAPFILES:%=-M%) diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com index ebafe17839..dab5217c6f 100644 --- a/usr/src/cmd/devfsadm/Makefile.com +++ b/usr/src/cmd/devfsadm/Makefile.com @@ -91,9 +91,7 @@ LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2 LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2 LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 -LAZYLIBS = $(ZLAZYLOAD) -lzonecfg -lbrand -lbsm $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lzonecfg -lbrand -lbsm -LDLIBS += -ldevinfo -lgen -lsysevent -lnvpair -ldoor $(LAZYLIBS) -lnsl +LDLIBS += -ldevinfo -lgen -lsysevent -lnvpair -ldoor -lzonecfg -lbsm LINK_MOD_LDLIBS= SUNW_md_link.so := LINK_MOD_LDLIBS= -lmeta diff --git a/usr/src/cmd/dtrace/test/tst/common/Makefile b/usr/src/cmd/dtrace/test/tst/common/Makefile index bb5903f19b..065124ada0 100644 --- a/usr/src/cmd/dtrace/test/tst/common/Makefile +++ b/usr/src/cmd/dtrace/test/tst/common/Makefile @@ -42,8 +42,6 @@ CLOBBERFILES += nfs/$(RPCSVCOBJS) $(RPCSVCDIR)/$(RPCSVCSRCS) fasttrap/tst.fasttrap.exe := LDLIBS += -ldtrace fasttrap/tst.stack.exe := LDLIBS += -ldtrace -proc/tst.sigwait.exe := LDLIBS += -lrt - sysevent/tst.post.exe := LDLIBS += -lsysevent sysevent/tst.post_chan.exe := LDLIBS += -lsysevent diff --git a/usr/src/cmd/ed/Makefile b/usr/src/cmd/ed/Makefile index ebc837d99d..8dbd627997 100644 --- a/usr/src/cmd/ed/Makefile +++ b/usr/src/cmd/ed/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" @@ -42,9 +42,8 @@ include ../Makefile.cmd CFLAGS += $(CCVERBOSE) $(XPG4) := CFLAGS += -DXPG4 $(XPG6) := CFLAGS += -DXPG6 -I$(SRC)/lib/libc/inc -LAZYLIBS = $(ZLAZYLOAD) -lgen -lcrypt_i $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lgen -lcrypt -LDLIBS += -lmapmalloc $(LAZYLIBS) +lint := LDLIBS += -lgen -lcrypt +LDLIBS += -lmapmalloc -lgen -lcrypt_i XGETFLAGS += -a -x ed.xcl MAPFILE.INT = ../expr/mapfile-intf diff --git a/usr/src/cmd/fm/fmd/Makefile.fmd b/usr/src/cmd/fm/fmd/Makefile.fmd index 0b573821dd..1224b5fb39 100644 --- a/usr/src/cmd/fm/fmd/Makefile.fmd +++ b/usr/src/cmd/fm/fmd/Makefile.fmd @@ -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,6 +76,9 @@ SRCS += fmd.c \ PROG = fmd MANIFEST = ../common/$(PROG).xml +MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern + + ROOTPDIR = $(ROOT)/usr/lib/fm/$(PROG) ROOTVDIR = $(ROOT)/var/fm/$(PROG) ROOTVSUB = $(ROOTVDIR)/ckpt $(ROOTVDIR)/rsrc $(ROOTVDIR)/xprt @@ -111,12 +114,13 @@ CPPFLAGS += -I. -I../common CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) LINTFLAGS += -mu -LDFLAGS += -R/usr/lib/fm -LDLIBS += -L$(ROOTLIB)/fm -ltopo -ldiagcode -lsysevent -lsmbios -luuid -lnvpair -LDLIBS += -lexacct -lnsl -lumem -ldevinfo + +$(PROG) := LDFLAGS += -R/usr/lib/fm +$(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo -ldiagcode -lsysevent -lsmbios \ + -luuid -lnvpair -lexacct -lnsl -lumem -ldevinfo $(DMOD) := CFLAGS += $(CC_PICFLAGS) -G $(XREGSFLAG) -$(DMOD) := LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) +$(DMOD) := LDFLAGS += $(ZTEXT) $(ZDEFS) $(MAPFILE-DMOD:%=-M%) # # rpcgen(1) produces code that wants to be in the foreground if we're compiled @@ -143,7 +147,7 @@ $(PROG): $(OBJS) $(POST_PROCESS) $(DMOD): $(DMOD_OBJS) - $(LINK.c) $(DMOD_OBJS) -o $@ + $(LINK.c) $(DMOD_OBJS) -o $@ -lc $(POST_PROCESS) %.o: ../common/%.c diff --git a/usr/src/cmd/fm/modules/Makefile.plugin b/usr/src/cmd/fm/modules/Makefile.plugin index fbdbaae786..3ff34f2d63 100644 --- a/usr/src/cmd/fm/modules/Makefile.plugin +++ b/usr/src/cmd/fm/modules/Makefile.plugin @@ -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" @@ -75,12 +75,13 @@ CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) CFLAGS += -G $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZIGNORE) +LDFLAGS += $(ZDEFS) $(ZTEXT) $(ZIGNORE) + +MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern -$(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP) -M$(FMRIMAP) -$(PROG) := LDLIBS += -lnvpair -lc -$(DMODPROG) := LDFLAGS += $(ZNODEFS) +$(PROG) := LDFLAGS += -M$(APIMAP) -M$(FMRIMAP) +$(PROG) := LDLIBS += -lnvpair -lc all: $(PROG) $(DMODPROG) @@ -92,9 +93,9 @@ $(PROG): $(OBJS) $(APIMAP) $(CTFMERGE) -L VERSION -o $@ $(OBJS) $(POST_PROCESS_SO) -$(DMODPROG): $(DMOD_OBJS) +$(DMODPROG): $(DMOD_OBJS) $(MAPFILE-DMOD) -@mkdir -p $(@D) - $(LINK.c) $(DMOD_OBJS) -o $@ + $(LINK.c) $(DMOD_OBJS) $(MAPFILE-DMOD:%=-M%) -o $@ -lc $(POST_PROCESS) %.o: %.c diff --git a/usr/src/cmd/fm/modules/common/eversholt/Makefile b/usr/src/cmd/fm/modules/common/eversholt/Makefile index 056c8094ee..7e049fe437 100644 --- a/usr/src/cmd/fm/modules/common/eversholt/Makefile +++ b/usr/src/cmd/fm/modules/common/eversholt/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" @@ -44,8 +44,9 @@ DMOD_SRCS = eft_mdb.c include ../../Makefile.plugin CPPFLAGS += -DFMAPLUGIN -I$(EVERSRCDIR) -I. -LDFLAGS += -R/usr/lib/fm -LDLIBS += -L$(ROOTLIB)/fm -ltopo + +$(PROG) := LDFLAGS += -R/usr/lib/fm +$(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo CLEANFILES += y.tab.h y.tab.c diff --git a/usr/src/cmd/fm/modules/sun4u/fps-transport/Makefile b/usr/src/cmd/fm/modules/sun4u/fps-transport/Makefile index dc5ce44250..6902498979 100644 --- a/usr/src/cmd/fm/modules/sun4u/fps-transport/Makefile +++ b/usr/src/cmd/fm/modules/sun4u/fps-transport/Makefile @@ -45,11 +45,11 @@ LINTFLAGS = -I. -I ../../../fmd/common -D_sparc64 -D_REENTRANT -D_POSIX_PTHREAD_ ##### beginning of dependency lines ##### -LDFLAGS += -R/usr/lib/fm -M../../../fmd/common/fmd_api.map +LDFLAGS += -M../../../fmd/common/fmd_api.map fps-transport.so : $$(OBJS) (unset LD_LIBRARY_PATH LD_RUN_PATH; \ - $(CC) -i $(CFLAGS) -o $@ -G $(OBJS) -zcombreloc -mt -zignore -ztext -zdefs -lc -ldoor -lnvpair -lsysevent $(LDFLAGS)) + $(CC) -i $(CFLAGS) -o $@ -G $(OBJS) -mt -zignore -ztext -zdefs -lc -ldoor -lnvpair -lsysevent $(LDFLAGS)) $(POST_PROCESS_SO) all: install diff --git a/usr/src/cmd/fm/schemes/Makefile.com b/usr/src/cmd/fm/schemes/Makefile.com index a7788d350e..f2fac6b59e 100644 --- a/usr/src/cmd/fm/schemes/Makefile.com +++ b/usr/src/cmd/fm/schemes/Makefile.com @@ -20,7 +20,7 @@ # # -# 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" @@ -54,5 +54,5 @@ CFLAGS += -G $(XREGSFLAG) CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS) CFLAGS64 += -G $(XREGSFLAG) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D$(MACH) -I.. -LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZDEFS) $(ZIGNORE) -M$(MAPFILE) +LDFLAGS += $(ZTEXT) $(ZDEFS) $(ZIGNORE) -M$(MAPFILE) LDLIBS += -lnvpair -lc diff --git a/usr/src/cmd/fm/schemes/fmd/Makefile b/usr/src/cmd/fm/schemes/fmd/Makefile index 69ef338700..c8874c7d86 100644 --- a/usr/src/cmd/fm/schemes/fmd/Makefile +++ b/usr/src/cmd/fm/schemes/fmd/Makefile @@ -20,7 +20,7 @@ # # -# 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,4 +31,6 @@ include ../../../Makefile.cmd SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) +LDLIBS += -lc + include ../../Makefile.subdirs diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile index 7365a9132a..bd1ed59f0e 100644 --- a/usr/src/cmd/fs.d/autofs/Makefile +++ b/usr/src/cmd/fs.d/autofs/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" @@ -88,7 +88,6 @@ SED= sed $(AUTO) := LDLIBS += -lnsl -lsldap -ldoor $(MOUNT):= LDLIBS += -lnsl $(TYPEPROG) := LDLIBS += -lrpcsvc -lsocket -lnsl -lsldap -lkstat -ldoor -$(TYPEPROG) := LDFLAGS += -R/usr/lib/fs/$(FSTYPE) CFLAGS += $(CCVERBOSE) -D_FILE_OFFSET_BITS=64 CPPFLAGS= -I. -I.. -I../nfs/lib $(CPPFLAGS.master) -D_REENTRANT \ diff --git a/usr/src/cmd/getent/Makefile b/usr/src/cmd/getent/Makefile index cafc3009cc..bb2dfd5caa 100644 --- a/usr/src/cmd/getent/Makefile +++ b/usr/src/cmd/getent/Makefile @@ -20,7 +20,7 @@ # # -# 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" @@ -45,9 +45,7 @@ OBJECTS= \ SRCS= $(OBJECTS:.o=.c) -LAZYLIBS = $(ZLAZYLOAD) -lproject -lint := LAZYLIBS = -lproject -LDLIBS += -lsocket -lnsl $(LAZYLIBS) +LDLIBS += -lsocket -lnsl -lproject # # for message catalog diff --git a/usr/src/cmd/hal/hald/Makefile b/usr/src/cmd/hal/hald/Makefile index 8af36ffaa2..b13b4bf4d6 100644 --- a/usr/src/cmd/hal/hald/Makefile +++ b/usr/src/cmd/hal/hald/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" @@ -44,8 +44,6 @@ ROOTCMDDIR = $(ROOTLIB_HAL) LDLIBS += -lc -lm -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lgobject-2.0 \ -ldevinfo -lsysevent -lnvpair -LDFLAGS += -L$(SFW_ROOT)/lib -R$(SFW_ROOT)/lib - all install $(PROG) := LDLIBS += -lexpat CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) diff --git a/usr/src/cmd/init/Makefile b/usr/src/cmd/init/Makefile index 2e238f3bb2..a916b702cc 100644 --- a/usr/src/cmd/init/Makefile +++ b/usr/src/cmd/init/Makefile @@ -20,7 +20,7 @@ # # -# 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,10 +36,7 @@ include ../Makefile.cmd OWNER = root GROUP = sys -LDLIBS_LIST = -lpam -lbsm -lcontract $(ZLAZYLOAD) -lscf -lint := LDLIBS_LIST = -lpam -lbsm -lcontract -lscf - -LDLIBS += $(LDLIBS_LIST) +LDLIBS += -lpam -lbsm -lcontract -lscf LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2 CLOBBERFILES= $(STATIC) diff --git a/usr/src/cmd/krb5/kadmin/cli/Makefile b/usr/src/cmd/krb5/kadmin/cli/Makefile index ecc77bed36..8775328c49 100644 --- a/usr/src/cmd/krb5/kadmin/cli/Makefile +++ b/usr/src/cmd/krb5/kadmin/cli/Makefile @@ -1,5 +1,5 @@ # -# 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,10 +37,10 @@ COPTFLAG += $(XESS) #-I$(KINCDIR) SHAREDLIBS = -lmech_krb5 -lss -CLLIBS = $(LDLIBS) $(KRUNPATH) \ +CLLIBS = $(LDLIBS) $(KRUNPATH) $(KERBRUNPATH) \ -L$(ROOT_KLIBDIR) -L$(KRB5LIB) $(SHAREDLIBS) -lkadm5clnt -SRVLIBS = $(LDLIBS) $(KRUNPATH) \ +SRVLIBS = $(LDLIBS) $(KRUNPATH) $(KERBRUNPATH) \ -L$(ROOT_KLIBDIR) -L$(KRB5LIB) $(SHAREDLIBS) -lkadm5srv kadmin.local:= DEFS += -D_KADMIN_LOCAL_ diff --git a/usr/src/cmd/krb5/kadmin/dbutil/Makefile b/usr/src/cmd/krb5/kadmin/dbutil/Makefile index 0fbd2cddd7..cf9479aeac 100644 --- a/usr/src/cmd/krb5/kadmin/dbutil/Makefile +++ b/usr/src/cmd/krb5/kadmin/dbutil/Makefile @@ -1,5 +1,5 @@ # -# 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" @@ -37,7 +37,7 @@ CPPFLAGS += -I. -I$(SRC)/lib/gss_mechs/mech_krb5/include/kerberosIV \ -DUSE_KADM5_API_VERSION=2 COPTFLAG += $(XESS) #-I$(KINCDIR) -LDFLAGS += $(KRUNPATH) +LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) LDLIBS += -L $(ROOT_KLIBDIR) -L $(KRB5LIB) -lkadm5srv -lkdb \ -lmech_krb5 -lnsl diff --git a/usr/src/cmd/krb5/kadmin/gui/native/Makefile.com b/usr/src/cmd/krb5/kadmin/gui/native/Makefile.com index 42b179c552..bd5e19d6bd 100644 --- a/usr/src/cmd/krb5/kadmin/gui/native/Makefile.com +++ b/usr/src/cmd/krb5/kadmin/gui/native/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" @@ -33,7 +33,7 @@ OBJECTS= $(CLASSES:%=%.o) include $(SRC)/lib/Makefile.lib # -# Need this makefile to find the KRUNPATH and KMECHLIB definitions +# Need this makefile to find the KRUNPATH, KERBRUNPATH and KMECHLIB definitions # include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 @@ -48,7 +48,7 @@ CPPFLAGS += -I../ -I$(SRC)/lib/krb5 \ -I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris LDLIBS += $(KMECHLIB) -L$(ROOT)/$(KERBLIBDIR) -lkadm5clnt -lsocket -lc -DYNFLAGS += $(KRUNPATH) +DYNFLAGS += $(KRUNPATH) $(KERBRUNPATH) # # This library is not directly linked against by any C applications diff --git a/usr/src/cmd/krb5/kadmin/kpasswd/Makefile b/usr/src/cmd/krb5/kadmin/kpasswd/Makefile index 70e67264ea..945fbdd7cb 100644 --- a/usr/src/cmd/krb5/kadmin/kpasswd/Makefile +++ b/usr/src/cmd/krb5/kadmin/kpasswd/Makefile @@ -1,5 +1,5 @@ # -# 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" @@ -33,7 +33,7 @@ CPPFLAGS += -I$(SRC)/lib/gss_mechs/mech_krb5/include \ COPTFLAG += $(XESS) #-I$(KINCDIR) -LDFLAGS += $(KRUNPATH) +LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) LDLIBS += -L $(KRB5LIBDIR) LDLIBS += $(KMECHLIB) $(KCLNTLIB) diff --git a/usr/src/cmd/krb5/kadmin/ktutil/Makefile b/usr/src/cmd/krb5/kadmin/ktutil/Makefile index e85497115f..9c9417d1de 100644 --- a/usr/src/cmd/krb5/kadmin/ktutil/Makefile +++ b/usr/src/cmd/krb5/kadmin/ktutil/Makefile @@ -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,7 +27,7 @@ CPPFLAGS += -I$(SRC)/uts/common/gssapi/include \ -DHAVE_TIMEZONE COPTFLAG += $(XESS) #-I$(KINCDIR) -LDFLAGS += $(KRUNPATH) +LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) LDLIBS += $(KMECHLIB) $(ROOT)$(KERBLIBDIR)/libss.so .KEEP_STATE: diff --git a/usr/src/cmd/krb5/kadmin/server/Makefile b/usr/src/cmd/krb5/kadmin/server/Makefile index d08caca1f3..daad51924f 100644 --- a/usr/src/cmd/krb5/kadmin/server/Makefile +++ b/usr/src/cmd/krb5/kadmin/server/Makefile @@ -43,7 +43,7 @@ CPPFLAGS += -I. -I$(SRC)/uts/common/gssapi/mechs/krb5/include \ COPTFLAG += $(XESS) #-I$(KINCDIR) -LDFLAGS += $(KRUNPATH) +LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) LDLIBS += -lgss -L$(KRB5LIB) \ -lmech_krb5 -lkadm5srv -lkdb -lnsl -lresolv -lbsm -lpam -lsocket diff --git a/usr/src/cmd/krb5/krb5kdc/Makefile b/usr/src/cmd/krb5/krb5kdc/Makefile index c4f7c23c10..c8c1836129 100644 --- a/usr/src/cmd/krb5/krb5kdc/Makefile +++ b/usr/src/cmd/krb5/krb5kdc/Makefile @@ -49,7 +49,7 @@ CPPFLAGS += \ -I$(SRC)/uts/common/gssapi/mechs/krb5/include \ -DHAVE_SYSLOG_H=1 -LDFLAGS += $(KRUNPATH) +LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) LDLIBS += -L$(ROOT_KLIBDIR) -L$(KRB5LIB) \ -lmech_krb5 -lkdb -lkadm5srv -lnsl -lsocket -lbsm -lc diff --git a/usr/src/cmd/krb5/ldap_util/Makefile b/usr/src/cmd/krb5/ldap_util/Makefile index c762d44786..d6b323cbdb 100644 --- a/usr/src/cmd/krb5/ldap_util/Makefile +++ b/usr/src/cmd/krb5/ldap_util/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" @@ -62,7 +62,7 @@ CPPFLAGS += \ -I../kwarn \ $(DEFS) -LDFLAGS += $(KRUNPATH) +LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) LDLIBS += -L $(ROOT_KLIBDIR) -L $(KRB5LIB) -lkadm5srv -lkdb -lkdb_ldap \ -lmech_krb5 diff --git a/usr/src/cmd/krb5/slave/Makefile b/usr/src/cmd/krb5/slave/Makefile index 0b0218f7d4..592a6f08c0 100644 --- a/usr/src/cmd/krb5/slave/Makefile +++ b/usr/src/cmd/krb5/slave/Makefile @@ -57,7 +57,7 @@ CPPFLAGS += -I. \ -I$(SRC)/lib/krb5/kadm5 \ -I$(SRC)/uts/common/gssapi/mechs/krb5/include -LDFLAGS += $(KRUNPATH) +LDFLAGS += $(KRUNPATH) $(KERBRUNPATH) LDLIBS += -lmech_krb5 -lsocket $(PROG1) := LDLIBS += -L$(KRB5LIB) -lkadm5srv $(PROG2) := LDLIBS += -L$(KRB5LIB) -lnsl -lkdb -lkadm5clnt diff --git a/usr/src/cmd/lp/cmd/Makefile b/usr/src/cmd/lp/cmd/Makefile index 5d4dff7eb2..9a2e08d07f 100644 --- a/usr/src/cmd/lp/cmd/Makefile +++ b/usr/src/cmd/lp/cmd/Makefile @@ -20,7 +20,7 @@ # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -60,10 +60,9 @@ LDFLAGS += $(MAPFILE.NGB:%=-M%) # conditional assignments # lpfilter:= LDLIBS += $(LIBFLT) $(LIBMSG) $(LIBACC) $(LIBOAM) $(LIBLP) \ - -lgen $(ZLAZYLOAD) -lsecdb $(ZNOLAZYLOAD) + -lgen -lsecdb lpforms:= LDLIBS += $(LIBFRM) $(LIBMSG) $(LIBREQ) $(LIBOAM) \ - $(LIBACC) $(LIBLP) \ - $(ZLAZYLOAD) -lsecdb $(ZNOLAZYLOAD) + $(LIBACC) $(LIBLP) -lsecdb lpshut:= LDLIBS += $(LIBMSG) $(LIBOAM) $(LIBLP) lpusers:= LDLIBS += $(LIBMSG) $(LIBACC) $(LIBOAM) $(LIBUSR) $(LIBLP) diff --git a/usr/src/cmd/lp/cmd/lpadmin/Makefile b/usr/src/cmd/lp/cmd/lpadmin/Makefile index 5b5bdc687f..ace6fc7acf 100644 --- a/usr/src/cmd/lp/cmd/lpadmin/Makefile +++ b/usr/src/cmd/lp/cmd/lpadmin/Makefile @@ -21,7 +21,7 @@ # # -# 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" @@ -66,8 +66,7 @@ LPLIBS= $(LIBACC) \ SYSLIBS= -lcurses -LDLIBS += $(ZLAZYLOAD) -lsecdb $(ZNOLAZYLOAD) $(LPLIBS) \ - $(SYSLIBS) $(I18N) +LDLIBS += -lsecdb $(LPLIBS) $(SYSLIBS) $(I18N) LDFLAGS += $(MAPFILE.NGB:%=-M%) PROG= lpadmin diff --git a/usr/src/cmd/lp/cmd/lpsched/Makefile b/usr/src/cmd/lp/cmd/lpsched/Makefile index 7d463a4418..c5c645ffe8 100644 --- a/usr/src/cmd/lp/cmd/lpsched/Makefile +++ b/usr/src/cmd/lp/cmd/lpsched/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" @@ -100,8 +100,7 @@ LPLIBS = \ $(LIBLP) \ $(LIBSEC) -SYSLIBS= -lcurses -lgen -lcurses -lnsl $(ZLAZYLOAD) \ - -ltsol -lsecdb -lbsm $(ZNOLAZYLOAD) +SYSLIBS= -lcurses -lgen -lcurses -lnsl -ltsol -lsecdb -lbsm LDLIBS += $(LPLIBS) $(SYSLIBS) diff --git a/usr/src/cmd/mdb/Makefile.mdb b/usr/src/cmd/mdb/Makefile.mdb index fc91a3757a..8d6711a6ba 100644 --- a/usr/src/cmd/mdb/Makefile.mdb +++ b/usr/src/cmd/mdb/Makefile.mdb @@ -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" @@ -91,8 +91,7 @@ CPPFLAGS += -D_MDB -I. -I../.. -I../../../common C99MODE= -xc99=%all C99LMODE= -Xc99=%all -LDLIBS += -ltermcap -lkvm -lproc -lrtld_db -lctf -lumem -ldisasm \ - $(ZLAZYLOAD) -lscf $(ZNOLAZYLOAD) +LDLIBS += -ltermcap -lkvm -lproc -lrtld_db -lctf -lumem -ldisasm -lscf LINTFLAGS += -n -errtags=yes LINTFILES = $(SRCS:%.c=%.ln) diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module index f901671ab0..f81732dbc7 100644 --- a/usr/src/cmd/mdb/Makefile.module +++ b/usr/src/cmd/mdb/Makefile.module @@ -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" @@ -97,8 +97,8 @@ proc_TGTFLAGS = -D_USER CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) CPPFLAGS += $($(MDBTGT)_TGTFLAGS) -I../../../common -LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) -LDFLAGS64 += $(ZTEXT) $(ZCOMBRELOC) +LDFLAGS += $(ZTEXT) +LDFLAGS64 += $(ZTEXT) # Module type-specific compiler flags $(MODOBJS) := CFLAGS += $(C_BIGPICFLAGS) $(XREGSFLAG) @@ -108,7 +108,11 @@ $(KMODOBJS) := V9CODESIZE = $(CCABS32) $(KMODOBJS) := DTS_ERRNO = # Modules aren't allowed to export symbols -MAPFILE = $(SRC)/cmd/mdb/common/modules/conf/mapfile +MAPFILE = $(SRC)/cmd/mdb/common/modules/conf/mapfile + +# Modules typically make external references. To provide for -zdefs use +# and clean ldd(1) processing, explicitly define all external references. +MAPFILE-EXT = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern # # kmdb is a kernel module, so we'll use the kernel's build flags. @@ -143,8 +147,9 @@ lint: $$(LINTFILES) .PARALLEL: $(MODOBJS) $(KMODOBJS) mdb_tgt kmdb_tgt dmod kmod \ $(TARGETS) $(LINTFILES) -$(MODFILE): dmod .WAIT $(MODOBJS) - $(LINK.c) $(GSHARED) $(MODOBJS) -o $@ $(LDLIBS) +$(MODFILE): dmod .WAIT $(MODOBJS) $$(MAPFILE-EXT) + $(LINK.c) $(ZDEFS) $(ZIGNORE) $(MAPFILE-EXT:%=-M%) $(GSHARED) \ + $(MODOBJS) -o $@ $(LDLIBS) -lc $(CTFMERGE) -L VERSION -o $@ $(MODOBJS) $(POST_PROCESS_SO) diff --git a/usr/src/cmd/mdb/common/modules/conf/mapfile-extern b/usr/src/cmd/mdb/common/modules/conf/mapfile-extern new file mode 100644 index 0000000000..09bde23d1d --- /dev/null +++ b/usr/src/cmd/mdb/common/modules/conf/mapfile-extern @@ -0,0 +1,129 @@ +# +# 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: +# Plwp_iter = EXTERN; +# Pmapping_iter = EXTERN; + + _mdb_ks_ncpu = EXTERN; + _mdb_ks_pageshift = EXTERN; + _mdb_ks_pagesize = EXTERN; + + mdb = EXTERN; + mdb_add_walker = EXTERN; + mdb_alloc = EXTERN; + mdb_call_dcmd = EXTERN; + mdb_callback_add = EXTERN; + mdb_cpuset_find = EXTERN; + mdb_ctf_array_info = EXTERN; + mdb_ctf_enum_name = EXTERN; + mdb_ctf_lookup_by_addr = EXTERN; + mdb_ctf_member_iter = EXTERN; + mdb_ctf_type_cmp = EXTERN; + mdb_ctf_type_invalidate = EXTERN; + mdb_ctf_type_kind = EXTERN; + mdb_ctf_type_reference = EXTERN; + mdb_ctf_lookup_by_name = EXTERN; + mdb_ctf_offsetof = EXTERN; + mdb_ctf_type_name = EXTERN; + mdb_ctf_type_resolve = EXTERN; + mdb_ctf_type_size = EXTERN; + mdb_ctf_type_valid = EXTERN; + mdb_ctf_vread = EXTERN; + mdb_ddi_pathname = EXTERN; + mdb_dec_indent = EXTERN; + mdb_devinfo2driver = EXTERN; + mdb_devinfo2statep = EXTERN; + mdb_dlpi_prim = EXTERN; + mdb_dumpptr = EXTERN; + mdb_eval = EXTERN; + mdb_fdio_create_path = EXTERN; + mdb_fdio_fileno = EXTERN; + mdb_ffs = EXTERN; + mdb_flush = EXTERN; + mdb_free = EXTERN; + mdb_get_dot = EXTERN; + mdb_get_pipe = EXTERN; + mdb_get_soft_state_byaddr = EXTERN; + mdb_get_state = EXTERN; + mdb_get_xdata = EXTERN; + mdb_getopts = EXTERN; + mdb_gelf_create = EXTERN; + mdb_gelf_destroy = EXTERN; + mdb_gelf_sect_by_name = EXTERN; + mdb_gelf_sect_load = EXTERN; + mdb_inc_indent = EXTERN; + mdb_io_destroy = EXTERN; + mdb_iob_clrflags = EXTERN; + mdb_iob_getflags = EXTERN; + mdb_iob_resize = EXTERN; + mdb_iob_setflags = EXTERN; + mdb_layered_walk = EXTERN; + mdb_lookup_by_addr = EXTERN; + mdb_lookup_by_name = EXTERN; + mdb_lookup_by_obj = EXTERN; + mdb_mac_addr = EXTERN; + mdb_major_to_name = EXTERN; + mdb_mblk_count = EXTERN; + mdb_memio_create = EXTERN; + mdb_name_to_major = EXTERN; + mdb_nhconvert = EXTERN; + mdb_pid2proc = EXTERN; + mdb_printf = EXTERN; + mdb_prop_kernel = EXTERN; + mdb_prop_postmortem = EXTERN; + mdb_pread = EXTERN; + mdb_pwalk = EXTERN; + mdb_pwalk_dcmd = EXTERN; + mdb_qinfo = EXTERN; + mdb_qname = EXTERN; + mdb_qops_install = EXTERN; + mdb_qops_remove = EXTERN; + mdb_qrnext_default = EXTERN; + mdb_qwnext = EXTERN; + mdb_qwnext_default = EXTERN; + mdb_read_refstr = EXTERN; + mdb_readstr = EXTERN; + mdb_readsym = EXTERN; + mdb_readvar = EXTERN; + mdb_remove_walker = EXTERN; + mdb_set_dot = EXTERN; + mdb_set_pipe = EXTERN; + mdb_snprintf = EXTERN; + mdb_strtoull = EXTERN; + mdb_tgt_notsup = EXTERN; + mdb_vnode2page = EXTERN; + mdb_vnode2path = EXTERN; + mdb_vread = EXTERN; + mdb_vtype2chr = EXTERN; + mdb_walk = EXTERN; + mdb_walk_dcmd = EXTERN; + mdb_warn = EXTERN; + mdb_writevar = EXTERN; + mdb_zalloc = EXTERN; +}; diff --git a/usr/src/cmd/mdb/intel/amd64/libumem/Makefile b/usr/src/cmd/mdb/intel/amd64/libumem/Makefile index 67c82183f4..944ee5a4c6 100644 --- a/usr/src/cmd/mdb/intel/amd64/libumem/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/libumem/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" @@ -48,7 +48,7 @@ CPPFLAGS += -I$(MODSRCS_DIR) include ../../Makefile.amd64 include ../../../Makefile.module -dmod/$(MODULE) := LDLIBS += -lm +dmod/$(MODULE) := LDLIBS += -lproc -lm %.o: $(MODSRCS_DIR)/%.c $(COMPILE.c) $< diff --git a/usr/src/cmd/mdb/intel/ia32/libumem/Makefile b/usr/src/cmd/mdb/intel/ia32/libumem/Makefile index e22f6b34dc..12c6f70fb2 100644 --- a/usr/src/cmd/mdb/intel/ia32/libumem/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/libumem/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" @@ -47,7 +47,7 @@ CPPFLAGS += -I$(MODSRCS_DIR) include ../../Makefile.ia32 include ../../../Makefile.module -dmod/$(MODULE) := LDLIBS += -lm +dmod/$(MODULE) := LDLIBS += -lproc -lm %.o: $(MODSRCS_DIR)/%.c $(COMPILE.c) $< diff --git a/usr/src/cmd/mdb/sparc/v7/libumem/Makefile b/usr/src/cmd/mdb/sparc/v7/libumem/Makefile index c285e09e74..e080ddf325 100644 --- a/usr/src/cmd/mdb/sparc/v7/libumem/Makefile +++ b/usr/src/cmd/mdb/sparc/v7/libumem/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" @@ -47,7 +47,7 @@ CPPFLAGS += -I$(MODSRCS_DIR) include ../../Makefile.sparcv7 include ../../../Makefile.module -dmod/$(MODULE) := LDLIBS += -lm +dmod/$(MODULE) := LDLIBS += -lproc -lm %.o: $(MODSRCS_DIR)/%.c $(COMPILE.c) $< diff --git a/usr/src/cmd/mdb/sparc/v9/libumem/Makefile b/usr/src/cmd/mdb/sparc/v9/libumem/Makefile index 4c2b66bdd2..9b1bc1210b 100644 --- a/usr/src/cmd/mdb/sparc/v9/libumem/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/libumem/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" @@ -61,7 +61,7 @@ include ../../../../Makefile.cmd.64 include ../../Makefile.sparcv9 include ../../../Makefile.module -dmod/$(MODULE) := LDLIBS += -lm +dmod/$(MODULE) := LDLIBS += -lproc -lm %.o: $(MODSRCS_DIR)/%.c $(COMPILE.c) $< diff --git a/usr/src/cmd/mv/Makefile b/usr/src/cmd/mv/Makefile index fa86f295c2..911682845c 100644 --- a/usr/src/cmd/mv/Makefile +++ b/usr/src/cmd/mv/Makefile @@ -20,7 +20,7 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -48,8 +48,8 @@ XGETFLAGS += -a -x mv.xcl CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I $(SRC)/common/util lint := LDLIBS += -lcmdutils -lavl -lsec -lnvpair -$(PROG) := LDLIBS += $(ZLAZYLOAD) -lcmdutils -lavl -lsec -lnvpair $(ZNOLAZYLOAD) -$(XPG4) := LDLIBS += $(ZLAZYLOAD) -lcmdutils -lavl -lsec -lnvpair $(ZNOLAZYLOAD) +$(PROG) := LDLIBS += -lcmdutils -lavl -lsec -lnvpair +$(XPG4) := LDLIBS += -lcmdutils -lavl -lsec -lnvpair .KEEP_STATE: diff --git a/usr/src/cmd/oamuser/user/Makefile b/usr/src/cmd/oamuser/user/Makefile index 3817d584f3..5db7d34c18 100644 --- a/usr/src/cmd/oamuser/user/Makefile +++ b/usr/src/cmd/oamuser/user/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" @@ -96,9 +96,7 @@ $(USERDEL) := LIBS = $(LIBUSRGRP) $(USERMOD) := OBJS = $(MOD_OBJ) $(USERMOD) := LIBS = $(LIBUSRGRP) -LAZYLIBS = $(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD) -lint := LAZYLIBS = -ltsol -LDLIBS += -lsecdb -lproject $(LAZYLIBS) +LDLIBS += -lsecdb -lproject -ltsol .PARALLEL: $(OBJECTS) diff --git a/usr/src/cmd/pgrep/Makefile b/usr/src/cmd/pgrep/Makefile index 11807ffec6..a2450e500e 100644 --- a/usr/src/cmd/pgrep/Makefile +++ b/usr/src/cmd/pgrep/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" @@ -40,9 +39,7 @@ include ../Makefile.cmd CLOBBERFILES += $(PKILLFILE) CFLAGS += $(CCVERBOSE) -LAZYLIBS = $(ZLAZYLOAD) -lproject -lcontract $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lproject -lcontract -LDLIBS += -luutil $(LAZYLIBS) +LDLIBS += -luutil -lproject -lcontract POFILE = ppgrep.po XGETFLAGS = -a -x pgrep.xcl diff --git a/usr/src/cmd/praudit/Makefile b/usr/src/cmd/praudit/Makefile index 1cc2377878..baff4ae9fd 100644 --- a/usr/src/cmd/praudit/Makefile +++ b/usr/src/cmd/praudit/Makefile @@ -21,7 +21,7 @@ # # -# 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" @@ -43,9 +43,7 @@ XGETFLAGS += -a -x praudit.xcl CPPFLAGS += -D_PRAUDIT -I$(SRC)/lib/libbsm/common CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -LAZYLIBS = $(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD) -lint := LAZYLIBS = -ltsol -LDLIBS += -lbsm -lnsl -lpam $(LAZYLIBS) +LDLIBS += -lbsm -lnsl -lpam -ltsol .KEEP_STATE: diff --git a/usr/src/cmd/prstat/Makefile.com b/usr/src/cmd/prstat/Makefile.com index 12e7c41d45..7509f8d339 100644 --- a/usr/src/cmd/prstat/Makefile.com +++ b/usr/src/cmd/prstat/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" @@ -35,9 +34,7 @@ SRCS = $(OBJS:%.o=../%.c) include ../../Makefile.cmd CFLAGS += $(CCVERBOSE) -LAZYLIBS = $(ZLAZYLOAD) -lcurses -lproject $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lcurses -lproject -LDLIBS += $(LAZYLIBS) +LDLIBS += -lcurses -lproject LINTFLAGS += -u LINTFLAGS64 += -u diff --git a/usr/src/cmd/ps/Makefile.com b/usr/src/cmd/ps/Makefile.com index 881e28a23e..b3ab49844f 100644 --- a/usr/src/cmd/ps/Makefile.com +++ b/usr/src/cmd/ps/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" @@ -37,9 +36,7 @@ SRCS= $(OBJS:%.o=../%.c) include ../../Makefile.cmd CFLAGS += $(CCVERBOSE) -LAZYLIBS = $(ZLAZYLOAD) -lproject $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lproject -LDLIBS += $(LAZYLIBS) +LDLIBS += -lproject .KEEP_STATE: diff --git a/usr/src/cmd/renice/Makefile b/usr/src/cmd/renice/Makefile index 7751d99687..f9227cdfa4 100644 --- a/usr/src/cmd/renice/Makefile +++ b/usr/src/cmd/renice/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" @@ -30,10 +29,7 @@ PROG= renice include ../Makefile.cmd -LAZYLIBS = $(ZLAZYLOAD) -lproject $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lproject -LDLIBS += $(LAZYLIBS) - +LDLIBS += -lproject CFLAGS += $(CCVERBOSE) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/elfdump/Makefile.com b/usr/src/cmd/sgs/elfdump/Makefile.com index 782cdfe9a1..7184db5715 100644 --- a/usr/src/cmd/sgs/elfdump/Makefile.com +++ b/usr/src/cmd/sgs/elfdump/Makefile.com @@ -20,7 +20,7 @@ # # -# 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" @@ -51,7 +51,7 @@ CPPFLAGS= -I. -I../common -I../../include -I../../include/$(MACH) \ $(CPPFLAGS.master) LLDFLAGS = $(VAR_ELFDUMP_LLDFLAGS) LLDFLAGS64 = $(VAR_LD_LLDFLAGS64) -LDFLAGS += $(VERSREF) $(USE_PROTO) $(MAPOPT) $(LLDFLAGS) $(ZLAZYLOAD) +LDFLAGS += $(VERSREF) $(USE_PROTO) $(MAPOPT) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \ $(CONVLIBDIR) $(CONV_LIB) diff --git a/usr/src/cmd/sgs/elfedit/Makefile.com b/usr/src/cmd/sgs/elfedit/Makefile.com index c4b1dc151d..91faa3d040 100644 --- a/usr/src/cmd/sgs/elfedit/Makefile.com +++ b/usr/src/cmd/sgs/elfedit/Makefile.com @@ -20,7 +20,7 @@ # # -# 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" @@ -50,7 +50,7 @@ CPPFLAGS= -I. -I../common -I../../include -I../../include/$(MACH) \ -I$(ELFCAP) $(CPPFLAGS.master) LLDFLAGS = $(VAR_ELFEDIT_LLDFLAGS) LLDFLAGS64 = $(VAR_ELFEDIT_LLDFLAGS64) -LDFLAGS += $(VERSREF) $(USE_PROTO) -M$(MAPFILE) $(LLDFLAGS) $(ZLAZYLOAD) +LDFLAGS += $(VERSREF) $(USE_PROTO) -M$(MAPFILE) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \ $(CONVLIBDIR) $(CONV_LIB) -ltecla diff --git a/usr/src/cmd/sgs/elfwrap/Makefile.com b/usr/src/cmd/sgs/elfwrap/Makefile.com index f269ee99b0..40b2e1e933 100644 --- a/usr/src/cmd/sgs/elfwrap/Makefile.com +++ b/usr/src/cmd/sgs/elfwrap/Makefile.com @@ -53,7 +53,7 @@ MAPOPTS = $(MAPFILES:%=-M%) CPPFLAGS = -I. -I../common -I../../include $(CPPFLAGS.master) LLDFLAGS = LLDFLAGS64 = -LDFLAGS += $(VERSREF) $(USE_PROTO) $(MAPOPTS) $(LLDFLAGS) $(ZLAZYLOAD) +LDFLAGS += $(VERSREF) $(USE_PROTO) $(MAPOPTS) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(CONVLIBDIR) $(CONV_LIB) LINTFLAGS += -x diff --git a/usr/src/cmd/sgs/ld/Makefile.com b/usr/src/cmd/sgs/ld/Makefile.com index 4c655d5941..61de73a137 100644 --- a/usr/src/cmd/sgs/ld/Makefile.com +++ b/usr/src/cmd/sgs/ld/Makefile.com @@ -40,8 +40,7 @@ OBJS = $(BLTOBJ) $(COMOBJS) MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB) MAPOPTS = $(MAPFILES:%=-M%) -LDFLAGS += $(VERSREF) $(LAZYLOAD) $(USE_PROTO) $(MAPOPTS) \ - $(VAR_LD_LLDFLAGS) +LDFLAGS += $(VERSREF) $(USE_PROTO) $(MAPOPTS) $(VAR_LD_LLDFLAGS) LDLIBS += $(LDLIBDIR) $(LD_LIB) $(ELFLIBDIR) -lelf \ $(LDDBGLIBDIR) $(LDDBG_LIB) $(CONVLIBDIR) $(CONV_LIB) diff --git a/usr/src/cmd/sgs/ldd/Makefile.com b/usr/src/cmd/sgs/ldd/Makefile.com index 4d54361420..f8f8cdb7b8 100644 --- a/usr/src/cmd/sgs/ldd/Makefile.com +++ b/usr/src/cmd/sgs/ldd/Makefile.com @@ -49,8 +49,9 @@ package := DLLIB = $(VAR_PKG_DL_LIB) CPPFLAGS += -I. -I../../include -I../../include/$(MACH) \ -I$(SRCBASE)/uts/$(ARCH)/sys \ $(CPPFLAGS.master) -LDFLAGS += $(VERSREF) $(USE_PROTO) $(MAPOPTS) \ - '-R$$ORIGIN/../lib' +LLDFLAGS = '-R$$ORIGIN/../../lib' +LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' +LDFLAGS += $(VERSREF) $(USE_PROTO) $(MAPOPTS) $(LLDFLAGS) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lelf $(DLLIB) LINTFLAGS += -x LINTFLAGS64 += -x diff --git a/usr/src/cmd/sgs/ldd/amd64/Makefile b/usr/src/cmd/sgs/ldd/amd64/Makefile index fc1e7bd87c..a89bb7561d 100644 --- a/usr/src/cmd/sgs/ldd/amd64/Makefile +++ b/usr/src/cmd/sgs/ldd/amd64/Makefile @@ -30,6 +30,7 @@ include ../Makefile.com .KEEP_STATE: CONVLIBDIR = $(CONVLIBDIR64) +LLDFLAGS = $(LLDFLAGS64) LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/ldd/sparcv9/Makefile b/usr/src/cmd/sgs/ldd/sparcv9/Makefile index fc1e7bd87c..a89bb7561d 100644 --- a/usr/src/cmd/sgs/ldd/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ldd/sparcv9/Makefile @@ -30,6 +30,7 @@ include ../Makefile.com .KEEP_STATE: CONVLIBDIR = $(CONVLIBDIR64) +LLDFLAGS = $(LLDFLAGS64) LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/libld/Makefile.com b/usr/src/cmd/sgs/libld/Makefile.com index 0740225365..865edb4ab9 100644 --- a/usr/src/cmd/sgs/libld/Makefile.com +++ b/usr/src/cmd/sgs/libld/Makefile.com @@ -112,7 +112,7 @@ LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(LDDBGLIBDIR) $(LDDBG_LIB) \ LINTFLAGS += -u -D_REENTRANT LINTFLAGS64 += -u -D_REENTRANT -DYNFLAGS += $(VERSREF) $(ZLAZYLOAD) $(USE_PROTO) '-R$$ORIGIN' +DYNFLAGS += $(VERSREF) $(USE_PROTO) '-R$$ORIGIN' $(VAR_POUND_3)DEFS= native:= DYNFLAGS += $(CONVLIBDIR) diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com index 613f4d3a90..b7e2980d05 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.com +++ b/usr/src/cmd/sgs/liblddbg/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" @@ -61,7 +61,7 @@ LINTFLAGS += -u -D_REENTRANT LINTFLAGS64 += -u -D_REENTRANT CPPFLAGS += -I$(SRCBASE)/lib/libc/inc $(VAR_LIBLDDBG_CPPFLAGS) -DYNFLAGS += $(VERSREF) $(ZLAZYLOAD) '-R$$ORIGIN' +DYNFLAGS += $(VERSREF) '-R$$ORIGIN' LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lc # A bug in pmake causes redundancy when '+=' is conditionally assigned, so diff --git a/usr/src/cmd/sgs/librtld/Makefile.com b/usr/src/cmd/sgs/librtld/Makefile.com index c5d862ff8b..08a4139b67 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.com +++ b/usr/src/cmd/sgs/librtld/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" @@ -43,7 +43,7 @@ SRCDIR = ../common CPPFLAGS += -I../../rtld/common -I$(SRCBASE)/lib/libc/inc \ -I$(SRCBASE)/uts/common/krtld -I$(SRC)/common/sgsrtcid \ -I$(SRCBASE)/uts/sparc -DYNFLAGS += $(VERSREF) $(ZLAZYLOAD) '-R$$ORIGIN' +DYNFLAGS += $(VERSREF) '-R$$ORIGIN' LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -lc LINTFLAGS += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index c14ee7fe0b..0806c9f48c 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/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" @@ -98,7 +98,7 @@ LDLIBS += $(CONVLIBDIR) $(CONV_LIB) \ $(RTLDLIB) -lrtld \ $(LDLIB) $(LD_LIB) -DYNFLAGS += -i -e _rt_boot $(VERSREF) $(ZLAZYLOAD) $(ZNODLOPEN) \ +DYNFLAGS += -i -e _rt_boot $(VERSREF) $(ZNODLOPEN) \ $(ZINTERPOSE) -zdtrace=dtrace_data '-R$$ORIGIN' BUILD.s= $(AS) $(ASFLAGS) $< -o $@ diff --git a/usr/src/cmd/sh/Makefile b/usr/src/cmd/sh/Makefile index ceff32712c..052220ab4b 100644 --- a/usr/src/cmd/sh/Makefile +++ b/usr/src/cmd/sh/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" @@ -49,9 +49,7 @@ XGETFLAGS += -a -x sh.xcl CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DACCT MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB) LDFLAGS += $(MAPFILES:%=-M%) -LAZYLIBS = $(ZLAZYLOAD) -lgen -lsecdb $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lgen -lsecdb -LDLIBS += $(LAZYLIBS) +LDLIBS += -lgen -lsecdb GROUP = root .KEEP_STATE: diff --git a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs index d8cd3f209d..3de8e3efff 100644 --- a/usr/src/cmd/smbsrv/Makefile.smbsrv.defs +++ b/usr/src/cmd/smbsrv/Makefile.smbsrv.defs @@ -31,8 +31,6 @@ OBJS= $(SRCS:%.c=%.o) -LDLIBS += -L$(ROOT)/usr/lib/smbsrv -LDFLAGS += -R/usr/lib/smbsrv LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2 CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/smbsrv/smbadm/Makefile b/usr/src/cmd/smbsrv/smbadm/Makefile index 557924ddcb..40479e6df2 100644 --- a/usr/src/cmd/smbsrv/smbadm/Makefile +++ b/usr/src/cmd/smbsrv/smbadm/Makefile @@ -31,7 +31,8 @@ SRCS= smbadm.c include ../../Makefile.cmd include ../Makefile.smbsrv.defs -LDLIBS += -lsmb -lumem +LDLIBS += -L$(ROOT)/usr/lib/smbsrv -lsmb -lumem +LDFLAGS += -R/usr/lib/smbsrv all: $(PROG) diff --git a/usr/src/cmd/smbsrv/smbd/Makefile b/usr/src/cmd/smbsrv/smbd/Makefile index ddb8a6271a..d2670e2da5 100644 --- a/usr/src/cmd/smbsrv/smbd/Makefile +++ b/usr/src/cmd/smbsrv/smbd/Makefile @@ -45,7 +45,9 @@ $(ROOTMANIFEST):= FILEMODE = 0444 include ../Makefile.smbsrv.defs -LDLIBS += -lmlsvc -lmlrpc -lsmbrdr -lsmbns -lsmb -lbsm -lnsl -lumem +LDLIBS += -L$(ROOT)/usr/lib/smbsrv -lmlsvc -lmlrpc -lsmbrdr -lsmbns -lsmb \ + -lbsm -lnsl -lumem +LDFLAGS += -R/usr/lib/smbsrv ROOTSMBDDIR = $(ROOTLIB)/smbsrv ROOTSMBDFILE = $(PROG:%=$(ROOTSMBDDIR)/%) diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index 3fdf677187..f87147fa8b 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -20,7 +20,7 @@ # # -# 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,8 +76,7 @@ YFLAGS = -d CLOBBERFILES += svccfg_lex.c svccfg_grammar.c svccfg_grammar.h \ $(MYPROG:%=%-native) -LAZYLIBS = $(ZLAZYLOAD) -lxml2 $(ZNOLAZYLOAD) -SVCCFG_EXTRA_LIBS = $(LAZYLIBS) -lscf -ll -luutil -lumem -lmd5 +SVCCFG_EXTRA_LIBS = -lxml2 -lscf -ll -luutil -lumem -lmd5 $(NOT_NATIVE)SVCCFG_EXTRA_LIBS += -ltecla LIBSCF = $(SRC)/lib/libscf diff --git a/usr/src/cmd/syseventd/modules/Makefile.com b/usr/src/cmd/syseventd/modules/Makefile.com index e8b6ee468c..8546582b6d 100644 --- a/usr/src/cmd/syseventd/modules/Makefile.com +++ b/usr/src/cmd/syseventd/modules/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" @@ -36,21 +36,14 @@ include $(SRC)/lib/Makefile.lib include $(SRC)/cmd/syseventd/Makefile.com SRCDIR = . - -# -# Build modules with -Kpic, -z combreloc and -z text but not -z defs -# Note: -K pic is inherited by including Makefile.lib -# HSONAME = -ZDEFS = - -# There should be a mapfile here -MAPFILES = +MAPFILES = $(SRC)/cmd/syseventd/modules/mapfile-extern # # sysevent loadable modules require sysevent header files # CPPFLAGS += -I ../../daemons/syseventd +LDLIBS += -lc POFILES = $(SRCS:.c=.po) POFILE = $(LIBRARY).po diff --git a/usr/src/cmd/syseventd/modules/mapfile-extern b/usr/src/cmd/syseventd/modules/mapfile-extern new file mode 100644 index 0000000000..51abdbb680 --- /dev/null +++ b/usr/src/cmd/syseventd/modules/mapfile-extern @@ -0,0 +1,34 @@ +# +# 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: + debug_level = EXTERN; + root_dir = EXTERN; + syseventd_err_print = EXTERN; + syseventd_print = EXTERN; +}; diff --git a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile index ee2b012ff7..d778082424 100644 --- a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/Makefile +++ b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/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. @@ -22,8 +21,8 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # cmd/syseventd/modules/sysevent_conf_mod/Makefile # @@ -32,7 +31,8 @@ LIBRARY = sysevent_conf_mod include ../Makefile.com -CPPFLAGS += -I ../../daemons/syseventconfd +LDLIBS += -lnvpair +CPPFLAGS += -I ../../daemons/syseventconfd .KEEP_STATE: diff --git a/usr/src/cmd/syseventd/modules/zfs_mod/Makefile b/usr/src/cmd/syseventd/modules/zfs_mod/Makefile index 82616a7783..9970a6ae30 100644 --- a/usr/src/cmd/syseventd/modules/zfs_mod/Makefile +++ b/usr/src/cmd/syseventd/modules/zfs_mod/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 @@ LIBRARY= zfs_mod include ../Makefile.com -LDLIBS += -lzfs -ldevid +LDLIBS += -lzfs -ldevid -lnvpair .KEEP_STATE: diff --git a/usr/src/cmd/tar/Makefile b/usr/src/cmd/tar/Makefile index 8d8157c5c5..15321499d1 100644 --- a/usr/src/cmd/tar/Makefile +++ b/usr/src/cmd/tar/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" @@ -38,9 +38,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I $(SRC)/common/util DCFILE= $(PROG).dc LINTFLAGS += -u -LAZYLIBS = $(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD) -lint := LAZYLIBS = -ltsol -LDLIBS += -lsec -lcmdutils -lnvpair $(LAZYLIBS) +LDLIBS += -lsec -lcmdutils -lnvpair -ltsol CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/truss/Makefile.com b/usr/src/cmd/truss/Makefile.com index 34f54cbcff..4e6ca276a7 100644 --- a/usr/src/cmd/truss/Makefile.com +++ b/usr/src/cmd/truss/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" @@ -39,10 +39,7 @@ include ../../Makefile.cmd CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) -LAZYLIBS = $(ZLAZYLOAD) -ltsol -lnvpair $(ZNOLAZYLOAD) -lint := LAZYLIBS = -ltsol -lnvpair -LDLIBS += -lproc -lrtld_db -lc_db -lnsl -lsocket $(LAZYLIBS) - +LDLIBS += -lproc -lrtld_db -lc_db -lnsl -lsocket -ltsol -lnvpair CPPFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE=1 .KEEP_STATE: diff --git a/usr/src/cmd/vi/port/Makefile b/usr/src/cmd/vi/port/Makefile index 4b9c17ee22..8dce14fa41 100644 --- a/usr/src/cmd/vi/port/Makefile +++ b/usr/src/cmd/vi/port/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" @@ -70,12 +70,9 @@ CPPFLAGS += -DUSG -DSTDIO -DVMUNIX -DTABS=8 -DSINGLE -DTAG_STACK LDFLAGS += $(MAPFILE.NGB:%=-M%) CLOBBERFILES += $(LIBPROGS) -ex := LDLIBS += -lmapmalloc -lcurses \ - $(ZLAZYLOAD) -lgen -lcrypt_i $(ZNOLAZYLOAD) -$(XPG4) := LDLIBS += -lmapmalloc -lcurses \ - $(ZLAZYLOAD) -lgen -lcrypt_i $(ZNOLAZYLOAD) -$(XPG6) := LDLIBS += -lmapmalloc -lcurses \ - $(ZLAZYLOAD) -lgen -lcrypt_i $(ZNOLAZYLOAD) +ex := LDLIBS += -lmapmalloc -lcurses -lgen -lcrypt_i +$(XPG4) := LDLIBS += -lmapmalloc -lcurses -lgen -lcrypt_i +$(XPG6) := LDLIBS += -lmapmalloc -lcurses -lgen -lcrypt_i exrecover := LDLIBS += -lmapmalloc -lcrypt_i lint := LDLIBS += -lmapmalloc -lcurses -lgen -lcrypt diff --git a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/Makefile b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/Makefile index 3a0ed5cd1f..8b67697ce8 100644 --- a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/Makefile +++ b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/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 2005 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" @@ -111,7 +110,7 @@ LINTFLAGS += -um LINTLIBS = $(LDLIBS.cmd) LDFLAGS += -Mmapfile $(GSHARED) -R/usr/sadm/lib/wbem \ - $(ZCOMBRELOC) $(ZTEXT) $(ZDEFS) $(SOFLAGS) + $(ZTEXT) $(ZDEFS) $(SOFLAGS) LDLIBS += -L/usr/sadm/lib/wbem -lc -lcimapi -lfsmgt diff --git a/usr/src/cmd/wbem/provider/c/wbem_disk/lib/Makefile b/usr/src/cmd/wbem/provider/c/wbem_disk/lib/Makefile index 1ceb839a07..7f4f350e84 100644 --- a/usr/src/cmd/wbem/provider/c/wbem_disk/lib/Makefile +++ b/usr/src/cmd/wbem/provider/c/wbem_disk/lib/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 2005 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" @@ -124,7 +123,7 @@ LINTFLAGS += -um LINTLIBS = $(LDLIBS.cmd) LDFLAGS += -Mmapfile $(GSHARED) -R/usr/sadm/lib/wbem \ - $(ZCOMBRELOC) $(ZTEXT) $(ZDEFS) $(SOFLAGS) + $(ZTEXT) $(ZDEFS) $(SOFLAGS) LDLIBS += -L/usr/sadm/lib/wbem -lc -lcimapi -ldiskmgt \ -lnvpair diff --git a/usr/src/cmd/wbem/provider/tools/rds/Makefile.com b/usr/src/cmd/wbem/provider/tools/rds/Makefile.com index 2328181dfa..36a739235d 100644 --- a/usr/src/cmd/wbem/provider/tools/rds/Makefile.com +++ b/usr/src/cmd/wbem/provider/tools/rds/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" @@ -38,9 +37,7 @@ include $(SRC)/cmd/wbem/Makefile.cmd CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) -LAZYLIBS = $(ZLAZYLOAD) -lproject $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lproject -LDLIBS += $(LAZYLIBS) +LDLIBS += -lproject LINTFLAGS += -u LINTFLAGS64 += -u diff --git a/usr/src/cmd/xntpd/Makefile.cmd b/usr/src/cmd/xntpd/Makefile.cmd index 6ff5f300d1..8f4302c3b0 100644 --- a/usr/src/cmd/xntpd/Makefile.cmd +++ b/usr/src/cmd/xntpd/Makefile.cmd @@ -1,11 +1,11 @@ # -# 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" # -LIBS = -lsocket -lnsl -lmd +LIBS = -lsocket -lnsl LIBNTP_A= libntp/libntp.a LIBPARSE_A= libparse/libparse.a diff --git a/usr/src/cmd/xntpd/ntpdate/Makefile b/usr/src/cmd/xntpd/ntpdate/Makefile index 7182059e76..a155621718 100644 --- a/usr/src/cmd/xntpd/ntpdate/Makefile +++ b/usr/src/cmd/xntpd/ntpdate/Makefile @@ -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" @@ -24,7 +24,7 @@ clean: include ../../Makefile.targ -LDLIBS += ../$(LIBNTP_A) $(LIBS) +LDLIBS += ../$(LIBNTP_A) $(LIBS) -lmd OBJS= ntpdate.o version.o SOURCE= ntpdate.c diff --git a/usr/src/cmd/xntpd/ntpq/Makefile b/usr/src/cmd/xntpd/ntpq/Makefile index cc0493189e..b90c2508c7 100644 --- a/usr/src/cmd/xntpd/ntpq/Makefile +++ b/usr/src/cmd/xntpd/ntpq/Makefile @@ -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" @@ -24,7 +24,7 @@ clean: include ../../Makefile.targ -LDLIBS += $(LIBS) ../$(LIBNTP_A) +LDLIBS += $(LIBS) ../$(LIBNTP_A) -lmd OBJS= ntpq.o ntpq_ops.o version.o SOURCE= ntpq.c ntpq_ops.c diff --git a/usr/src/cmd/xntpd/xntpd/Makefile b/usr/src/cmd/xntpd/xntpd/Makefile index 4c2fb3e55a..24a4d95c2e 100644 --- a/usr/src/cmd/xntpd/xntpd/Makefile +++ b/usr/src/cmd/xntpd/xntpd/Makefile @@ -1,5 +1,5 @@ # -# 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" @@ -38,7 +38,7 @@ include ../../Makefile.targ LIBNTP= ../$(LIBNTP_A) LIBPARSE= ../$(LIBPARSE_A) LINTLIB= ../$(LLIBNTP_A) -LIBS += -lscf +LIBS += -lscf -lmd LDLIBS += $(LIBNTP) $(LIBPARSE) $(LIBS) LDFLAGS += $(MAPFILE.NGB:%=-M%) # diff --git a/usr/src/cmd/xntpd/xntpdc/Makefile b/usr/src/cmd/xntpd/xntpdc/Makefile index d9daa8b095..180acbd218 100644 --- a/usr/src/cmd/xntpd/xntpdc/Makefile +++ b/usr/src/cmd/xntpd/xntpdc/Makefile @@ -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" @@ -24,6 +24,7 @@ clean: include ../../Makefile.targ +LIBS += -lmd LDLIBS += ../$(LIBNTP_A) $(LIBS) OBJS= ntpdc.o ntpdc_ops.o version.o diff --git a/usr/src/cmd/zoneadmd/Makefile b/usr/src/cmd/zoneadmd/Makefile index 8f867e06ea..2ca1d2f01e 100644 --- a/usr/src/cmd/zoneadmd/Makefile +++ b/usr/src/cmd/zoneadmd/Makefile @@ -40,10 +40,8 @@ POFILE=zoneadmd_all.po POFILES= $(OBJS:%.o=%.po) CFLAGS += $(CCVERBOSE) -LAZYLIBS = $(ZLAZYLOAD) -ltsnet -ltsol $(ZNOLAZYLOAD) -lint := LAZYLIBS = -ltsnet -ltsol LDLIBS += -lsocket -lzonecfg -lnsl -ldevinfo -ldevice -lnvpair \ - -lgen -lbsm -lcontract -lzfs -luuid -lbrand -ldladm $(LAZYLIBS) + -lgen -lbsm -lcontract -lzfs -luuid -lbrand -ldladm -ltsnet -ltsol XGETFLAGS += -a -x zoneadmd.xcl .KEEP_STATE: diff --git a/usr/src/cmd/zonename/Makefile b/usr/src/cmd/zonename/Makefile index ac42810786..566e893a67 100644 --- a/usr/src/cmd/zonename/Makefile +++ b/usr/src/cmd/zonename/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. @@ -22,7 +21,7 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # cmd/zonename/Makefile @@ -32,9 +31,7 @@ PROG= zonename include ../Makefile.cmd -LAZYLIBS = $(ZLAZYLOAD) -lzonecfg $(ZNOLAZYLOAD) -lint := LAZYLIBS = -lzonecfg -LDLIBS += $(LAZYLIBS) +LDLIBS += -lzonecfg .KEEP_STATE: 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 diff --git a/usr/src/tools/abi/etc/exceptions b/usr/src/tools/abi/etc/exceptions index 8d9f937d27..96abf6ab67 100644 --- a/usr/src/tools/abi/etc/exceptions +++ b/usr/src/tools/abi/etc/exceptions @@ -535,6 +535,9 @@ PSARC 2004/035: RULE W4: usr/lib/libmilter.so.1 # WARNINGs exempted from RULE W5 (See RULES section of intf_check manpage) # exempts libraries with versions that offer no interfaces ############################################# +6689937: RULE W5: lib/libresolv.so.2: SUNW_2.3 +6689937: RULE W5: lib/sparcv9/libresolv.so.2: SUNW_2.3 +6689937: RULE W5: lib/amd64/libresolv.so.2: SUNW_2.3 4480868: RULE W5: usr/lib/watchmalloc.so.1: SUNWprivate_1.1 4480868: RULE W5: usr/lib/sparcv9/watchmalloc.so.1: SUNWprivate_1.1 PSARC 2004/619: RULE W5: usr/lib/amd64/watchmalloc.so.1: SUNWprivate_1.1 diff --git a/usr/src/tools/scripts/check_rtime.1 b/usr/src/tools/scripts/check_rtime.1 index 7f1cc966ac..2ad2d5ca91 100644 --- a/usr/src/tools/scripts/check_rtime.1 +++ b/usr/src/tools/scripts/check_rtime.1 @@ -21,7 +21,7 @@ .\" .\" CDDL HEADER END .\" -.TH check_rtime 1 "10 Jan 2008" +.TH check_rtime 1 "21 April 2008" .SH NAME .I check_rtime \- check ELF runtime attributes @@ -93,6 +93,17 @@ discussion above). Unsatisfied symbol relocations are displayed as: .RS 6 foo: symbol not found: bar <no -zdefs?> .RE +.RS 4 +.sp +Note: Shared objects can make reference to symbol definitions +that are expected to be defined by the caller. To indicate that +such symbols are not undefined in the usual sense, you must +specify these symbols in a \fImapfile\fP, using the \fBEXTERN\fP +or \fBPARENT\fP symbol attribute. Without these symbol attributes, +\fBldd(1)\fP is unable to determine the symbols special nature, and +.I check_rtime +will report these symbols as undefined. +.RE .TP \(bu Unused dependencies are wasteful at runtime, as they take time to @@ -120,10 +131,28 @@ different objects, or as the other object dependencies evolve. Unreferenced dependencies are displayed as: .sp .RS 6 -foo: unreferenced object=bar.so.1; unused dependency of libfoo.so.1 +foo: unreferenced object=bar.so.1; \\ +.br + unused dependency of libfoo.so.1 \\ +.br + <remove lib or -zignore?> .RE +.RS 4 .sp See also the section ENVIRONMENT VARIABLES. +.RE +.TP +\(bu +Unused search paths are wasteful at runtime. +Unused search paths are displayed as: +.sp +.RS 6 +foo: unused search path=/usr/foo/lib \\ +.br + (RUNPATH/RPATH from file libfoo.so.1) \\ +.br + <remove search path?> +.RE .LP .I check_rtime uses \fBelfdump(1)\fP to look for a concatenated relocation @@ -185,7 +214,9 @@ information. Note, removal of debugging information is only enabled for release builds. The existence of debugging information is displayed as: .sp .RS 6 -foo: debugging sections should be deleted <no strip -x?> +foo: debugging sections should be deleted \\ +.br + <no strip -x?> .RE .TP \(bu @@ -199,7 +230,9 @@ reason for symbol tables being removed. Objects that do not contain a symbol table are displayed as: .sp .RS 6 -foo.so.1: symbol table should not be stripped <remove -s?> +foo.so.1: symbol table should not be stripped \\ +.br + <remove -s?> .RE .TP \(bu diff --git a/usr/src/tools/scripts/check_rtime.pl b/usr/src/tools/scripts/check_rtime.pl index 3181af011c..e10790598b 100644 --- a/usr/src/tools/scripts/check_rtime.pl +++ b/usr/src/tools/scripts/check_rtime.pl @@ -60,10 +60,11 @@ # Define all global variables (required for strict) use vars qw($SkipDirs $SkipFiles $SkipTextrelFiles $SkipDirectBindFiles); -use vars qw($SkipUndefDirs $SkipUndefFiles $SkipUnusedDirs $SkipUnusedFiles); +use vars qw($SkipUndefFiles $SkipUnusedDirs); use vars qw($SkipStabFiles $SkipNoExStkFiles $SkipCrleConf); -use vars qw($UnusedNoise $Prog $Mach $Isalist $Env $Ena64 $Tmpdir $Error); -use vars qw($UnusedFiles $UnusedPaths $LddNoU $Crle32 $Crle64 $Conf32 $Conf64); +use vars qw($SkipUnusedSearchPath $SkipUnrefObject); +use vars qw($Prog $Mach $Isalist $Env $Ena64 $Tmpdir $Error); +use vars qw($UnusedPaths $LddNoU $Crle32 $Crle64 $Conf32 $Conf64); use vars qw($SkipDirectBindDirs $SkipInterps $SkipSymSort $OldDeps %opt); use strict; @@ -71,7 +72,6 @@ use strict; # Define any directories we should skip completely. $SkipDirs = qr{ - etc/lib | # special - used for partial statics usr/lib/devfsadm | # 4382889 usr/lib/libc | # optimized libc usr/lib/rcm | # 4426119 @@ -81,20 +81,13 @@ $SkipDirs = qr{ # Define any files we should skip completely. $SkipFiles = qr{ ^(?: - ld\.so\.1 | # confusing but correct dependencies lddstub | # lddstub has no dependencies - libmakestate\.so\.1 | # temporary; delivered by compiler group - libm\.so\.1 | # temporary; delivered by compiler group - libm\.so\.2 | # temporary; delivered by compiler group geniconvtbl\.so | # 4384329 libssagent\.so\.1 | # 4328854 libpsvcplugin_psr\.so\.1 | # 4385799 libpsvcpolicy_psr\.so\.1 | # " " libpsvcpolicy\.so\.1 | # " " picl_slm\.so | # " " - libcrypto_extra\.so\.0\.9\.8 | # OpenSSL SUNWcry filter lib - libssl_extra\.so\.0\.9\.8 | # OpenSSL SUNWcry filter lib - fcpackage\.so | # circular dependency on fcthread.so mod_ipp\.so | # Apache loadable module fptest | # USIII specific extns. cause ldd noise on USII bld. m/c grub @@ -123,38 +116,10 @@ $SkipDirectBindFiles = qr{ ^(?: }x; # Define any files that are allowed undefined references. -$SkipUndefDirs = qr{ - usr/lib/elfedit/ | # elfedit modules have callbacks - usr/lib/inet/ppp/ | # pppd plugins have callbacks - usr/lib/libp/ | # libc.so.1 requires _mcount - /lib/mdb/ | # mdb modules have callbacks - /lib/fm/fmd/plugins/ | # fmd modules have callbacks - /lib/fm/fmd/schemes/ | # fmd schemes have callbacks - /lib/scsi/plugins/ | # scsi plugins have callbacks - /i86pc/lib/mtst/ # mtst modules have callbacks -}x; $SkipUndefFiles = qr{ ^(?: - libthread_db\.so\.0 | # callbacks to proc service interface - libthread_db\.so\.1 | # " " " " - librtld_db\.so\.1 | # " " " " - libc_db\.so\.1 | # " " " " - libldstab\.so\.1 | # link-edit support libraries have - libld\.so\.[2-4] | # callback to the link-editors - liblddbg\.so\.4 | # " " " " - librtld\.so\.1 | # " " " " - libnisdb\.so\.2 | # C++ libsvm\.so\.1 | # libspmicommon.so.1 lacking - libwanboot\.so\.1 | # libcrypto.a and libssl.a - libwrap\.so\.1\.0 | # uses symbols provided by application - fcthread\.so | # uses symbols provided by application - fn\.so\.2 | # callback to automount - preen_md\.so\.1 | # callback to driver - libike\.so\.1 | # callbacks to in.iked for IKE policy - devfsadmd_mod\.so | # sysevent module callback to syseventd - fps-transport\.so | # Fp-scrubber's FMD module has callbacks - sysevent_conf_mod\.so | # sysevent module callback to syseventd - sysevent_reg_mod\.so # sysevent module callback to syseventd + libnisdb\.so\.2 # C++ )$ }x; @@ -164,26 +129,8 @@ $SkipUnusedDirs = qr{ /lib/libp # profile libc makes libm an unused }x; # dependency of standard libc -$SkipUnusedFiles = qr{ ^(?: - devfsadm | # 4382889 - disks | # " " - tapes | # " " - ports | # " " - audlinks | # " " - devlinks | # " " - drvconfig | # " " - ntptrace | # on intel doesn't need libmd5 - ocfserv | # libsched unreference by libjvm, - poold | # see 4952319. - libc\.so\.1\.9 | # 4lib/libc versions have private - libc\.so\.2\.9 # copies of stuff from libc. - )$ -}x; - # Define any files that should contain debugging information. $SkipStabFiles = qr{ ^(?: - abi_.* | - interceptors\.so\.1 | unix )$ }x; @@ -203,39 +150,54 @@ $SkipCrleConf = qr{ lib/libc/libc_hwcap }x; -# Define any files that should only have unused (ldd -u) processing. -$UnusedPaths = qr{ - ucb/shutdown # libucb interposes on libc and makes - # dependencies on libc seem unnecessary +# Skip "unused search path=" ldd(1) diagnostics. +$SkipUnusedSearchPath = qr{ + /usr/lib/fs/autofs.*\ from\ .automountd | # dlopen() + /etc/ppp/plugins.*\ from\ .*pppd | # dlopen() + /usr/lib/inet/ppp.*\ from\ .*pppd | # dlopen() + /usr/sfw/lib.*\ from\ .*libipsecutil.so.1 | # dlopen() + /usr/platform/.*rsmlib.*\ from\ .*librsm.so.2 | # dlopen() + \$ORIGIN.*\ from\ .*fcode.so | # dlopen() + /usr/platform/.*\ from\ .*/usr/platform | # picl + /usr/lib/picl/.*\ from\ .*/usr/platform | # picl + /usr/platform/.*\ from\ .*/usr/lib/picl | # picl + /usr/lib/smbsrv.*\ from\ .*libsmb\.so\.1 | # future needs + /usr/lib/mps/secv1.*\ from\ .*libnss3\.so | # non-OSNet + /usr/lib/mps.*\ from\ .*libnss3\.so | # non-OSNet + /usr/sfw/lib.*\ from\ .*libdbus-1\.so\.3 | # non-OSNet + /usr/sfw/lib.*\ from\ .*libdbus-glib-1\.so\.2 | # non-OSNet + /usr/sfw/lib.*\ from\ .*libglib-2\.0\.so\.0 | # non-OSNet + /usr/X11/lib.*\ from\ .*libglib-2\.0\.so\.0 | # non-OSNet + /usr/sfw/lib.*\ from\ .*libgobject-2\.0\.so\.0 | # non-OSNet + /usr/X11/lib.*\ from\ .*libgobject-2\.0\.so\.0 | # non-OSNet + /usr/sfw/lib.*\ from\ .*libcrypto\.so\.0\.9\.8 | # non-OSNet + /usr/sfw/lib.*\ from\ .*libnetsnmp\.so\.5 | # non-OSNet + /usr/sfw/lib.*\ from\ .*libgcc_s\.so\.1 # non-OSNet }x; -$UnusedFiles = qr{ ^(?: - rpc\.nisd # CCNEEDED makes pthread unreferenced - )$ +# Skip "unreferenced object=" ldd(1) diagnostics. +$SkipUnrefObject = qr{ + /libmapmalloc\.so\.1;\ unused\ dependency\ of | # interposer + /lib.*\ of\ .*/lib/picl/plugins/ | # picl + /lib.*\ of\ .*libcimapi\.so | # non-OSNET + /lib.*\ of\ .*libjvm\.so | # non-OSNET + /lib.*\ of\ .*libnetsnmp\.so\.5 | # non-OSNET + /lib.*\ of\ .*libnetsnmpagent\.so\.5 | # non-OSNET + /lib.*\ of\ .*libnetsnmpmibs\.so\.5 | # non-OSNET + /lib.*\ of\ .*libnetsnmphelpers\.so\.5 | # non-OSNET + /lib.*\ of\ .*libnspr4\.so | # non-OSNET + /lib.*\ of\ .*libsoftokn3\.so | # non-OSNET + /lib.*\ of\ .*libspmicommon\.so\.1 | # non-OSNET + /lib.*\ of\ .*libspmocommon\.so\.1 | # non-OSNET + /lib.*\ of\ .*libssl3\.so | # non-OSNET + /lib.*\ of\ .*libxml2\.so\.2 | # non-OSNET + /lib.*\ of\ .*libxslt\.so\.1 # non-OSNET }x; -# Define unused dependencies we should ignore. -# libCrun has a unnecessary dependency on libw, and libmapmalloc is often -# defined to interpose on libc but isn't used by the application itself. -# Threads dependencies look unused if libc is bound first. -$UnusedNoise = qr{ - libw\.so\.1;\ unused | - unused\ object=.*libw\.so\.1 | - libthread\.so\.1;\ unused | - libpthread\.so\.1;\ unused | - unused\ object=.*libpthread\.so\.1 | - libnsl\.so\.1;\ unused\ dependency\ of\ .*libxslt\.so\.1 | - libdl\.so\.1;\ unused\ dependency\ of\ .*libspmicommon\.so\.1 | - libdl\.so\.1;\ unused\ dependency\ of\ .*libCrun\.so\.1 | - libfru\.so\.1;\ unused\ object=.*libdl\.so\.1 | - libfrupicl\.so\.1;\ unused\ object=.*libdl\.so\.1 | - libmapmalloc\.so\.1;\ unused | - unused\ dependency\ of\ .*libstdc\+\+\.so\.6 | - unreferenced\ object=.*libstdc\+\+\.so\.6 | - unused\ dependency\ of\ .*libnetsnmp\.so\.5 | - unused\ dependency\ of\ .*libnetsnmphelpers\.so\.5 | - unused\ dependency\ of\ .*libnetsnmpmibs\.so\.5 | - unused\ dependency\ of\ .*libnetsnmpagent\.so\.5 +# Define any files that should only have unused (ldd -u) processing. +$UnusedPaths = qr{ + ucb/shutdown # libucb interposes on libc and makes + # dependencies on libc seem unnecessary }x; # Define interpreters we should ignore. @@ -248,13 +210,16 @@ $SkipInterps = qr{ # Catch libintl and libw, although ld(1) will bind to these and thus determine # they're needed, their content was moved into libc as of on297 build 7. # libthread and libpthread were completely moved into libc as of on10 build 53. -# Also, catch libdl, whose content was moved into libc as of on10 build 49. +# libdl was moved into libc as of on10 build 49. librt and libaio were moved +# into libc as of Nevada build 44. $OldDeps = qr{ ^(?: libintl\.so\.1 | libw\.so\.1 | libthread\.so\.1 | libpthread\.so\.1 | - libdl\.so\.1 + libdl\.so\.1 | + librt\.so\.1 | + libaio\.so\.1 )$ }x; @@ -274,7 +239,8 @@ $SkipSymSort = qr{ ^.*(?: lib/amd64/libnsl\.so\.1 | # C++ lib/sparcv9/libnsl\.so\.1 | # C++ lib/sparcv9/libfru\.so\.1 | # C++ - usr/lib/sgml/nsgmls # C++ + usr/lib/sgml/nsgmls | # C++ + ld\.so\.1 # libc_pic.a user )$ }x; @@ -480,8 +446,8 @@ sub OutMsg { sub ProcFile { my($FullPath, $RelPath, $File, $Secure) = @_; my(@Elf, @Ldd, $Dyn, $Intp, $Dll, $Ttl, $Sym, $Interp, $Stack); - my($Sun, $Relsz, $Pltsz, $Uns, $Tex, $Stab, $Strip, $Lddopt, $SymSort); - my($Val, $Header, $SkipLdd, $IsX86, $RWX); + my($Sun, $Relsz, $Pltsz, $Tex, $Stab, $Strip, $Lddopt, $SymSort); + my($Val, $Header, $SkipLdd, $IsX86, $RWX, $UnDep); my($HasDirectBinding); # Ignore symbolic links. @@ -666,8 +632,7 @@ DYN: # By default look for all unreferenced dependencies. However, # some objects have legitimate dependencies that they do not # reference. - if ($LddNoU || ($File =~ $UnusedFiles) || - ($RelPath =~ $UnusedPaths)) { + if ($LddNoU || ($RelPath =~ $UnusedPaths)) { $Lddopt = "-ru"; } else { $Lddopt = "-rU"; @@ -680,9 +645,9 @@ DYN: $Val = 0; $Sym = 5; - $Uns = 1; + $UnDep = 1; -LDD: foreach my $Line (@Ldd) { + foreach my $Line (@Ldd) { if ($Val == 0) { $Val = 1; @@ -736,13 +701,9 @@ LDD: foreach my $Line (@Ldd) { # references. if ($Sym == 5) { if (!$opt{a}) { - if ($RelPath =~ $SkipUndefDirs) { - $Sym = 0; - next LDD; - } if ($File =~ $SkipUndefFiles) { $Sym = 0; - next LDD; + next; } } } @@ -758,22 +719,43 @@ LDD: foreach my $Line (@Ldd) { OutMsg($Ttl++, $RelPath, $Line); next; } - # Look for any unused dependencies. - if ($Uns && ($Line =~ /unused/)) { + # Look for any unused search paths. + if ($Line =~ /unused search path=/) { if (!$opt{a}) { - if ($RelPath =~ $SkipUnusedDirs) { - $Uns = 0; - next LDD; + if ($Line =~ $SkipUnusedSearchPath) { + next; } - if ($File =~ $SkipUnusedFiles) { - $Uns = 0; - next LDD; + } + if ($Secure) { + $Line =~ s!$Tmpdir/!!; + } + $Line =~ s/^[ \t]*(.*)/\t$1\t<remove search path?>/; + OutMsg($Ttl++, $RelPath, $Line); + next; + } + # Look for unreferenced dependencies. Note, if any unreferenced + # objects are ignored, then set $UnDep so as to suppress any + # associated unused-object messages. + if ($Line =~ /unreferenced object=/) { + if (!$opt{a}) { + if ($Line =~ $SkipUnrefObject) { + $UnDep = 0; + next; } - - # Remove any noise. - if ($Line =~ $UnusedNoise) { - $Uns = 0; - next LDD; + } + if ($Secure) { + $Line =~ s!$Tmpdir/!!; + } + $Line =~ s/^[ \t]*(.*)/\t$1\t<remove lib or -zignore?>/; + OutMsg($Ttl++, $RelPath, $Line); + next; + } + # Look for any unused dependencies. + if ($UnDep && ($Line =~ /unused/)) { + if (!$opt{a}) { + if ($RelPath =~ $SkipUnusedDirs) { + $UnDep = 0; + next; } } if ($Secure) { @@ -880,17 +862,17 @@ ELF: foreach my $Line (@Elf) { next; } - # Under the -i (information) option print out any useful dynamic - # entries. # Does this object have any dependencies. - if ($opt{i} && ($Line =~ /NEEDED/)) { + if ($Line =~ /NEEDED/) { my($Need) = (split(' ', $Line))[3]; - # Catch any old (unnecessary) dependencies. if ($Need =~ $OldDeps) { + # Catch any old (unnecessary) dependencies. OutMsg($Ttl++, $RelPath, "\tNEEDED=$Need\t<dependency no longer necessary>"); - } else { + } elsif ($opt{i}) { + # Under the -i (information) option print out + # any useful dynamic entries. OutMsg($Ttl++, $RelPath, "\tNEEDED=$Need"); } next; @@ -967,7 +949,6 @@ sub ProcSymSortOutMsg { } - ## ProcSymSort(FullPath, RelPath) # # Examine the symbol sort sections for the given object and report diff --git a/usr/src/ucbcmd/sbcp/Makefile b/usr/src/ucbcmd/sbcp/Makefile index 3338ac46a5..69b4e748a2 100644 --- a/usr/src/ucbcmd/sbcp/Makefile +++ b/usr/src/ucbcmd/sbcp/Makefile @@ -45,7 +45,7 @@ LIBUCB= ../../ucblib/libucb/sparc/libucb.so.1 # need libc/sparc/inc for PIC.h ASFLAGS= -P -D_ASM -DPIC -K pic LDFLAGS= -R /usr/4lib:/usr/ucblib -e _start -G -t \ - $(BLOCAL) $(ZNOVERSION) $(ZDEFS) $(ZTEXT) $(ZCOMBRELOC) \ + $(BLOCAL) $(ZNOVERSION) $(ZDEFS) $(ZTEXT) \ -I/usr/lib/ld.so.1 LIBS= $(LDLIBS.lib) -lmapmalloc $(LIBBC) $(LIBUCB) -lnsl -lc |