From mboxrd@z Thu Jan 1 00:00:00 1970 From: matt mooney Date: Thu, 23 Sep 2010 06:51:38 +0000 Subject: [PATCH 17/20] x86: change to new flag variables Message-Id: <1285224698-30035-1-git-send-email-mfm@muteddisk.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Avi Kivity Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y. Signed-off-by: matt mooney --- arch/x86/kvm/Makefile | 2 +- arch/x86/math-emu/Makefile | 4 ++-- arch/x86/pci/Makefile | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 31a7035..0feb536 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -1,5 +1,5 @@ -EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm +ccflags-y := -Ivirt/kvm -Iarch/x86/kvm CFLAGS_x86.o := -I. CFLAGS_svm.o := -I. diff --git a/arch/x86/math-emu/Makefile b/arch/x86/math-emu/Makefile index 9b0c63b..a88eac2 100644 --- a/arch/x86/math-emu/Makefile +++ b/arch/x86/math-emu/Makefile @@ -5,8 +5,8 @@ #DEBUG = -DDEBUGGING DEBUG PARANOID = -DPARANOID -EXTRA_CFLAGS := $(PARANOID) $(DEBUG) -fno-builtin $(MATH_EMULATION) -EXTRA_AFLAGS := $(PARANOID) +ccflags-y := $(PARANOID) $(DEBUG) -fno-builtin $(MATH_EMULATION) +asflags-y := $(PARANOID) # From 'C' language sources: C_OBJS =fpu_entry.o errors.o \ diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index a0207a7..8e60497 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile @@ -20,6 +20,4 @@ obj-y += amd_bus.o bus_numa.o obj-$(CONFIG_PCI_CNB20LE_QUIRK) += broadcom_bus.o -ifeq ($(CONFIG_PCI_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -endif +ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG -- 1.7.2.1