summaryrefslogtreecommitdiff
path: root/usr/src/lib/libpthread
diff options
context:
space:
mode:
authorRod Evans <Rod.Evans@Sun.COM>2009-05-07 16:01:18 -0700
committerRod Evans <Rod.Evans@Sun.COM>2009-05-07 16:01:18 -0700
commit2a8d6eba033e4713ab12b61178f0513f1f075482 (patch)
tree0fd82f40b89008aa56426a55126371550f5b2309 /usr/src/lib/libpthread
parentc03aa62609f1d65e84421396e8ee70875fc77b30 (diff)
downloadillumos-gate-2a8d6eba033e4713ab12b61178f0513f1f075482.tar.gz
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
Diffstat (limited to 'usr/src/lib/libpthread')
-rw-r--r--usr/src/lib/libpthread/Makefile17
-rw-r--r--usr/src/lib/libpthread/Makefile.com35
-rw-r--r--usr/src/lib/libpthread/amd64/Makefile18
-rw-r--r--usr/src/lib/libpthread/i386/Makefile16
-rw-r--r--usr/src/lib/libpthread/sparc/Makefile16
-rw-r--r--usr/src/lib/libpthread/sparcv9/Makefile18
6 files changed, 44 insertions, 76 deletions
diff --git a/usr/src/lib/libpthread/Makefile b/usr/src/lib/libpthread/Makefile
index aaab771c04..6cb7a4fa8a 100644
--- a/usr/src/lib/libpthread/Makefile
+++ b/usr/src/lib/libpthread/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,24 @@
# CDDL HEADER END
#
#
-# Copyright 1997-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.lib
+include ../Makefile.lib
-SUBDIRS = $(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
+SUBDIRS = $(MACH) $(BUILD64) $(MACH64)
all := TARGET= all
clean := TARGET= clean
clobber := TARGET= clobber
install := TARGET= install
-lint := TARGET= lint
.KEEP_STATE:
all clean clobber install: $(SUBDIRS)
-lint: $(SUBDIRS)
+lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libpthread/Makefile.com b/usr/src/lib/libpthread/Makefile.com
index d943a84ff6..74cc5833ad 100644
--- a/usr/src/lib/libpthread/Makefile.com
+++ b/usr/src/lib/libpthread/Makefile.com
@@ -19,38 +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"
-#
-LIBRARY = libpthread.a
-VERS = .1
+LIBRARY = libpthread.a
+VERS = .1
-include ../../Makefile.lib
-include ../../Makefile.rootfs
+include $(SRC)/lib/Makefile.rootfs
+LIBS += $(LINTLIB)
DYNFLAGS += -F libc.so.1
-
-LIBS = $(DYNLIB) $(LINTLIB)
-
-SRCDIR = ../common
-$(LINTLIB) := SRCS = $(SRCDIR)/llib-lpthread
-
-MAPFILES = mapfile-vers $(MAPFILE.FLT)
-
-# Redefine shared object build rule to use $(LD) directly (this avoids .init
-# and .fini sections being added). Also, since there are no OBJECTS, turn
-# off CTF.
-
-BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS)
-CTFMERGE_LIB= :
-
-.KEEP_STATE:
-
-include ../../Makefile.targ
-
-all: $(LIBS)
-
-lint:
+MAPFILEDIR = . # redirect mapfile-vers
diff --git a/usr/src/lib/libpthread/amd64/Makefile b/usr/src/lib/libpthread/amd64/Makefile
index 9c1d6cf6cd..70f0fc2457 100644
--- a/usr/src/lib/libpthread/amd64/Makefile
+++ b/usr/src/lib/libpthread/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,15 +19,14 @@
# 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.com
-include ../../Makefile.lib.64
+include $(SRC)/lib/Makefile.filter.com
+include ../Makefile.com
+include $(SRC)/lib/Makefile.lib.64
-BUILD.SO= $(LD) -o $@ -G -64 $(DYNFLAGS)
+install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
-install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+include $(SRC)/lib/Makefile.filter.targ
diff --git a/usr/src/lib/libpthread/i386/Makefile b/usr/src/lib/libpthread/i386/Makefile
index 5a6c1eeff6..4e4e8c02a9 100644
--- a/usr/src/lib/libpthread/i386/Makefile
+++ b/usr/src/lib/libpthread/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,12 +19,13 @@
# 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.com
+include $(SRC)/lib/Makefile.filter.com
+include ../Makefile.com
+
+install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
-install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+include $(SRC)/lib/Makefile.filter.targ
diff --git a/usr/src/lib/libpthread/sparc/Makefile b/usr/src/lib/libpthread/sparc/Makefile
index 5a6c1eeff6..4e4e8c02a9 100644
--- a/usr/src/lib/libpthread/sparc/Makefile
+++ b/usr/src/lib/libpthread/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,12 +19,13 @@
# 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.com
+include $(SRC)/lib/Makefile.filter.com
+include ../Makefile.com
+
+install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
-install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+include $(SRC)/lib/Makefile.filter.targ
diff --git a/usr/src/lib/libpthread/sparcv9/Makefile b/usr/src/lib/libpthread/sparcv9/Makefile
index 9c1d6cf6cd..70f0fc2457 100644
--- a/usr/src/lib/libpthread/sparcv9/Makefile
+++ b/usr/src/lib/libpthread/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,15 +19,14 @@
# 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.com
-include ../../Makefile.lib.64
+include $(SRC)/lib/Makefile.filter.com
+include ../Makefile.com
+include $(SRC)/lib/Makefile.lib.64
-BUILD.SO= $(LD) -o $@ -G -64 $(DYNFLAGS)
+install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
-install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+include $(SRC)/lib/Makefile.filter.targ