sprinkle -fno-stack-protector

makes builds with e.g. Ubuntu gcc work, where stack protect is default

diff --git a/Makefile b/Makefile
index 863838ee6a2fa5f4e3cfa87b6bedef87ca6a9519..4436814bf6ffe8874e4dace24c874e6d3cf9a59b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ CPPFLAGS = -isystem rump/include -isystem xen/include -I. -nostdinc
 CPPFLAGS += -DVIRTIF_BASE=xenif
 
 CFLAGS = -Wall -g
-CFLAGS += -fno-builtin -no-integrated-cpp
+CFLAGS += -fno-builtin -no-integrated-cpp -fno-stack-protector
 
 # This is semi-duplicated from xen/arch/x86/arch.mk, can we avoid that?
 TARGET_ARCH := $(shell uname -m | sed -e s/i.86/i386/)

diff --git a/app-tools/rumpapp-xen-cc.in b/app-tools/rumpapp-xen-cc.in
index 0f60eba6f92d3f6a8dfd75bea9e587b4ec053a6a..ab09a74c327d72d30d470468df217b84fe8b99a7 100755 (executable)
--- a/app-tools/rumpapp-xen-cc.in
+++ b/app-tools/rumpapp-xen-cc.in
@@ -3,4 +3,4 @@ set -e
 case " $* " in
 *" -v "*)   set -x ;;
 esac
-exec ${RUMP_APPTOOLS_CC:-cc} -no-integrated-cpp -specs=!APPTOOLS!/specs "$@"
+exec ${RUMP_APPTOOLS_CC:-cc} -fno-stack-protector -no-integrated-cpp -specs=!APPTOOLS!/specs "$@"

diff --git a/buildxen.sh b/buildxen.sh
index 718b89bea01fcae5099f7b6b78537c36f6e6b971..d3858e3edd7e7646cd2faf20461628c9eeba1cf1 100755 (executable)
--- a/buildxen.sh
+++ b/buildxen.sh
@@ -7,7 +7,9 @@ CPPFLAGS+=-DMAXPHYS=32768
 .PATH: $(pwd)
 PTHREAD_MAKELWP=pthread_makelwp_rumprunxen.c
 CPPFLAGS+=      -D_PTHREAD_GETTCB_EXT=_lwp_rumpxen_gettcb
-.endif  # LIB == pthread"
+.endif  # LIB == pthread
+CFLAGS+=-fno-stack-protector
+USE_SSP=no"
 unset IFS
 
 export BUILDXENMETAL_MKCONF

diff --git a/xen/Makefile b/xen/Makefile
index 801f9c90ca6ff76cabebe7d4ff0196c3d5b58184..78964c547471efbb79183eab4c54c4cdb4dcd1c2 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -34,6 +34,7 @@ include minios.mk
 CFLAGS += -isystem ../rump/include -I.. -nostdinc
 CFLAGS += -I$(MINI-OS_ROOT)
 CFLAGS += -no-integrated-cpp
+CFLAGS += -fno-stack-protector
 
 LDARCHLIB := -l$(ARCH_LIB_NAME)
 LDSCRIPT := $(TARGET_ARCH_DIR)/minios-$(XEN_TARGET_ARCH).lds