PSARC 2006/477 malloc library cleanup

6464344 malloc library cleanup

--HG--
rename : usr/src/lib/libmapmalloc/common/mallopt.c => deleted_files/usr/src/lib/libmapmalloc/common/mallopt.c

18 files changed, 97 insertions, 122 deletions

diff --git a/usr/src/lib/libmapmalloc/common/mallopt.c b/deleted_files/usr/src/lib/libmapmalloc/common/mallopt.c
index c6e24c9963..c6e24c9963 100644
--- a/usr/src/lib/libmapmalloc/common/mallopt.c
+++ b/deleted_files/usr/src/lib/libmapmalloc/common/mallopt.c
diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint
index ddc364ac74..1b1afd25c7 100644
--- a/usr/src/Makefile.lint
+++ b/usr/src/Makefile.lint
@@ -293,6 +293,7 @@ COMMON_SUBDIRS = \
 	lib/libadt_jni \
 	lib/libaio \
 	lib/libavl \
+	lib/libbsdmalloc \
 	lib/libbsm \
 	lib/libc \
 	lib/libc_db \
@@ -330,9 +331,11 @@ COMMON_SUBDIRS = \
 	lib/liblm \
 	lib/libmacadm \
 	lib/libmalloc \
+	lib/libmapmalloc \
 	lib/libmapid \
 	lib/libmd \
 	lib/libmp \
+	lib/libmtmalloc \
 	lib/libnsl \
 	lib/libnvpair \
 	lib/libpam \
@@ -377,6 +380,7 @@ COMMON_SUBDIRS = \
 	lib/print \
 	lib/fm \
 	lib/udapl \
+	lib/watchmalloc \
 	psm \
 	ucbcmd/basename \
 	ucbcmd/biff \
diff --git a/usr/src/cmd/vi/misc/ctags.c b/usr/src/cmd/vi/misc/ctags.c
index 86aff67aba..910257d04a 100644
--- a/usr/src/cmd/vi/misc/ctags.c
+++ b/usr/src/cmd/vi/misc/ctags.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -455,8 +455,8 @@ bool	f;		/* f == TRUE when function */
 	if (index(name, ' ') != NULL)
 #endif
 	{
-		(void) strcpy(name, (char *) strtok(name, " "));
-		while (nametk = (char *) strtok(0, " "))
+		(void) strcpy(name, strtok(name, " "));
+		while (nametk = strtok(0, " "))
 			(void) strcat(name, nametk);
 	}
 	np->entry = savestr(name);
@@ -973,11 +973,9 @@ static void
 free_tree(node)
 NODE	*node;
 {
-	extern void cfree();
-
 	while (node) {
 		free_tree(node->right);
-		cfree(node);
+		free(node);
 		node = node->left;
 	}
 }
@@ -1450,14 +1448,14 @@ char **av;			/* ptr to original argument space	*/
 
 	i = mac = fflag = 0;	/* proper initializations */
 
