From: Ben Gras <ben@minix3.org>
Date: Thu, 18 Aug 2011 00:08:38 +0000 (+0000)
Subject: use minix malloc
X-Git-Tag: v3.2.0~345
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/rndc-confgen.html?a=commitdiff_plain;h=e81a0fd9c18aca5b4b3cf77eac18ddce51b978e4;p=minix.git

use minix malloc

	. default jemalloc is not too easy to compile without threads
	  libraries/types
	. non-default malloc has odd virtual address space binge problem
	. switch to ack/minix malloc in old libc for now
---

diff --git a/lib/nbsd_libc/minix-config.inc b/lib/nbsd_libc/minix-config.inc
index 61bb99238..68df0ea59 100644
--- a/lib/nbsd_libc/minix-config.inc
+++ b/lib/nbsd_libc/minix-config.inc
@@ -7,6 +7,7 @@ USE_INET6=no
 
 MKYP=no #requires RPC
 USE_JEMALLOC=no
+USE_MINIXMALLOC=yes
 USE_FORT=no
 USE_LIBTRE=no
 
diff --git a/lib/nbsd_libc/stdlib/Makefile.inc b/lib/nbsd_libc/stdlib/Makefile.inc
index f4d5a9d74..05d8c0a4e 100644
--- a/lib/nbsd_libc/stdlib/Makefile.inc
+++ b/lib/nbsd_libc/stdlib/Makefile.inc
@@ -42,6 +42,11 @@ SRCS+= erand48_ieee754.c
 
 .if (${USE_JEMALLOC} != "no")
 SRCS+=	jemalloc.c
+.elif (${USE_MINIXMALLOC} != "no")
+SRCS+=	\
+	${LIBCDIR}/../libc/stdlib/malloc.c	\
+	${LIBCDIR}/../libc/stdlib/calloc.c	\
+	${LIBCDIR}/../libc/stdlib/malloc-debug.c
 .else
 SRCS+=	malloc.c
 .endif