6806791 filter builds could be optimized

6823371 calloc() uses suboptimal memset() causing 15% regression in SpecCPU2006 gcc code

--HG--
rename : usr/src/lib/libkrb5/common/mapfile => usr/src/lib/libkrb5/common/mapfile-vers

7 files changed, 45 insertions, 88 deletions

diff --git a/usr/src/lib/libkrb5/Makefile b/usr/src/lib/libkrb5/Makefile
index 3ee7c85c04..68feb56d99 100755..100644
--- a/usr/src/lib/libkrb5/Makefile
+++ b/usr/src/lib/libkrb5/Makefile
@@ -19,52 +19,45 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include		$(SRC)/lib/Makefile.lib
 
-SUBDIRS=	$(MACH) $(MACH64)
+include		../Makefile.lib
 
-INSTALLED_HDRS= com_err.h krb5.h
-COMERRH= $(SRC)/lib/gss_mechs/mech_krb5/include/com_err.h
-KRB5H=  $(SRC)/uts/common/gssapi/mechs/krb5/include/krb5.h
+SUBDIRS =	$(MACH) $(BUILD64) $(MACH64)
 
-KRB5INCDIR= $(ROOT)/usr/include/kerberosv5
+INSTALLED_HDRS = \
+		com_err.h krb5.h
+COMERRH =	$(SRC)/lib/gss_mechs/mech_krb5/include/com_err.h
+KRB5H =		$(SRC)/uts/common/gssapi/mechs/krb5/include/krb5.h
 
+KRB5INCDIR= 	$(ROOT)/usr/include/kerberosv5
 
-COMERRHINST= $(KRB5INCDIR)/com_err.h
-KRB5HINST= $(KRB5INCDIR)/krb5.h
-
-KRB5HDRS= $(INSTALLED_HDRS:%=$(KRB5INCDIR)/%)
+COMERRHINST =	$(KRB5INCDIR)/com_err.h
+KRB5HINST =	$(KRB5INCDIR)/krb5.h
 
+KRB5HDRS =	$(INSTALLED_HDRS:%=$(KRB5INCDIR)/%)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
-
-LIBRARY= 	libkrb5.a
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
+lint check:
 
+$(SUBDIRS):	FRC
+	@cd $@; pwd; $(MAKE) $(TARGET)
 
-install_h: $(KRB5INCDIR) $(KRB5HDRS)
+install_h:	$(KRB5INCDIR) $(KRB5HDRS)
 
-$(COMERRHINST): $(COMERRH)
+$(COMERRHINST):	$(COMERRH)
 	install -s -m 644 -f $(KRB5INCDIR) $(COMERRH)
-$(KRB5HINST): $(KRB5H)
+$(KRB5HINST):	$(KRB5H)
 	install -s -m 644 -f $(KRB5INCDIR) $(KRB5H)
 
-
-check FRC:
-
+FRC:
diff --git a/usr/src/lib/libkrb5/Makefile.com b/usr/src/lib/libkrb5/Makefile.com
index d7e596cd00..b5635c835b 100755..100644
--- a/usr/src/lib/libkrb5/Makefile.com
+++ b/usr/src/lib/libkrb5/Makefile.com
@@ -19,53 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-# include library definitions
-include $(SRC)/lib/Makefile.lib
 
 LIBRARY =	libkrb5.a
-LLIBRARY =	libkrb5.so.1
 VERS =		.1
 
-MAPFILES =	../common/mapfile $(MAPFILE.FLT)
-
-DYNFLAGS +=	-G $(ZLOADFLTR)
-
-LIBS =		$(DYNLIB)
-
-#override liblink
-INS.liblink=	-$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@
-
-.KEEP_STATE:
-
-all:	$(LIBS)
-
-$(LIBS):	$(MAPFILES)
-	$(LD) $(DYNFLAGS) -o $@
-
-
-$(ROOTLIBDIR)/$(DYNLIB) :=	FILEMODE= 755
-$(ROOTLIBDIR64)/$(DYNLIB) :=	FILEMODE= 755
-
-$(ROOTLIBDIR)/%: %
-	$(INS.file)
-$(ROOTLIBDIR64)/%: %
-	$(INS.file)
-
-$(ROOTLIBDIR)/$(LIBLINKS): $(ROOTLIBDIR)/$(LIBLINKS)$(VERS)
-	$(INS.liblink)
-$(ROOTLIBDIR64)/$(LIBLINKS): $(ROOTLIBDIR64)/$(LIBLINKS)$(VERS)
-	$(INS.liblink64)
-
-clobber: clean
-	-$(RM) $(CLOBBERTARGFILES)
-
-clean:
-	-$(RM) $(LIBS)
-
-lint:
+DYNFLAGS +=	$(ZLOADFLTR)
diff --git a/usr/src/lib/libkrb5/amd64/Makefile b/usr/src/lib/libkrb5/amd64/Makefile
index 8cb76d200d..1ca72d8fc1 100644
--- a/usr/src/lib/libkrb5/amd64/Makefile
+++ b/usr/src/lib/libkrb5/amd64/Makefile
@@ -19,14 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
+include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
+include		$(SRC)/lib/Makefile.lib.64
+
+DYNFLAGS +=	-R/usr/lib/64/gss
 
-DYNFLAGS +=	-64 -R/usr/lib/64/gss
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
 
-install:	all $(ROOTLIBS64) $(ROOTLINKS64)
+include		$(SRC)/lib/Makefile.filter.targ
diff --git a/usr/src/lib/libkrb5/common/mapfile b/usr/src/lib/libkrb5/common/mapfile-vers
index abd3d255a8..abd3d255a8 100644
--- a/usr/src/lib/libkrb5/common/mapfile
+++ b/usr/src/lib/libkrb5/common/mapfile-vers
diff --git a/usr/src/lib/libkrb5/i386/Makefile b/usr/src/lib/libkrb5/i386/Makefile
index d53a981575..56164b6fca 100755..100644
--- a/usr/src/lib/libkrb5/i386/Makefile
+++ b/usr/src/lib/libkrb5/i386/Makefile
@@ -19,14 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
+include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
 DYNFLAGS +=	-R/usr/lib/gss
 
-install:	all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
+
+include		$(SRC)/lib/Makefile.filter.targ
diff --git a/usr/src/lib/libkrb5/sparc/Makefile b/usr/src/lib/libkrb5/sparc/Makefile
index d53a981575..56164b6fca 100755..100644
--- a/usr/src/lib/libkrb5/sparc/Makefile
+++ b/usr/src/lib/libkrb5/sparc/Makefile
@@ -19,14 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
+include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
 DYNFLAGS +=	-R/usr/lib/gss
 
-install:	all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
+
+include		$(SRC)/lib/Makefile.filter.targ
diff --git a/usr/src/lib/libkrb5/sparcv9/Makefile b/usr/src/lib/libkrb5/sparcv9/Makefile
index 8cb76d200d..1ca72d8fc1 100755..100644
--- a/usr/src/lib/libkrb5/sparcv9/Makefile
+++ b/usr/src/lib/libkrb5/sparcv9/Makefile
@@ -19,14 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
+include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
+include		$(SRC)/lib/Makefile.lib.64
+
+DYNFLAGS +=	-R/usr/lib/64/gss
 
-DYNFLAGS +=	-64 -R/usr/lib/64/gss
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
 
-install:	all $(ROOTLIBS64) $(ROOTLINKS64)
+include		$(SRC)/lib/Makefile.filter.targ