[Coremu-list-devel] Lockfree queue

[Antti P M. <an...@ik...>]

Seems that --use-lockfree does not really enable lockfree queue. This
is for the coremu git tree.

diff --git a/Makefile b/Makefile
index 3e45d58..a5dbbf1 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@
 all:
 
 include config.mk
+include coremu.mk
 include $(addsuffix /module.mk, $(modules))
 
 objects += $(patsubst %.c, $(OBJDIR)/%.o, $(foreach dir, $(modules), $(wildcard $(dir)/*.c)))
@@ -30,7 +31,7 @@ LIBOBJS += $(OBJDIR)/main/sched.o
 LIBOBJS += $(OBJDIR)/main/timer.o
 LIBOBJS += $(OBJDIR)/main/intr.o
 LIBOBJS += $(OBJDIR)/main/malloc-helper.o
-ifdef $(LOCKFREE)
+ifdef LOCKFREE
 	LIBOBJS += $(OBJDIR)/main/ms-queue.o
 else
 	LIBOBJS += $(OBJDIR)/main/lock-queue.o
@@ -39,7 +40,7 @@ LIBOBJS += $(OBJDIR)/main/utils.o
 
 $(OBJDIR)/libcoremu.a: $(LIBOBJS)
 	$(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"  AR    $(TARGET_DIR)$@")
-qemu:
+qemu: $(OBJDIR)/libcoremu.a
 	@echo "---- [coremu]: build qemu ----"
 	$(MAKE) -C $(COREMUDIR)/obj/qemu
 

--
http://www.iki.fi/~ananaza/