--- xen/Rules.mk	2006-09-16 20:15:05.717562500 -0500
+++ xen/Rules.mk.fixed	2006-09-16 20:12:47.852946000 -0500
@@ -48,7 +48,9 @@
 ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
 
 CFLAGS-y               += -g -D__XEN__
-CFLAGS-y               += -fno-pie -fno-stack-protector-all -fno-stack-protector
+CFLAGS-y               += -fno-pie
+CFLAGS-y               += $(call test-gcc-flag,$(CC),-fno-stack-protector)
+CFLAGS-y               += $(call test-gcc-flag,$(CC),-fno-stack-protector-all)
 CFLAGS-$(ACM_SECURITY) += -DACM_SECURITY
 CFLAGS-$(verbose)      += -DVERBOSE
 CFLAGS-$(crash_debug)  += -DCRASH_DEBUG