From 2c53feedb1ce4f72736edc8e9a748bc603ec10c1 Mon Sep 17 00:00:00 2001
From: Bora Sahin <bora.sahin@b-labs.co.uk>
Date: Thu, 22 Oct 2009 15:27:59 +0300
Subject: [PATCH] malloc is carried from POSIX to libmem/malloc.

This malloc is a very simple first-fit sort of allocator. Now, it builds
without any problem but because we havent fixed include paths and added
it to the referenced libraries in the posix container yet, POSIX doesnt
build. So take it with caution.
(cherry picked from commit 65523743e86268eddd3bd2aab58476003f71c2c2)
---
 SConstruct.userlibs                                     | 3 ++-
 conts/libmem/SConscript                                 | 4 +++-
 conts/{posix/mm0/lib => libmem/malloc}/malloc.c         | 0
 conts/{posix/mm0/include/lib => libmem/malloc}/malloc.h | 0
 4 files changed, 5 insertions(+), 2 deletions(-)
 rename conts/{posix/mm0/lib => libmem/malloc}/malloc.c (100%)
 rename conts/{posix/mm0/include/lib => libmem/malloc}/malloc.h (100%)

diff --git a/SConstruct.userlibs b/SConstruct.userlibs
index 9591629..9a97f62 100644
--- a/SConstruct.userlibs
+++ b/SConstruct.userlibs
@@ -37,7 +37,7 @@ libc = SConscript('conts/libc/SConscript', \
                   duplicate = 0, variant_dir = \
                   join(BUILDDIR, os.path.relpath('conts/libc', PROJROOT)))
 
-libmm, libmc = SConscript('conts/libmem/SConscript', \
+libmm, libmc, libmalloc = SConscript('conts/libmem/SConscript', \
                          exports = { 'env' : env, 'arch' : arch, 'platform' : platform }, \
                          duplicate = 0, variant_dir = \
                          join(BUILDDIR, os.path.relpath('conts/libmem', PROJROOT)))
@@ -47,3 +47,4 @@ Alias('libl4', libl4)
 Alias('libc', libc)
 Alias('libmm', libmm)
 Alias('libmc', libmc)
+Alias('libmalloc', libmalloc)
diff --git a/conts/libmem/SConscript b/conts/libmem/SConscript
index aa07c9a..3c755e9 100644
--- a/conts/libmem/SConscript
+++ b/conts/libmem/SConscript
@@ -28,7 +28,9 @@ env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
 
 objmm = env.StaticObject(Glob('mm/*.c'))
 objmc = env.StaticObject(Glob('memcache/*.[cS]'))
+objmalloc = env.StaticObject(Glob('malloc/*.[cS]'))
 libmm = env.StaticLibrary('mm', objmm)
 libmc = env.StaticLibrary('mc', objmc)
+libmalloc = env.StaticLibrary('malloc', objmalloc)
 
-Return('libmm', 'libmc')
+Return('libmm', 'libmc', 'libmalloc')
diff --git a/conts/posix/mm0/lib/malloc.c b/conts/libmem/malloc/malloc.c
similarity index 100%
rename from conts/posix/mm0/lib/malloc.c
rename to conts/libmem/malloc/malloc.c
diff --git a/conts/posix/mm0/include/lib/malloc.h b/conts/libmem/malloc/malloc.h
similarity index 100%
rename from conts/posix/mm0/include/lib/malloc.h
rename to conts/libmem/malloc/malloc.h