MiniOS: no-stack-protector added to the cflags if needed,

and the default domain config file fixed.

From: Grzegorz Milos <gm281@cam.ac.uk>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/extras/mini-os/domain_config b/extras/mini-os/domain_config
index 57f909ac5dd6c72fcac740e89141b016c75f6e52..f3ec1d1c51a98d20493d90ff1e752f6f9211deb0 100644 (file)
--- a/extras/mini-os/domain_config
+++ b/extras/mini-os/domain_config
@@ -8,7 +8,7 @@
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "mini-os.elf"
+kernel = "mini-os.gz"
 
 # Initial memory allocation (in megabytes) for the new domain.
 memory = 32

diff --git a/extras/mini-os/minios.mk b/extras/mini-os/minios.mk
index 5f63e614273085e7379d48da7eefe25c33ffca00..5f81bb7d77d50e3e0379608520e6357c7e954f3d 100644 (file)
--- a/extras/mini-os/minios.mk
+++ b/extras/mini-os/minios.mk
@@ -7,6 +7,7 @@ debug = y
 # Define some default flags.
 # NB. '-Wcast-qual' is nasty, so I omitted it.
 DEF_CFLAGS := -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format
+DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
 DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
 DEF_CFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION)