diff --git a/xen/Rules.mk b/xen/Rules.mk
index ecb20cb35a..63c3a51784 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -39,6 +39,8 @@ ALL_OBJS += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
 HOSTCC     = gcc
 HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer 
 
+test-gcc-flag = $(shell gcc -v --help 2>&1 | grep -q " $(1) " && echo $(1))
+
 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 ifneq ($(debug),y)
@@ -62,6 +64,8 @@ ifeq ($(trace),y)
 CFLAGS += -DTRACE_BUFFER
 endif
 
+CFLAGS := $(strip $(CFLAGS))
+
 %.o: %.c $(HDRS) Makefile
 	$(CC) $(CFLAGS) -c $< -o $@
 
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index fd4577f48c..bceb1982f4 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -14,10 +14,14 @@ else
 x86_32/usercopy.o: CFLAGS += -O1
 endif
 
-
 # Prevent floating-point variables from creeping into Xen.
 CFLAGS  += -msoft-float
 
+# Disable PIE/SSP if GCC supports them. They can break us.
+CFLAGS  += $(call test-gcc-flag,-nopie)
+CFLAGS  += $(call test-gcc-flag,-fno-stack-protector)
+CFLAGS  += $(call test-gcc-flag,-fno-stack-protector-all)
+
 ifeq ($(TARGET_SUBARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS := --oformat elf32-i386