X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=4bfad21c154fa1408eb0f637722f76c2130b60f5;hb=87819b4172a7c32186403fc7a03bea5ae65f0e4a;hp=7319a6fed5615c313211f96389f0a4e665ba09b7;hpb=dd7ea495f8177d9594526263440ed67afa8f8e64;p=palacios-OLD.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 7319a6f..4bfad21 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -249,6 +249,7 @@ else
   INSTRUMENT_OPT := 
 endif
 
+CFLAGS = -fno-stack-protector
 
 
 # ----------------------------------------------------------------------
@@ -305,13 +306,14 @@ VMM_OBJS := \
 	palacios/vmm_direct_paging.o \
 	palacios/vmm_ringbuffer.o \
 	palacios/vmm_hypercall.o \
+	palacios/vmm_lock.o \
 	$(OBJ_FILES)
 
 #		vmx.c vmcs_gen.c vmcs.c
 
 # Extra C flags for the VMM objects
 $(VMM_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 
 
@@ -320,7 +322,7 @@ XED_OBJS := \
 	xed/v3-udiv-compat.o \
 
 $(XED_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\
 
 DEVICES_OBJS := \
 	devices/generic.o \
@@ -342,14 +344,15 @@ DEVICES_OBJS := \
 	devices/ram_hd.o \
 	devices/i440fx.o \
 	devices/piix3.o \
-	devices/ne2k.o	\
+	devices/net_cd.o \
 
+#	devices/ne2k.o	\
 #	devices/cdrom.o \
 #	devices/ramdisk.o \
 #   	devices/vnic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) \
+	$(JRLDEBUG) $(CFLAGS)\