malloc build fixes

diff --git a/lib/libc/ansi/malloc-debug.c b/lib/libc/ansi/malloc-debug.c
index 2a32bbfd45f99c2ec3237fda09086c555911d557..c14717809e7fa338f9980bd45fc2e4bc203f0454 100644 (file)
--- a/lib/libc/ansi/malloc-debug.c
+++ b/lib/libc/ansi/malloc-debug.c
@@ -126,7 +126,11 @@ static struct block *block_alloc(size_t size)
        assert(ptr_min < ptr_max);
 
        /* select address at random */
+#ifdef __NBSD_LIBC
+       tsc = 0;
+#else
        read_tsc_64(&tsc);
+#endif
        totalsize = block_get_totalsize(size);
        page_index_max = (ptr_max - ptr_min - totalsize) / PAGE_SIZE;
        page_index = (page_index_max > 0) ? (ex64lo(tsc) % page_index_max) : 0;

diff --git a/lib/nbsd_libc/stdlib/Makefile.inc b/lib/nbsd_libc/stdlib/Makefile.inc
index 05d8c0a4e9594a55e93a85d2ba46fc6ae40f3560..f1abd7b2f30d46d4a02ec3f7f7c10de5922e7624 100644 (file)
--- a/lib/nbsd_libc/stdlib/Makefile.inc
+++ b/lib/nbsd_libc/stdlib/Makefile.inc
@@ -44,9 +44,9 @@ SRCS+= erand48_ieee754.c
 SRCS+= jemalloc.c
 .elif (${USE_MINIXMALLOC} != "no")
 SRCS+= \
-       ${LIBCDIR}/../libc/stdlib/malloc.c      \
-       ${LIBCDIR}/../libc/stdlib/calloc.c      \
-       ${LIBCDIR}/../libc/stdlib/malloc-debug.c
+       ${LIBCDIR}/../libc/ansi/malloc.c        \
+       ${LIBCDIR}/../libc/ansi/calloc.c        \
+       ${LIBCDIR}/../libc/ansi/malloc-debug.c
 .else
 SRCS+= malloc.c
 .endif