-	mav_sz = (size_t) ((ac + 1) * sizeof (char *));
-	if ((mav = malloc(mav_sz)) == (char **) NULL) {
+	mav_sz = ((ac + 1) * sizeof (char *));
+	if ((mav = malloc(mav_sz)) == (char **)NULL) {
 		perror("Can't malloc argument space");
 		exit(1);
 	}
 
 	/* for each argument, see if we need to change things:		*/
-	for (; (av[i] != (char *) NULL) && (av[i][0] != (char) NULL); i++) {
+	for (; (av[i] != (char *)NULL) && (av[i][0] != (char)NULL); i++) {
 
 		if (strcmp(av[i], "--") == 0) {
 			fflag = 1;	/* just handle filenames now	*/
@@ -1486,15 +1484,15 @@ char **av;			/* ptr to original argument space	*/
 					 */
 					mav_sz += sizeof (char *);
 					if ((mav = realloc(mav, mav_sz)) ==
-					    (char **) NULL) {
+					    (char **)NULL) {
 						perror("Can't realloc "
 							"argument space");
 						exit(1);
 					}
 				}
 
-				if ((mav[mac] = malloc((size_t) CPFLAG)) ==
-				    (char *) NULL) {
+				if ((mav[mac] = malloc((size_t)CPFLAG)) ==
+				    (char *)NULL) {
 					perror("Can't malloc argument space");
 					exit(1);
 				}
@@ -1503,7 +1501,7 @@ char **av;			/* ptr to original argument space	*/
 			}
 		} else {
 			/* otherwise, just copy the argument:		*/
-			if ((mav[mac] = malloc(sz + 1)) == (char *) NULL) {
+			if ((mav[mac] = malloc(sz + 1)) == (char *)NULL) {
 				perror("Can't malloc argument space");
 				exit(1);
 			}
@@ -1512,5 +1510,5 @@ char **av;			/* ptr to original argument space	*/
 		}
 	}
 
-	mav[mac] = (char *) NULL;
+	mav[mac] = (char *)NULL;
 }
diff --git a/usr/src/lib/common/inc/c_synonyms.h b/usr/src/lib/common/inc/c_synonyms.h
index b101e1c918..5d502a4c72 100644
--- a/usr/src/lib/common/inc/c_synonyms.h
+++ b/usr/src/lib/common/inc/c_synonyms.h
@@ -178,7 +178,6 @@ extern "C" {
 #define	catopen				_catopen
 #define	cfgetispeed			_cfgetispeed
 #define	cfgetospeed			_cfgetospeed
-#define	cfree				_cfree
 #define	cfsetispeed			_cfsetispeed
 #define	cfsetospeed			_cfsetospeed
 #define	cftime				_cftime
@@ -465,7 +464,6 @@ extern "C" {
 #define	makecontext			_makecontext
 #define	makeut				_makeut
 #define	makeutx				_makeutx
-#define	memalign			_memalign
 #define	membar_consumer			_membar_consumer
 #define	membar_enter			_membar_enter
 #define	membar_exit			_membar_exit
@@ -975,7 +973,6 @@ extern "C" {
 #define	utmpname			_utmpname
 #define	utmpxname			_utmpxname
 #define	utssys				_utssys
-#define	valloc				_valloc
 #define	vfork				_vfork
 #define	vfscanf				_vfscanf
 #define	vhangup				_vhangup
diff --git a/usr/src/lib/libc/inc/synonyms.h b/usr/src/lib/libc/inc/synonyms.h
index c39c0111fa..3dfd31722f 100644
--- a/usr/src/lib/libc/inc/synonyms.h
+++ b/usr/src/lib/libc/inc/synonyms.h
@@ -215,7 +215,6 @@ extern "C" {
 #define	catopen			_catopen
 #define	cfgetispeed		_cfgetispeed
 #define	cfgetospeed		_cfgetospeed
-#define	cfree			_cfree
 #define	cfsetispeed		_cfsetispeed
 #define	cfsetospeed		_cfsetospeed
 #define	cftime			_cftime
@@ -558,7 +557,6 @@ extern "C" {
 #define	mblen			_mblen
 #define	mbstowcs		_mbstowcs
 #define	mbtowc			_mbtowc
-#define	memalign		_memalign
 #define	membar_consumer		_membar_consumer
 #define	membar_enter		_membar_enter
 #define	membar_exit		_membar_exit
@@ -1116,7 +1114,6 @@ extern "C" {
 #define	utmpname		_utmpname
 #define	utmpxname		_utmpxname
 #define	utssys			_utssys
-#define	valloc			_valloc
 #define	vfork			_vfork
 #define	vfscanf			_vfscanf
 #define	vhangup			_vhangup
diff --git a/usr/src/lib/libc/port/gen/cfree.c b/usr/src/lib/libc/port/gen/cfree.c
index 930aeeb032..a68e2b4b63 100644
--- a/usr/src/lib/libc/port/gen/cfree.c
+++ b/usr/src/lib/libc/port/gen/cfree.c
@@ -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.
@@ -19,8 +18,9 @@
  *
  * 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.
  */
 
@@ -34,12 +34,11 @@
  * cfree - clear memory block
  */
 
-#pragma weak cfree = _cfree
 #include "synonyms.h"
 #include <sys/types.h>
 #include <stdlib.h>
 
-/*ARGSUSED1*/
+/* ARGSUSED1 */
 void
 cfree(void *p, size_t num, size_t size)
 {
diff --git a/usr/src/lib/libc/port/gen/memalign.c b/usr/src/lib/libc/port/gen/memalign.c
index f079f82d3d..482c5e378e 100644
--- a/usr/src/lib/libc/port/gen/memalign.c
+++ b/usr/src/lib/libc/port/gen/memalign.c
@@ -29,8 +29,6 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma weak memalign = _memalign
-
 #include "synonyms.h"
 #include "mallint.h"
 #include "mtlib.h"
diff --git a/usr/src/lib/libc/port/gen/valloc.c b/usr/src/lib/libc/port/gen/valloc.c
index 016c54a1bc..a3986f8310 100644
--- a/usr/src/lib/libc/port/gen/valloc.c
+++ b/usr/src/lib/libc/port/gen/valloc.c
@@ -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.
@@ -19,8 +18,9 @@
  *
  * 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.
  */
 
@@ -30,8 +30,6 @@
 /*	  All Rights Reserved  	*/
 
 
-#pragma weak valloc = _valloc
-
 #include "synonyms.h"
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers
index 6b5e1b38be..35015ff874 100644
--- a/usr/src/lib/libc/port/mapfile-vers
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -1376,7 +1376,6 @@ SUNWprivate_1.1 {
 	__btowc_euc;
 	__btowc_sb;
 	_bufsync;
-	_cfree;
 	cfree = NODIRECT;
 	_cftime;
 	__charmap_init;
@@ -1676,7 +1675,6 @@ SUNWprivate_1.1 {
 	__mbtowc_euc;
 	__mbtowc_sb;
 	mcfiller;
-	_memalign;
 	_membar_consumer;
 	_membar_enter;
 	_membar_exit;
@@ -2141,7 +2139,6 @@ SUNWprivate_1.1 {
 	_utmpxname;
 	utssys;
 	_utssys;
-	_valloc;
 	_vfork;
 	_vhangup;
 	_vsyslog;
diff --git a/usr/src/lib/libmalloc/common/malloc.c b/usr/src/lib/libmalloc/common/malloc.c
index 748e7d8424..a1feccb36d 100644
--- a/usr/src/lib/libmalloc/common/malloc.c
+++ b/usr/src/lib/libmalloc/common/malloc.c
@@ -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.
@@ -19,23 +18,17 @@
  *
  * CDDL HEADER END
  */
+
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma weak mallopt = _mallopt
-#pragma weak mallinfo = _mallinfo
-#pragma weak cfree = _cfree
-#pragma weak memalign = _memalign
-#pragma weak valloc = _valloc
-
 #include <sys/types.h>
 
 #ifndef debug
@@ -202,7 +195,7 @@ malloc(size_t nbytes)
  * ascii art below).
  */
 void *
-_memalign(size_t alignment, size_t size)
+memalign(size_t alignment, size_t size)
 {
 	void *alloc_buf;
 	struct header *hd;
@@ -296,7 +289,7 @@ _memalign(size_t alignment, size_t size)
 }
 
 void *
-_valloc(size_t size)
+valloc(size_t size)
 {
 	static unsigned pagesize;
 	if (size == 0)
@@ -896,7 +889,7 @@ calloc(size_t num, size_t size)
  */
 
 int
-_mallopt(int cmd, int value)
+mallopt(int cmd, int value)
 {
 	/* disallow changes once a small block is allocated */
 	(void) mutex_lock(&mlock);
@@ -959,7 +952,7 @@ _mallopt(int cmd, int value)
  */
 
 struct mallinfo
-_mallinfo(void)
+mallinfo(void)
 {
 	struct header *blk, *next;	/* ptr to ordinary blocks */
 	struct holdblk *hblk;		/* ptr to holding blocks */
@@ -1171,9 +1164,9 @@ rstalloc(void)
  * cfree is an undocumented, obsolete function
  */
 
-/* ARGSUSED */
+/* ARGSUSED1 */
 void
-_cfree(char *p, unsigned num, unsigned size)
+cfree(void *p, size_t num, size_t size)
 {
 	free(p);
 }
diff --git a/usr/src/lib/libmalloc/common/mapfile-vers b/usr/src/lib/libmalloc/common/mapfile-vers
index b5df955077..659334464e 100644
--- a/usr/src/lib/libmalloc/common/mapfile-vers
+++ b/usr/src/lib/libmalloc/common/mapfile-vers
@@ -35,20 +35,16 @@ SUNW_1.1 {
     global:
 	calloc = NODIRECT;
 	cfree = NODIRECT;
-	_cfree = NODIRECT;
 	free = NODIRECT;
 	mallinfo = NODIRECT;
-	_mallinfo = NODIRECT;
 	malloc = NODIRECT;
 	mallopt = NODIRECT;
-	_mallopt = NODIRECT;
 	realloc = NODIRECT;
 };
 
 SUNWprivate_1.1 {
     global:
-	_memalign = NODIRECT;
-	_valloc = NODIRECT;
+	SUNWprivate_1.1;
     local:
 	*;
 };
diff --git a/usr/src/lib/libmapmalloc/Makefile.com b/usr/src/lib/libmapmalloc/Makefile.com
index a25eceaf54..6f7accfe2a 100644
--- a/usr/src/lib/libmapmalloc/Makefile.com
+++ b/usr/src/lib/libmapmalloc/Makefile.com
@@ -31,7 +31,6 @@ VERS=		.1
 OBJECTS=  \
 	calloc.o \
 	malloc_debug.o \
-	mallopt.o \
 	textmem.o \
 	valloc.o
 
@@ -49,6 +48,9 @@ CPPFLAGS +=	-D_REENTRANT
 DYNFLAGS +=	$(ZINTERPOSE)
 LDLIBS +=	-lc
 
+$(LINTLIB) lint :=	LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+$(LINTLIB) lint :=	LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
+
 .KEEP_STATE:
 
 lint: lintcheck
diff --git a/usr/src/lib/libmapmalloc/common/mapfile-vers b/usr/src/lib/libmapmalloc/common/mapfile-vers
index 96815ef28d..ff69913f14 100644
--- a/usr/src/lib/libmapmalloc/common/mapfile-vers
+++ b/usr/src/lib/libmapmalloc/common/mapfile-vers
@@ -39,9 +39,7 @@ SUNW_0.7 {
 	calloc = NODIRECT;
 	cfree = NODIRECT;
 	free = NODIRECT;
-	mallinfo = NODIRECT;
 	malloc = NODIRECT;
-	mallopt = NODIRECT;
 	memalign = NODIRECT;
 	realloc = NODIRECT;
 	valloc = NODIRECT;
@@ -49,7 +47,7 @@ SUNW_0.7 {
 
 SUNWprivate_1.1 {
     global:
-	__mallinfo = NODIRECT;
+	SUNWprivate_1.1;
     local:
 	*;
 };
diff --git a/usr/src/lib/libmtmalloc/Makefile.com b/usr/src/lib/libmtmalloc/Makefile.com
index ee55f6c0cb..de0ddc17de 100644
--- a/usr/src/lib/libmtmalloc/Makefile.com
+++ b/usr/src/lib/libmtmalloc/Makefile.com
@@ -41,7 +41,10 @@ LIBS 		 = $(DYNLIB) $(LINTLIB)
 LDLIBS 		+= -lc
 CFLAGS 		+= $(CCVERBOSE) $(C_PICFLAGS)
 CPPFLAGS	+= -I../common -D_REENTRANT
-DYNFLAGS 	+= $(ZNODLOPEN) $(ZINTERPOSE)
+DYNFLAGS 	+= $(ZINTERPOSE)
+
+$(LINTLIB) lint :=	LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+$(LINTLIB) lint :=	LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/watchmalloc/common/mallint.h b/usr/src/lib/watchmalloc/common/mallint.h
index fcd64bc896..4d9b309135 100644
--- a/usr/src/lib/watchmalloc/common/mallint.h
+++ b/usr/src/lib/watchmalloc/common/mallint.h
@@ -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.
@@ -19,15 +18,15 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright (c) 1996-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
 #pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.2	*/
 
 #ifndef	_REENTRANT
@@ -42,7 +41,6 @@
 #include <memory.h>
 #include <thread.h>
 #include <synch.h>
-#include <malloc.h>
 #include <procfs.h>
 #include <limits.h>
 #include <sys/types.h>
diff --git a/usr/src/lib/watchmalloc/common/malloc.c b/usr/src/lib/watchmalloc/common/malloc.c
index ff0a4a8469..2e7dfbadbd 100644
--- a/usr/src/lib/watchmalloc/common/malloc.c
+++ b/usr/src/lib/watchmalloc/common/malloc.c
@@ -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.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -1111,14 +1110,12 @@ free_unlocked(void *old)
  *		if the requested memory could not be allocated.
  */
 
-#pragma weak memalign = _memalign
-
 #define	misaligned(p)		((unsigned)(p) & 3)
 		/* 4-byte "word" alignment is considered ok in LP64 */
 #define	nextblk(p, size)	((TREE *)((char *)(p) + (size)))
 
 void *
-_memalign(size_t align, size_t nbytes)
+memalign(size_t align, size_t nbytes)
 {
 	size_t	reqsize;	/* Num of bytes to get from malloc() */
 	TREE	*p;		/* Ptr returned from malloc() */
@@ -1249,10 +1246,8 @@ _memalign(size_t align, size_t nbytes)
 	return (DATA(aligned_blk));
 }
 
-#pragma weak valloc = _valloc
-
 void *
-_valloc(size_t size)
+valloc(size_t size)
 {
 	static unsigned pagesize;
 	if (!pagesize)
@@ -1260,9 +1255,6 @@ _valloc(size_t size)
 	return (memalign(pagesize, size));
 }
 
-/*
- * libc does not define a weak calloc as _calloc
- */
 void *
 calloc(size_t num, size_t size)
 {
@@ -1281,43 +1273,13 @@ calloc(size_t num, size_t size)
 	return (mp);
 }
 
-#pragma weak cfree = _cfree
-
 /* ARGSUSED1 */
 void
-_cfree(void *p, size_t num, size_t size)
+cfree(void *p, size_t num, size_t size)
 {
 	free(p);
 }
 
-/*
- * mallopt -- Do nothing
- */
-
-#pragma weak mallopt = _mallopt
-
-/* ARGSUSED */
-int
-_mallopt(int cmd, int value)
-{
-	return (0);
-}
-
-/*
- * mallinfo -- Do nothing
- */
-
-#pragma weak mallinfo = _mallinfo
-
-struct mallinfo
-_mallinfo()
-{
-	static struct mallinfo __mallinfo;
-
-	return (__mallinfo);
-}
-
-
 typedef struct {
 	long cmd;
 	prwatch_t prwatch;
diff --git a/usr/src/lib/watchmalloc/common/mapfile-vers b/usr/src/lib/watchmalloc/common/mapfile-vers
index 0097c20482..a40f8bea88 100644
--- a/usr/src/lib/watchmalloc/common/mapfile-vers
+++ b/usr/src/lib/watchmalloc/common/mapfile-vers
@@ -29,18 +29,11 @@ SUNW_1.1 {
     global:
 	calloc = NODIRECT;
 	cfree = NODIRECT;
-	_cfree = NODIRECT;
 	free = NODIRECT;
-	mallinfo = NODIRECT;
-	_mallinfo = NODIRECT;
 	malloc = NODIRECT;
-	mallopt = NODIRECT;
-	_mallopt = NODIRECT;
 	memalign = NODIRECT;
-	_memalign = NODIRECT;
 	realloc = NODIRECT;
 	valloc = NODIRECT;
-	_valloc = NODIRECT;
 };
 
 SUNWprivate_1.1 {
diff --git a/usr/src/tools/abi/etc/exceptions b/usr/src/tools/abi/etc/exceptions
index 6930910eef..c7a4b6c726 100644
--- a/usr/src/tools/abi/etc/exceptions
+++ b/usr/src/tools/abi/etc/exceptions
@@ -93,6 +93,42 @@ PSARC 2003/371: RULE E3: lib/sparcv9/libadm.so.1: asysmem
 PSARC 2003/371: RULE E3: lib/sparcv9/libadm.so.1: sysmem
 PSARC 2002/506: RULE E3: lib/libdevinfo.so.1: di_minor_class
 PSARC 2002/506: RULE E3: lib/sparcv9/libdevinfo.so.1: di_minor_class
+PSARC 2006/477: RULE E3: usr/lib/libmalloc.so.1: _cfree
+PSARC 2006/477: RULE E3: usr/lib/libmalloc.so.1: _mallinfo
+PSARC 2006/477: RULE E3: usr/lib/libmalloc.so.1: _mallopt
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/libmalloc.so.1: _cfree
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/libmalloc.so.1: _mallinfo
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/libmalloc.so.1: _mallopt
+PSARC 2006/477: RULE E3: usr/lib/amd64/libmalloc.so.1: _cfree
+PSARC 2006/477: RULE E3: usr/lib/amd64/libmalloc.so.1: _mallinfo
+PSARC 2006/477: RULE E3: usr/lib/amd64/libmalloc.so.1: _mallopt
+PSARC 2006/477: RULE E3: usr/lib/libmapmalloc.so.1: mallinfo
+PSARC 2006/477: RULE E3: usr/lib/libmapmalloc.so.1: mallopt
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/libmapmalloc.so.1: mallinfo
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/libmapmalloc.so.1: mallopt
+PSARC 2006/477: RULE E3: usr/lib/amd64/libmapmalloc.so.1: mallinfo
+PSARC 2006/477: RULE E3: usr/lib/amd64/libmapmalloc.so.1: mallopt
+PSARC 2006/477: RULE E3: usr/lib/watchmalloc.so.1: _cfree
+PSARC 2006/477: RULE E3: usr/lib/watchmalloc.so.1: mallinfo
+PSARC 2006/477: RULE E3: usr/lib/watchmalloc.so.1: _mallinfo
+PSARC 2006/477: RULE E3: usr/lib/watchmalloc.so.1: mallopt
+PSARC 2006/477: RULE E3: usr/lib/watchmalloc.so.1: _mallopt
+PSARC 2006/477: RULE E3: usr/lib/watchmalloc.so.1: _memalign
+PSARC 2006/477: RULE E3: usr/lib/watchmalloc.so.1: _valloc
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/watchmalloc.so.1: _cfree
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/watchmalloc.so.1: mallinfo
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/watchmalloc.so.1: _mallinfo
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/watchmalloc.so.1: mallopt
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/watchmalloc.so.1: _mallopt
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/watchmalloc.so.1: _memalign
+PSARC 2006/477: RULE E3: usr/lib/sparcv9/watchmalloc.so.1: _valloc
+PSARC 2006/477: RULE E3: usr/lib/amd64/watchmalloc.so.1: _cfree
+PSARC 2006/477: RULE E3: usr/lib/amd64/watchmalloc.so.1: mallinfo
+PSARC 2006/477: RULE E3: usr/lib/amd64/watchmalloc.so.1: _mallinfo
+PSARC 2006/477: RULE E3: usr/lib/amd64/watchmalloc.so.1: mallopt
+PSARC 2006/477: RULE E3: usr/lib/amd64/watchmalloc.so.1: _mallopt
+PSARC 2006/477: RULE E3: usr/lib/amd64/watchmalloc.so.1: _memalign
+PSARC 2006/477: RULE E3: usr/lib/amd64/watchmalloc.so.1: _valloc
 
 #############################################
 # ERRORs exempted from RULE E4 (See RULES section of intf_check manpage) 
@@ -714,6 +750,12 @@ PSARC 2002/506: RULE W5: lib/libdevinfo.so.1: SUNW_1.2
 PSARC 2002/506: RULE W5: lib/sparcv9/libdevinfo.so.1: SUNW_1.2
 PSARC 2004/619: RULE W5: lib/amd64/libdevinfo.so.1: SUNW_1.2
 6442910: RULE W5: usr/lib/libpapi.so.0: FSG_1.0
+PSARC 2006/477: RULE W5: usr/lib/libmalloc.so.1: SUNWprivate_1.1
+PSARC 2006/477: RULE W5: usr/lib/sparcv9/libmalloc.so.1: SUNWprivate_1.1
+PSARC 2006/477: RULE W5: usr/lib/amd64/libmalloc.so.1: SUNWprivate_1.1
+PSARC 2006/477: RULE W5: usr/lib/libmapmalloc.so.1: SUNWprivate_1.1
+PSARC 2006/477: RULE W5: usr/lib/sparcv9/libmapmalloc.so.1: SUNWprivate_1.1
+PSARC 2006/477: RULE W5: usr/lib/amd64/libmapmalloc.so.1: SUNWprivate_1.1
 
 #############################################
 # WARNINGs exempted from RULE W6 (See RULES section of intf_check manpage)