--- tools/firmware/hvmloader/Makefile	2006-09-16 21:34:48.728482000 -0500
+++ tools/firmware/hvmloader/Makefile.fixed	2006-09-16 21:34:37.863803000 -0500
@@ -19,7 +19,7 @@
 #
 
 # External CFLAGS can do more harm than good.
-CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all
+CFLAGS :=
 
 XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
@@ -34,7 +34,7 @@
 OBJECTS	 = hvmloader.o acpi_madt.o 
 
 # Disable PIE/SSP if GCC supports them. They can break us.
-CFLAGS  += $(call test-gcc-flag,$(CC),-nopie)
+CFLAGS  += $(call test-gcc-flag,$(CC),-fno-pie)
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector)
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector-all)
 
--- tools/firmware/vmxassist/Makefile	2006-09-16 21:34:48.728482000 -0500
+++ tools/firmware/vmxassist/Makefile.fixed	2006-09-16 21:34:20.370709000 -0500
@@ -19,7 +19,7 @@
 #
 
 # External CFLAGS can do more harm than good.
-CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all
+CFLAGS :=
 
 XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
@@ -32,7 +32,7 @@
 XENINC=-I$(XEN_ROOT)/tools/libxc
 
 # Disable PIE/SSP if GCC supports them. They can break us.
-CFLAGS  += $(call test-gcc-flag,$(CC),-nopie)
+CFLAGS  += $(call test-gcc-flag,$(CC),-fno-pie)
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector)
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector-all)