ia64/xen-unstable

changeset 12651:9164f836943d

[HVMLOADER] Fix CFLAGS.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Wed Nov 29 11:38:17 2006 +0000 (2006-11-29)
parents 8832712b0b37
children 4876e7ebca6e
files tools/firmware/hvmloader/Makefile tools/firmware/hvmloader/acpi/Makefile
line diff
     1.1 --- a/tools/firmware/hvmloader/Makefile	Wed Nov 29 11:37:59 2006 +0000
     1.2 +++ b/tools/firmware/hvmloader/Makefile	Wed Nov 29 11:38:17 2006 +0000
     1.3 @@ -28,16 +28,13 @@ include $(XEN_ROOT)/Config.mk
     1.4  # The HVM loader is started in 32-bit mode at the address below:
     1.5  LOADADDR = 0x100000
     1.6  
     1.7 -DEFINES  =-DDEBUG
     1.8 -XENINC   =-I$(XEN_ROOT)/tools/libxc
     1.9 -
    1.10  # Disable PIE/SSP if GCC supports them. They can break us.
    1.11  CFLAGS  += $(call cc-option,$(CC),-nopie,)
    1.12  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector,)
    1.13  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector-all,)
    1.14  
    1.15  OBJCOPY  = objcopy
    1.16 -CFLAGS  += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float
    1.17 +CFLAGS  += -I$(XEN_ROOT)/tools/libxc -I. -fno-builtin -O2 -msoft-float
    1.18  LDFLAGS  = -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
    1.19  
    1.20  SRCS = hvmloader.c mp_tables.c util.c smbios.c
     2.1 --- a/tools/firmware/hvmloader/acpi/Makefile	Wed Nov 29 11:37:59 2006 +0000
     2.2 +++ b/tools/firmware/hvmloader/acpi/Makefile	Wed Nov 29 11:38:17 2006 +0000
     2.3 @@ -27,6 +27,13 @@ OBJS  = $(patsubst %.c,%.o,$(C_SRC))
     2.4  IASL_VER = acpica-unix-20050513
     2.5  IASL_URL = http://developer.intel.com/technology/iapc/acpi/downloads/$(IASL_VER).tar.gz
     2.6  
     2.7 +# Disable PIE/SSP if GCC supports them. They can break us.
     2.8 +CFLAGS  += $(call cc-option,$(CC),-nopie,)
     2.9 +CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector,)
    2.10 +CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector-all,)
    2.11 +
    2.12 +CFLAGS  += -fno-builtin -O2 -msoft-float
    2.13 +
    2.14  vpath iasl $(PATH)
    2.15  all: acpi.a
    2.16