diff options
Diffstat (limited to 'libc/stdlib/malloc')
| -rw-r--r-- | libc/stdlib/malloc/Makefile | 61 | ||||
| -rw-r--r-- | libc/stdlib/malloc/calloc.c | 2 | ||||
| -rw-r--r-- | libc/stdlib/malloc/realloc.c | 2 |
3 files changed, 10 insertions, 55 deletions
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile index e4a6f3a43..4a8f4a072 100644 --- a/libc/stdlib/malloc/Makefile +++ b/libc/stdlib/malloc/Makefile @@ -1,58 +1,13 @@ # Makefile for uClibc # -# Copyright (C) 2002,03 NEC Electronics Corporation -# Copyright (C) 2002,03 Miles Bader <miles@gnu.org> +# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> # -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU Library General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) any -# later version. +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more -# details. -# -# You should have received a copy of the GNU Library General Public License -# along with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Derived in part from the Linux-8086 C library, the GNU C Library, and several -# other sundry sources. Files within this library are copyright by their -# respective copyright holders. - -TOPDIR=../../../ -include $(TOPDIR)Rules.mak - -CSRC = malloc.c calloc.c free.c realloc.c memalign.c \ - heap_alloc.c heap_alloc_at.c heap_free.c - -# Turn on malloc debugging if requested -ifeq ($(UCLIBC_MALLOC_DEBUGGING),y) -CSRC += malloc_debug.c heap_debug.c -CFLAGS += -DMALLOC_DEBUGGING -DHEAP_DEBUGGING -ifeq ($(UCLIBC_UCLINUX_BROKEN_MUNMAP),y) -CFLAGS += -DMALLOC_MMB_DEBUGGING -endif -endif - -COBJS=$(patsubst %.c,%.o, $(CSRC)) -OBJS=$(COBJS) - -OBJ_LIST=../../obj.stdlib.malloc - -all: $(OBJ_LIST) - -$(OBJ_LIST): $(OBJS) - echo $(patsubst %, stdlib/malloc/%, $(OBJS)) > $(OBJ_LIST) - -malloc.o free.o realloc.o memalign.o: malloc.h -$(COBJS): heap.h - -# Depend on uClinux_config.h to cache changes in __UCLIBC_MALLOC_DEBUGGING__ -$(COBJS): %.o : %.c ../../../include/bits/uClibc_config.h - $(CC) $(CFLAGS) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o -clean: - $(RM) *.[oa] *~ core +top_srcdir=../../../ +top_builddir=../../../ +all: objs +include $(top_builddir)Rules.mak +include Makefile.in +include $(top_srcdir)Makerules diff --git a/libc/stdlib/malloc/calloc.c b/libc/stdlib/malloc/calloc.c index 15281a97f..94031ce29 100644 --- a/libc/stdlib/malloc/calloc.c +++ b/libc/stdlib/malloc/calloc.c @@ -34,7 +34,7 @@ void * calloc(size_t nmemb, size_t lsize) return NULL; } if ((result=malloc(size)) != NULL) { - memset(result, 0, size); + __memset(result, 0, size); } return result; } diff --git a/libc/stdlib/malloc/realloc.c b/libc/stdlib/malloc/realloc.c index 85392ae6a..8dcc35360 100644 --- a/libc/stdlib/malloc/realloc.c +++ b/libc/stdlib/malloc/realloc.c @@ -66,7 +66,7 @@ realloc (void *mem, size_t new_size) void *new_mem = malloc (new_size - MALLOC_HEADER_SIZE); if (new_mem) { - memcpy (new_mem, mem, size - MALLOC_HEADER_SIZE); + __memcpy (new_mem, mem, size - MALLOC_HEADER_SIZE); free (mem); } mem = new_mem; |