libc - MFC dmalloc -> nmalloc for 3.2-REL x86-64
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 28 Mar 2013 06:04:40 +0000 (23:04 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 28 Mar 2013 06:04:40 +0000 (23:04 -0700)
* MFC dmalloc -> nmalloc for 3.2-REL x86-64

* We should be using nmalloc here anyway.  This also conveniently fixes
  a mutual initialization dependency between pthreads and dmalloc
  (adjusting the constructor priority doesn't help).

Reported-by: Sven Gaerner <sgaerner@gmx.net>
lib/libc/stdlib/Makefile.inc

index 3752d23..1dd4505 100644 (file)
@@ -15,11 +15,7 @@ MISRCS+=a64l.c abort.c abs.c atexit.c aligned_alloc.c \
        strtol.c strtoll.c strtonum.c strtoq.c strtoul.c strtoull.c \
        strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c
 
-.if ${MACHINE_ARCH} == "x86_64"
-MISRCS+= dmalloc.c
-.else
 MISRCS+= nmalloc.c
-.endif
 
 # machine-dependent stdlib sources
 .if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc)