14 files changed, 51 insertions, 375 deletions
diff --git a/usr/src/lib/libmtmalloc/Makefile b/usr/src/lib/libmtmalloc/Makefile
index ea5a0f4fc4..aa5cccd34b 100644
--- a/usr/src/lib/libmtmalloc/Makefile
+++ b/usr/src/lib/libmtmalloc/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,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmtmalloc/Makefile
 
 include ../Makefile.lib
 
@@ -41,7 +39,7 @@ $(ROOTHDRS) :=  FILEMODE= 644
 $(ROOTHDRDIR)/%: common/%
 	$(INS.file)
 
-SUBDIRS=	spec .WAIT $(MACH)
+SUBDIRS=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
diff --git a/usr/src/lib/libmtmalloc/Makefile.com b/usr/src/lib/libmtmalloc/Makefile.com
index b7ee0a7d61..ee55f6c0cb 100644
--- a/usr/src/lib/libmtmalloc/Makefile.com
+++ b/usr/src/lib/libmtmalloc/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 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,16 +33,15 @@ OBJECTS = mtmalloc.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS = ../common/mtmalloc.c
-
-LINTSRC=        $(LINTLIB:%.ln=%)
+SRCDIR =	../common
+SRCS =		../common/mtmalloc.c
+LINTSRC =        $(LINTLIB:%.ln=%)
 
 LIBS 		 = $(DYNLIB) $(LINTLIB)
 LDLIBS 		+= -lc
 CFLAGS 		+= $(CCVERBOSE) $(C_PICFLAGS)
 CPPFLAGS	+= -I../common -D_REENTRANT
-DYNFLAGS 	+= $(ZNODLOPEN) -M$(MAPFILE) $(ZINTERPOSE)
+DYNFLAGS 	+= $(ZNODLOPEN) $(ZINTERPOSE)
 
 .KEEP_STATE:
 
