WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] linux/x86: Modify CPPFLAGS just in a single place

To: <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH] linux/x86: Modify CPPFLAGS just in a single place
From: "Jan Beulich" <jbeulich@xxxxxxxxxx>
Date: Thu, 06 Dec 2007 15:33:13 +0000
Delivery-date: Thu, 06 Dec 2007 07:33:16 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Reduces delta to native, thus making applying other patches easier.

As usual, written and tested against 2.6.24-rc3 and made apply against
2.6.18 without further testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: head-2007-11-30/arch/i386/Makefile
===================================================================
--- head-2007-11-30.orig/arch/i386/Makefile     2007-12-06 14:56:17.000000000 
+0100
+++ head-2007-11-30/arch/i386/Makefile  2007-12-05 12:13:15.000000000 +0100
@@ -48,11 +48,6 @@ AFLAGS += $(call as-instr,.cfi_st
 
 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
Index: head-2007-11-30/arch/x86_64/Makefile
===================================================================
--- head-2007-11-30.orig/arch/x86_64/Makefile   2007-12-06 14:56:17.000000000 
+0100
+++ head-2007-11-30/arch/x86_64/Makefile        2007-12-05 09:45:49.000000000 
+0100
@@ -32,10 +32,6 @@ cflags-$(CONFIG_MCORE2) += \
 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
 cflags-y += -mcmodel=kernel
@@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH] linux/x86: Modify CPPFLAGS just in a single place, Jan Beulich <=