[Xen-changelog] [linux-2.6.18-xen] linux/x86: Modify CPPFLAGS just in a single place.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196955898 0
# Node ID cc9a5c793b53c619d6cee92d5289f5b59a3fe864
# Parent  424f7b772301d501af6952507b2731e4b8c6da0a
linux/x86: Modify CPPFLAGS just in a single place.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/i386/Makefile   |    8 ++------
 arch/x86_64/Makefile |    7 ++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff -r 424f7b772301 -r cc9a5c793b53 arch/i386/Makefile
--- a/arch/i386/Makefile        Thu Dec 06 15:44:31 2007 +0000
+++ b/arch/i386/Makefile        Thu Dec 06 15:44:58 2007 +0000
@@ -47,11 +47,6 @@ CFLAGS                               += $(shell if [ $(call 
cc-vers
 CFLAGS                         += $(shell if [ $(call cc-version) -lt 0400 ] ; 
then echo $(call cc-option,-fno-unit-at-a-time); fi ;)
 
 CFLAGS += $(cflags-y)
-
-cppflags-$(CONFIG_XEN) += \
-       -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
-
-CPPFLAGS += $(cppflags-y)
 
 # Default subarch .c files
 mcore-y  := mach-default
@@ -115,7 +110,8 @@ PHONY += zImage bzImage vmlinuz compress
          zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install
 
 ifdef CONFIG_XEN
-CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
+CPPFLAGS := -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION) \
+       -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
 all: vmlinuz
 
 # KBUILD_IMAGE specifies the target image being built
diff -r 424f7b772301 -r cc9a5c793b53 arch/x86_64/Makefile
--- a/arch/x86_64/Makefile      Thu Dec 06 15:44:31 2007 +0000
+++ b/arch/x86_64/Makefile      Thu Dec 06 15:44:58 2007 +0000
@@ -31,10 +31,6 @@ cflags-$(CONFIG_MK8) += $(call cc-option
 cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
 cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
 cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
-
-cppflags-$(CONFIG_XEN) += \
-       -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
-CPPFLAGS += $(cppflags-y)
 
 cflags-y += -m64
 cflags-y += -mno-red-zone
@@ -79,7 +75,8 @@ PHONY += bzImage bzlilo vmlinuz install 
         fdimage fdimage144 fdimage288 isoimage archclean
 
 ifdef CONFIG_XEN
-CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
+CPPFLAGS := -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION) \
+       -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
 LDFLAGS_vmlinux := -e startup_64
 #Default target when executing "make"
 all: vmlinuz

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog