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

5 files changed, 51 insertions, 79 deletions

diff --git a/usr/src/lib/libsys/Makefile b/usr/src/lib/libsys/Makefile
index a4b0682369..24f9ff465f 100644
--- a/usr/src/lib/libsys/Makefile
+++ b/usr/src/lib/libsys/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,28 +19,26 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 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		../Makefile.lib
 
-SUBDIRS=	$(MACH)
+SUBDIRS =	$(MACH)
 
-all :=		TARGET=	all
-clean :=	TARGET=	clean
-clobber :=	TARGET=	clobber
-install :=	TARGET=	install
+all :=		TARGET= all
+clean :=	TARGET= clean
+clobber :=	TARGET= clobber
+install :=	TARGET= install
 
 .KEEP_STATE:
 
-all clean clobber install:	$(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 lint:
 
 $(SUBDIRS):	FRC
-		@cd $@; pwd; $(MAKE) $(TARGET)
+	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsys/Makefile.com b/usr/src/lib/libsys/Makefile.com
index c27219af5b..86630ea862 100644
--- a/usr/src/lib/libsys/Makefile.com
+++ b/usr/src/lib/libsys/Makefile.com
@@ -19,37 +19,20 @@
 # 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"
-#
-
-LIBRARY=	libsys.a
-VERS=		.1
-
-COMOBJ=		libsys.o
-OBJECTS=	$(COMOBJ)  $(MACHOBJ)
 
-include 	../../../lib/Makefile.lib
-
-MAPFILES =	mapfile-vers $(MAPFILE.FLT)
+LIBRARY =	libsys.a
+VERS =		.1
 
 # Define libsys to be a filter on libc.  The ABI requires the runtime linker as
 # the soname.
+SONAME =	/usr/lib/ld.so.1
+DYNFLAGS +=	-F /usr/lib/libc.so.1
+MAPFILEDIR =	.				# redirect mapfile-vers
 
-DYNFLAGS +=	-F/usr/lib/libc.so.1
-
-SONAME=		/usr/lib/ld.so.1
-
-# Redefine shared object build rule to use $(LD) directly (this avoids .init
-# and .fini sections being added).
-
-BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS)
-
-pics/%.o :=	ASFLAGS += $(AS_PICFLAGS)
-
-COMSRC=		$(COMOBJ:%.o=%.c)
-MACHSRC=	$(MACHOBJ:%.o=%.s)
+COMSRC =	$(COMOBJ:%.o=%.c)
+MACHSRC =	$(MACHOBJ:%.o=%.s)
 
-CLOBBERFILES +=	$(DYNLIB)  $(LIBLINKS)  $(COMSRC)  $(MACHSRC)
+CLOBBERFILES +=	$(COMSRC) $(MACHSRC)
diff --git a/usr/src/lib/libsys/Makefile.targ b/usr/src/lib/libsys/Makefile.targ
index c78f09af6a..9738a9b9b6 100644
--- a/usr/src/lib/libsys/Makefile.targ
+++ b/usr/src/lib/libsys/Makefile.targ
@@ -19,20 +19,20 @@
 # 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"
-#
 
-pics/%.o:	%.s
-		$(COMPILE.s) -o $@ $<
-		$(POST_PROCESS_O)
+BUILD.SO +=	$(PICS)
 
-pics/%.o:	%.c
-		$(COMPILE.c) -o $@ $<
-		$(POST_PROCESS_O)
+$(COMSRC):	../common/libsys.sh libsys.list
+		sh ../common/libsys.sh
 
-include		../../../lib/Makefile.targ
+$(MACHSRC):	libsys.sh libsyss.list
+		sh ./libsys.sh
 
-FRC:
+pics/%.o :=	ASFLAGS += $(AS_PICFLAGS)
+
+pics/%.o:	%.s
+		$(COMPILE.s) -o $@ $<
+		$(POST_PROCESS_O)
diff --git a/usr/src/lib/libsys/i386/Makefile b/usr/src/lib/libsys/i386/Makefile
index 683e01b9ce..6e0d26d1db 100644
--- a/usr/src/lib/libsys/i386/Makefile
+++ b/usr/src/lib/libsys/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,20 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 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		../Makefile.com
-
-.KEEP_STATE:
+# Define objects first to trigger $(PIC) rules in Makefile.lib
 
-all:		$(DYNLIB)
+COMOBJ =	libsys.o
+OBJECTS =	$(COMOBJ)
 
-install:	all $(ROOTDYNLIB) $(ROOTLINKS)
+include		$(SRC)/lib/Makefile.filter.com
+include		../Makefile.com
 
-$(COMSRC):	../common/libsys.sh libsys.list
-		sh ../common/libsys.sh
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
 
+include		$(SRC)/lib/Makefile.filter.targ
 include		../Makefile.targ
diff --git a/usr/src/lib/libsys/sparc/Makefile b/usr/src/lib/libsys/sparc/Makefile
index bf5e296647..249cb75708 100644
--- a/usr/src/lib/libsys/sparc/Makefile
+++ b/usr/src/lib/libsys/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,25 +19,20 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 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"
 
-MACHOBJ=	libsyss.o
+# Define objects first to trigger $(PIC) rules in Makefile.lib
 
-include		../Makefile.com
-
-.KEEP_STATE:
-
-all:		$(DYNLIB)
+COMOBJ =	libsys.o
+MACHOBJ =	libsyss.o
+OBJECTS =	$(COMOBJ) $(MACHOBJ)
 
-install:	all $(ROOTDYNLIB) $(ROOTLINKS)
-
-$(COMSRC):	../common/libsys.sh libsys.list
-		sh ../common/libsys.sh
+include		$(SRC)/lib/Makefile.filter.com
+include		../Makefile.com
 
-$(MACHSRC):	libsys.sh libsyss.list
-		sh ./libsys.sh
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
 
+include		$(SRC)/lib/Makefile.filter.targ
 include		../Makefile.targ