diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2002-09-04 20:12:44 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2002-09-04 20:12:44 +0000 |
commit | b7f893cc42716cf360d0ac23ed7bf3d44c1251dc (patch) | |
tree | 38baaac980ac421386d1b44c9f55e341d8120cc0 | |
parent | 4d810f5f42af19d7557af38f0ae02e70479ff0b6 (diff) |
Per discussions with Erik, 'valloc.c' should be built on top of whichever
memory allocator you choose. Unfortunately, the 'malloc-930716' needs a
fair amount of work before it is functional. For now, changes have been
made to add the 'valloc' call and it works properly with the plain 'malloc'
allocator.
-rw-r--r-- | libc/stdlib/Makefile | 3 | ||||
-rw-r--r-- | libc/stdlib/malloc-930716/Makefile | 2 | ||||
-rw-r--r-- | libc/stdlib/valloc.c (renamed from libc/stdlib/malloc-930716/valloc.c) | 0 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile index 91a855f6f..14ac93f51 100644 --- a/libc/stdlib/Makefile +++ b/libc/stdlib/Makefile @@ -46,7 +46,8 @@ CSRC = abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c mkstemp64.c \ getpt.c ptsname.c grantpt.c unlockpt.c gcvt.c drand48.c \ drand48-iter.c drand48_r.c erand48.c erand48_r.c jrand48.c \ jrand48_r.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c \ - nrand48.c nrand48_r.c rand_r.c srand48.c srand48_r.c calloc.c + nrand48.c nrand48_r.c rand_r.c srand48.c srand48_r.c calloc.c \ + valloc.c ifeq ($(HAS_FLOATING_POINT),true) CSRC += strtod.c strtof.c strtold.c endif diff --git a/libc/stdlib/malloc-930716/Makefile b/libc/stdlib/malloc-930716/Makefile index 2e3ee21a7..cc746707e 100644 --- a/libc/stdlib/malloc-930716/Makefile +++ b/libc/stdlib/malloc-930716/Makefile @@ -25,7 +25,7 @@ TOPDIR=../../../ include $(TOPDIR)Rules.mak # calloc.c can be found at uClibc/libc/stdlib/calloc.c -CSRC=malloc.c valloc.c +CSRC=malloc.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) diff --git a/libc/stdlib/malloc-930716/valloc.c b/libc/stdlib/valloc.c index bfb9efd2a..bfb9efd2a 100644 --- a/libc/stdlib/malloc-930716/valloc.c +++ b/libc/stdlib/valloc.c |