POSIX now uses libmem/malloc instead of the built-in one.

(cherry picked from commit 48adbffa6514755385af842f1fe8ca5068229eea)

conts/posix/SConstruct

@@ -51,7 +51,7 @@ env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
            		  ASFLAGS = ['-D__ASSEMBLY__'],
            		  PROGSUFFIX = '.elf',
            		  ENV = {'PATH' : os.environ['PATH']},
-           		  LIBS = ['gcc', 'libl4', 'c-userspace', 'libmm', 'libmc', 'gcc'],
+           		  LIBS = ['gcc', 'libl4', 'c-userspace', 'libmm', 'libmc', 'libmalloc', 'gcc'],
                   CPPPATH = ['include', LIBC_INCLUDE, KERNEL_INCLUDE, LIBL4_INCLUDE, LIBMEM_INCLUDE],
                   LIBPATH = [LIBC_LIBPATH, LIBL4_LIBPATH, LIBMEM_LIBPATH, LIBPOSIX_LIBPATH],
           		  CPPFLAGS = '-include l4/config.h -include l4/macros.h -include l4/types.h')

conts/posix/mm0/fs/memfs/vnode.c

@@ -10,7 +10,7 @@
 #include <l4/lib/list.h>
 #include <l4/api/errno.h>
 #include <l4/macros.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <stdio.h>
 
 

conts/posix/mm0/fs/path.c

@@ -7,7 +7,7 @@
 #include <l4/lib/list.h>
 #include <l4/api/errno.h>
 #include <lib/pathstr.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <path.h>
 #include <stdio.h>
 #include <fs.h>

conts/posix/mm0/include/vfs.h

@@ -2,7 +2,7 @@
 #define __VFS_H__
 
 #include <fs.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <l4/lib/list.h>
 #include <memfs/memfs.h>
 #include <l4/macros.h>

conts/posix/mm0/lib/idpool.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2007 Bahadir Balban
  */
 #include <lib/idpool.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <l4/macros.h>
 #include INC_GLUE(memory.h)
 #include <stdio.h>

conts/posix/mm0/mm/capability.c

@@ -10,5 +10,5 @@
 #include <l4/api/capability.h>
 #include <l4lib/arch/syscalls.h>
 #include <l4/generic/cap-types.h>	/* TODO: Move this to API */
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 

conts/posix/mm0/mm/dev.c

@@ -3,7 +3,7 @@
  */
 #include <l4/lib/list.h>
 #include <vm_area.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <fs.h>
 
 /*

conts/posix/mm0/mm/execve.c

@@ -9,7 +9,7 @@
 #include <l4lib/types.h>
 #include <l4/macros.h>
 #include <l4/api/errno.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <vm_area.h>
 #include <syscalls.h>
 #include <string.h>

conts/posix/mm0/mm/exit.c

@@ -15,7 +15,7 @@
 #include <l4lib/arch/syscalls.h>
 #include <l4lib/exregs.h>
 #include <l4lib/ipcdefs.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <l4/api/space.h>
 
 

conts/posix/mm0/mm/fault.c

@@ -6,7 +6,7 @@
 #include <vm_area.h>
 #include <task.h>
 #include <mm/alloc_page.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <l4lib/arch/syscalls.h>
 #include <l4lib/arch/syslib.h>
 #include INC_GLUE(memory.h)

conts/posix/mm0/mm/file.c

@@ -5,7 +5,7 @@
  */
 #include <init.h>
 #include <vm_area.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <mm/alloc_page.h>
 #include <l4/macros.h>
 #include <l4/api/errno.h>
@@ -22,7 +22,7 @@
 #include <test.h>
 
 #include <lib/pathstr.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <stdio.h>
 #include <task.h>
 #include <stat.h>

conts/posix/mm0/mm/init.c

@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <mm/alloc_page.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <lib/bit.h>
 
 #include <task.h>

conts/posix/mm0/mm/mmap.c

@@ -5,7 +5,7 @@
  */
 #include <l4/lib/math.h>
 #include <vm_area.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include INC_API(errno.h)
 #include <posix/sys/types.h>
 #include <l4lib/arch/syscalls.h>

conts/posix/mm0/mm/munmap.c

@@ -9,7 +9,7 @@
 #include <l4/lib/math.h>
 #include <l4lib/arch/syslib.h>
 #include <vm_area.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 
 /* This splits a vma, splitter region must be in the *middle* of original vma */
 int vma_split(struct vm_area *vma, struct tcb *task,

conts/posix/mm0/mm/pagers.c

@@ -5,7 +5,7 @@
 #include <l4/lib/list.h>
 #include <l4lib/arch/syscalls.h>
 #include <l4lib/arch/syslib.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <mm/alloc_page.h>
 #include <vm_area.h>
 #include <string.h>

conts/posix/mm0/mm/shm.c

@@ -10,7 +10,7 @@
 #include <memory.h>
 #include <vm_area.h>
 #include <globals.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <l4lib/arch/syscalls.h>
 #include <l4lib/arch/syslib.h>
 #include <lib/idpool.h>

conts/posix/mm0/mm/task.c

@@ -20,7 +20,7 @@
 #include <l4lib/exregs.h>
 
 #include <lib/addr.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 
 #include <init.h>
 #include <string.h>

conts/posix/mm0/mm/user.c

@@ -8,7 +8,7 @@
 #include <task.h>
 #include <user.h>
 #include <l4/api/errno.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 
 /*
  * Checks if the given user virtual address range is

conts/posix/mm0/mm/utcb.c

@@ -8,7 +8,7 @@
 #include INC_GLUE(memlayout.h)
 #include <mmap.h>
 #include <utcb.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <vm_area.h>
 #include <memory.h>
 

conts/posix/mm0/mm/vm_object.c

@@ -7,7 +7,7 @@
 #include <vm_area.h>
 #include <l4/macros.h>
 #include <l4/api/errno.h>
-#include <lib/malloc.h>
+#include <malloc/malloc.h>
 #include <globals.h>
 
 /* Global list of all in-memory files on the system */