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