Extensions to HVM ROS userspace library corresponding to HVM enhancements

[palacios.git] / Makefile

diff --git a/Makefile b/Makefile
index f483b05..97022f3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -480,8 +480,12 @@ endif
 ifdef V3_CONFIG_LINUX
 DEFAULT_EXTRA_TARGETS=linux_module
 else
+ifdef V3_CONFIG_NAUTILUS
+DEFAULT_EXTRA_TARGETS=nautilus
+else
 DEFAULT_EXTRA_TARGETS=
 endif
+endif
 
 # The all: target is the default when no target is given on the
 # command line.
@@ -493,8 +497,19 @@ all: palacios $(DEFAULT_EXTRA_TARGETS)
 ifdef V3_CONFIG_LINUX
 CFLAGS          += -mcmodel=kernel 
 else
+ifdef V3_CONFIG_NAUTILUS
+CFLAGS          += -O2 \
+                  -fno-omit-frame-pointer \
+                  -ffreestanding \
+                  -fno-stack-protector \
+                  -fno-strict-aliasing \
+                  -mno-red-zone \
+                  -mcmodel=large 
+LDFLAGS         += -z max-page-size=0x1000
+else
 CFLAGS          += -fPIC
 endif
+endif
 
 ifdef V3_CONFIG_FRAME_POINTER
 CFLAGS         += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
@@ -521,7 +536,7 @@ NOSTDINC_FLAGS +=
 # disable pointer signedness warnings in gcc 4.0
 CFLAGS += $(call cc-option,-Wno-pointer-sign,)
 
-CFLAGS += -O
+CFLAGS += -O2
 
 # Default kernel image to build when no specific target is given.
 # KBUILD_IMAGE may be overruled on the commandline or
@@ -636,9 +651,15 @@ linux_module/v3vee.ko: linux_module/*.c linux_module/*.h libv3vee.a
        cd linux_module/ && make -j 8
        cp linux_module/v3vee.ko v3vee.ko
 
-
+.PHONY: linux_module
 linux_module: linux_module/v3vee.ko 
 
+nautilus/libnautilus.a: nautilus/*.c nautilus/*.h libv3vee.a
+       cd nautilus/ && make 
+       cp nautilus/libnautilus.a .
+
+.PHONY: nautilus
+nautilus: nautilus/libnautilus.a
 
 
 palacios.asm: palacios