X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=de620950b153df339da5aa50ee7e4c4d4a0b8f57;hb=245f2cf869618c082cf5141786c8a9d6d82a63be;hp=8e9d972d273758529c407b7fd9ed7931891494c7;hpb=bbef87558ec784cd99c72b759aa78a8c47aa5fd3;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8e9d972..de62095 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -179,6 +179,22 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_HALT
 endif
 endif
 
+ifeq ($(DEBUG_APIC),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_APIC
+else 
+ifeq ($(DEBUG_APIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_APIC
+endif
+endif
+
+ifeq ($(DEBUG_PCI),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PCI
+else 
+ifeq ($(DEBUG_PCI),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PCI
+endif
+endif
+
 ifeq ($(DEBUG_DEV_MGR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_DEV_MGR
 else 
@@ -279,6 +295,7 @@ VMM_OBJS := \
 	palacios/vmm_profiler.o \
 	palacios/vmm_direct_paging.o \
 	palacios/vmm_ringbuffer.o \
+	palacios/vmm_hypercall.o \
 	$(OBJ_FILES)
 
 #		vmx.c vmcs_gen.c vmcs.c
@@ -311,6 +328,10 @@ DEVICES_OBJS := \
 	devices/os_debug.o \
 	devices/apic.o	\
 	devices/io_apic.o \
+	devices/pci.o \
+	devices/para_net.o \
+
+#   	devices/vnic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
 	$(JRLDEBUG) \
@@ -329,6 +350,11 @@ V3_ARCH := __V3_32BIT__
 endif
 
 
+ifeq ($(CRAY_XT),1)
+EXTRA_C_OPTS := $(EXTRA_C_OPTS) -DCRAY_XT
+endif
+
+
 # Uncomment if cross compiling
 #TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf-
 #TARGET_CC_PREFIX :=  i386-elf-
@@ -408,6 +434,7 @@ CC_GENERAL_OPTS = \
 	-I$(PROJECT_ROOT)/include \
 	-Werror \
 	-fPIC \
+	-mno-red-zone \
 	-Wp,-MD,$(@D)/.$(@F).d \
 	-Wp,-MT,$@ \