From: "Jan Beulich" Subject: [PATCH] linux/x86: Modify CPPFLAGS just in a single place Date: Thu, 06 Dec 2007 15:33:13 +0000 Message-ID: <47582449.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org 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 Index: head-2007-11-30/arch/i386/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head-2007-11-30.orig/arch/i386/Makefile 2007-12-06 14:56:17.0000000= 00 +0100 +++ head-2007-11-30/arch/i386/Makefile 2007-12-05 12:13:15.000000000 = +0100 @@ -48,11 +48,6 @@ AFLAGS +=3D $(call as-instr,.cfi_st =20 CFLAGS +=3D $(cflags-y) =20 -cppflags-$(CONFIG_XEN) +=3D \ - -D__XEN_INTERFACE_VERSION__=3D$(CONFIG_XEN_INTERFACE_VERSION) - -CPPFLAGS +=3D $(cppflags-y) - # Default subarch .c files mcore-y :=3D mach-default =20 @@ -115,7 +110,8 @@ PHONY +=3D zImage bzImage vmlinuz compress zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install =20 ifdef CONFIG_XEN -CPPFLAGS :=3D -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS) +CPPFLAGS :=3D -D__XEN_INTERFACE_VERSION__=3D$(CONFIG_XEN_INTERFACE_VERSION= ) \ + -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS) all: vmlinuz =20 # KBUILD_IMAGE specifies the target image being built Index: head-2007-11-30/arch/x86_64/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head-2007-11-30.orig/arch/x86_64/Makefile 2007-12-06 14:56:17.0000000= 00 +0100 +++ head-2007-11-30/arch/x86_64/Makefile 2007-12-05 09:45:49.0000000= 00 +0100 @@ -32,10 +32,6 @@ cflags-$(CONFIG_MCORE2) +=3D \ cflags-$(CONFIG_MPSC) +=3D $(call cc-option,-march=3Dnocona) cflags-$(CONFIG_GENERIC_CPU) +=3D $(call cc-option,-mtune=3Dgeneric) =20 -cppflags-$(CONFIG_XEN) +=3D \ - -D__XEN_INTERFACE_VERSION__=3D$(CONFIG_XEN_INTERFACE_VERSION) -CPPFLAGS +=3D $(cppflags-y) - cflags-y +=3D -m64 cflags-y +=3D -mno-red-zone cflags-y +=3D -mcmodel=3Dkernel @@ -79,7 +75,8 @@ PHONY +=3D bzImage bzlilo vmlinuz install=20 fdimage fdimage144 fdimage288 isoimage archclean =20 ifdef CONFIG_XEN -CPPFLAGS :=3D -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS) +CPPFLAGS :=3D -D__XEN_INTERFACE_VERSION__=3D$(CONFIG_XEN_INTERFACE_VERSION= ) \ + -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS) LDFLAGS_vmlinux :=3D -e startup_64 #Default target when executing "make" all: vmlinuz