@@ -51,11 +49,6 @@ all: $(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB): $(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libmtmalloc/amd64/Makefile b/usr/src/lib/libmtmalloc/amd64/Makefile
index 125e863932..2e8cdecf75 100644
--- a/usr/src/lib/libmtmalloc/amd64/Makefile
+++ b/usr/src/lib/libmtmalloc/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,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libmtmalloc/spec/versions b/usr/src/lib/libmtmalloc/common/mapfile-vers
index 2c005c8fcc..08e242cfd7 100644
--- a/usr/src/lib/libmtmalloc/spec/versions
+++ b/usr/src/lib/libmtmalloc/common/mapfile-vers
@@ -1,13 +1,9 @@
 #
-# Copyright 2005 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, 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,26 +18,31 @@
 #
 # CDDL HEADER END
 #
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-i386 {
-	SUNW_1.1.1: {SUNW_1.1};
-	SUNW_1.1;
-	SUNWprivate_1.1;
-}
-sparc {
-	SUNW_1.1.1: {SUNW_1.1};
-	SUNW_1.1;
-	SUNWprivate_1.1;
-}
-sparcv9 {
-	SUNW_1.1.1: {SUNW_1.1};
-	SUNW_1.1;
-	SUNWprivate_1.1;
-}
-amd64 {
-	SUNW_1.1.1: {SUNW_1.1};
-	SUNW_1.1;
+SUNW_1.1.1 {
+    global:
+	calloc = NODIRECT;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	free = NODIRECT;
+	malloc = NODIRECT;
+	mallocctl = NODIRECT;
+	memalign = NODIRECT;
+	realloc = NODIRECT;
+	valloc = NODIRECT;
+};
+
+SUNWprivate_1.1 {
+    global:
 	SUNWprivate_1.1;
-}
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmtmalloc/i386/Makefile b/usr/src/lib/libmtmalloc/i386/Makefile
index 879604a649..35ac6d4219 100644
--- a/usr/src/lib/libmtmalloc/i386/Makefile
+++ b/usr/src/lib/libmtmalloc/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,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmtmalloc/i386/Makefile
-#
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/libmtmalloc/sparc/Makefile b/usr/src/lib/libmtmalloc/sparc/Makefile
index 926dd12ba2..35ac6d4219 100644
--- a/usr/src/lib/libmtmalloc/sparc/Makefile
+++ b/usr/src/lib/libmtmalloc/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,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmtmalloc/sparc/Makefile
-#
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/libmtmalloc/sparcv9/Makefile b/usr/src/lib/libmtmalloc/sparcv9/Makefile
index 063c1f455b..2e8cdecf75 100644
--- a/usr/src/lib/libmtmalloc/sparcv9/Makefile
+++ b/usr/src/lib/libmtmalloc/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,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmtmalloc/sparcv9/Makefile
-#
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libmtmalloc/spec/Makefile b/usr/src/lib/libmtmalloc/spec/Makefile
deleted file mode 100644
index 736aa6fbe5..0000000000
--- a/usr/src/lib/libmtmalloc/spec/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# 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.
-#
-# 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"
-#
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmtmalloc/spec/Makefile
-
-include	$(SRC)/lib/Makefile.spec.arch
diff --git a/usr/src/lib/libmtmalloc/spec/Makefile.targ b/usr/src/lib/libmtmalloc/spec/Makefile.targ
deleted file mode 100644
index bb17aa1aff..0000000000
--- a/usr/src/lib/libmtmalloc/spec/Makefile.targ
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# 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.
-#
-# 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"
-#
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmtmalloc/spec/Makefile.targ
-
-LIBRARY	=	libmtmalloc.a
-VERS	=	.1
-
-OBJECTS	=	mtmalloc.o
-
diff --git a/usr/src/lib/libmtmalloc/spec/amd64/Makefile b/usr/src/lib/libmtmalloc/spec/amd64/Makefile
deleted file mode 100644
index 453c0ea671..0000000000
--- a/usr/src/lib/libmtmalloc/spec/amd64/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# 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.
-#
-# 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
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-.KEEP_STATE:
-
-include	../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS	+=
-
-include	$(SRC)/lib/Makefile.lib
-include	$(SRC)/lib/Makefile.lib.64
-
-# Uncomment the following if the linker complains
-#amd64_C_PICFLAGS  = -K PIC
-
-include	$(SRC)/lib/Makefile.spec
-
-install: $(ROOTABILIB64)
diff --git a/usr/src/lib/libmtmalloc/spec/i386/Makefile b/usr/src/lib/libmtmalloc/spec/i386/Makefile
deleted file mode 100644
index c55d7fd334..0000000000
--- a/usr/src/lib/libmtmalloc/spec/i386/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# 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.
-#
-# 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"
-#
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmtmalloc/spec/i386/Makefile
-
-.KEEP_STATE:
-
-include	../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS	+=
-
-include	$(SRC)/lib/Makefile.lib
-
-# Uncomment the following if the linker complains
-#i386_C_PICFLAGS  = -K PIC
-
-include	$(SRC)/lib/Makefile.spec
-
-install: $(ROOTABILIB)
diff --git a/usr/src/lib/libmtmalloc/spec/mtmalloc.spec b/usr/src/lib/libmtmalloc/spec/mtmalloc.spec
deleted file mode 100644
index f0e68678a1..0000000000
--- a/usr/src/lib/libmtmalloc/spec/mtmalloc.spec
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright 2005 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, Version 1.0 only
-# (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"
-#
-# lib/libmtmalloc/spec/mtmalloc.spec
-
-function	memalign extends libc/spec/gen.spec memalign
-version		SUNW_1.1
-binding		nodirect
-end		
-
-function	valloc extends libc/spec/gen.spec valloc
-version		SUNW_1.1
-binding		nodirect
-end		
-
-function	free extends libc/spec/gen.spec free
-version		SUNW_1.1
-binding		nodirect
-end		
-
-function	malloc extends libc/spec/gen.spec malloc
-version		SUNW_1.1
-binding		nodirect
-end		
-
-function	realloc extends libc/spec/gen.spec realloc
-version		SUNW_1.1
-binding		nodirect
-end		
-
-function	calloc extends libc/spec/gen.spec calloc
-version		SUNW_1.1.1
-binding		nodirect
-end		
-
-function	mallocctl
-declaration	void mallocctl(int cmd, long value)
-version		SUNW_1.1
-binding		nodirect
-end		
diff --git a/usr/src/lib/libmtmalloc/spec/sparc/Makefile b/usr/src/lib/libmtmalloc/spec/sparc/Makefile
deleted file mode 100644
index 63851270f7..0000000000
--- a/usr/src/lib/libmtmalloc/spec/sparc/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# 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.
-#
-# 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"
-#
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmtmalloc/spec/sparc/Makefile
-
-.KEEP_STATE:
-
-include	../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS	+=
-
-include	$(SRC)/lib/Makefile.lib
-
-# Uncomment the following if the linker complains
-#sparc_C_PICFLAGS  = -K PIC
-
-include	$(SRC)/lib/Makefile.spec
-
-install: $(ROOTABILIB)
diff --git a/usr/src/lib/libmtmalloc/spec/sparcv9/Makefile b/usr/src/lib/libmtmalloc/spec/sparcv9/Makefile
deleted file mode 100644
index f66826636c..0000000000
--- a/usr/src/lib/libmtmalloc/spec/sparcv9/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# 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.
-#
-# 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"
-#
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmtmalloc/spec/sparcv9/Makefile
-
-.KEEP_STATE:
-
-include	../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS	+=
-
-include	$(SRC)/lib/Makefile.lib
-include	$(SRC)/lib/Makefile.lib.64
-
-# Uncomment the following if the linker complains
-#sparcv9_C_PICFLAGS  = -K PIC
-
-include	$(SRC)/lib/Makefile.spec
-
-install: $(ROOTABILIB64)