summaryrefslogtreecommitdiff
path: root/src/kernel/Makefile
diff options
context:
space:
mode:
authorAlex AUVOLAT <alexis211@gmail.com>2012-05-01 14:55:18 +0200
committerAlex AUVOLAT <alexis211@gmail.com>2012-05-01 14:55:18 +0200
commite8cf65c07d78e3cfbac953b1b97c51998a5900df (patch)
tree7b75741a1d38b5da1ee79e877709b6b4723c4713 /src/kernel/Makefile
parent5cac9acd3aedc8043d4272d93c56805c46ff6214 (diff)
downloadTCE-e8cf65c07d78e3cfbac953b1b97c51998a5900df.tar.gz
TCE-e8cf65c07d78e3cfbac953b1b97c51998a5900df.zip
Now using Doug Lea's malloc in kernel land. Next: same in userland.
Diffstat (limited to 'src/kernel/Makefile')
-rw-r--r--src/kernel/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/Makefile b/src/kernel/Makefile
index 53cfc31..0950ba7 100644
--- a/src/kernel/Makefile
+++ b/src/kernel/Makefile
@@ -2,8 +2,8 @@ Out = kernel.elf
Obj = core/loader_.o core/kmain.o core/sys.o core/test.o \
core/monitor.o task/timer.o \
task/idt.o task/idt_.o task/task.o task/task_.o task/syscall.o task/sched.o \
- lib/bitset.o lib/mutex.o \
- mem/mem.o mem/paging.o mem/gdt.o mem/heap.o mem/seg.o \
+ lib/bitset.o lib/mutex.o lib/std.o \
+ mem/mem.o mem/paging.o mem/gdt.o mem/_dlmalloc.o mem/seg.o \
linker/elf.o
ExtObj = $(SrcPath)/common/_common.o