# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 9164f836943d42226dad8ed4c704ed2c3581a65a
# Parent 8832712b0b3740daf9c2d5993fcc1d640ff1564e
[HVMLOADER] Fix CFLAGS.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/firmware/hvmloader/Makefile | 5 +----
tools/firmware/hvmloader/acpi/Makefile | 7 +++++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff -r 8832712b0b37 -r 9164f836943d tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Wed Nov 29 11:37:59 2006 +0000
+++ b/tools/firmware/hvmloader/Makefile Wed Nov 29 11:38:17 2006 +0000
@@ -28,16 +28,13 @@ include $(XEN_ROOT)/Config.mk
# The HVM loader is started in 32-bit mode at the address below:
LOADADDR = 0x100000
-DEFINES =-DDEBUG
-XENINC =-I$(XEN_ROOT)/tools/libxc
-
# Disable PIE/SSP if GCC supports them. They can break us.
CFLAGS += $(call cc-option,$(CC),-nopie,)
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
OBJCOPY = objcopy
-CFLAGS += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float
+CFLAGS += -I$(XEN_ROOT)/tools/libxc -I. -fno-builtin -O2 -msoft-float
LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
SRCS = hvmloader.c mp_tables.c util.c smbios.c
diff -r 8832712b0b37 -r 9164f836943d tools/firmware/hvmloader/acpi/Makefile
--- a/tools/firmware/hvmloader/acpi/Makefile Wed Nov 29 11:37:59 2006 +0000
+++ b/tools/firmware/hvmloader/acpi/Makefile Wed Nov 29 11:38:17 2006 +0000
@@ -26,6 +26,13 @@ OBJS = $(patsubst %.c,%.o,$(C_SRC))
IASL_VER = acpica-unix-20050513
IASL_URL =
http://developer.intel.com/technology/iapc/acpi/downloads/$(IASL_VER).tar.gz
+
+# Disable PIE/SSP if GCC supports them. They can break us.
+CFLAGS += $(call cc-option,$(CC),-nopie,)
+CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
+
+CFLAGS += -fno-builtin -O2 -msoft-float
vpath iasl $(PATH)
all: acpi.a
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home