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 61bb99238e7eab33699b42abae07576140aca27c..68df0ea591536021ff9e5fc198993669b2ad66e1 100644 (file)
--- 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 f4d5a9d746d7ccdf963502074d439de95bedaf45..05d8c0a4e9594a55e93a85d2ba46fc6ae40f3560 100644 (file)
--- 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