Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile
author: Linus Torvalds <torvalds@linux-foundation.org> 2011-03-20 21:14:55 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2011-03-20 21:14:55 -0400
commit: a44f99c7efdb88fa41128065c9a9445c19894e34 (patch)
tree: 9d9dc6026b2c0409eca05e360c98b8a688ccdb1e /arch
parent: b87a2d3e3147bd140da2eae584772c353d11421b (diff)
parent: 22942c00a6ad6e9e93b53811a6de72c821c15d22 (diff)
25 files changed, 33 insertions, 33 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index f9f77c65dff3..8ebbb511c783 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -95,8 +95,8 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
 endif
-EXTRA_CFLAGS  := -fpic -fno-builtin
+ccflags-y := -fpic -fno-builtin
-EXTRA_AFLAGS  := -Wa,-march=all
+asflags-y := -Wa,-march=all
 # Provide size of uncompressed kernel to the decompressor via a linker symbol.
 LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)
diff --git a/arch/arm/vfp/Makefile b/arch/arm/vfp/Makefile
index 39f6d8e1af73..6de73aab0195 100644
--- a/arch/arm/vfp/Makefile
+++ b/arch/arm/vfp/Makefile
@@ -4,8 +4,8 @@
 # Copyright (C) 2001 ARM Limited
 #
-# EXTRA_CFLAGS := -DDEBUG
+# ccflags-y := -DDEBUG
-# EXTRA_AFLAGS := -DDEBUG
+# asflags-y := -DDEBUG
 KBUILD_AFLAGS   :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp)
 LDFLAGS         +=--no-warn-mismatch
diff --git a/arch/h8300/boot/compressed/Makefile b/arch/h8300/boot/compressed/Makefile
index d6189e057ed3..6745cb1ffb4f 100644
--- a/arch/h8300/boot/compressed/Makefile
+++ b/arch/h8300/boot/compressed/Makefile
@@ -5,7 +5,7 @@
 #
 targets         := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
-EXTRA_AFLAGS    := -traditional
+asflags-y       := -traditional
 OBJECTS = $(obj)/head.o $(obj)/misc.o
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index 1089b3e918ac..db3d7c5d1071 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -45,8 +45,8 @@ FORCE : $(obj)/$(offsets-file)
 # Makefile for Kernel-based Virtual Machine module
 #
-EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
+ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
-EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
+asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
                coalesced_mmio.o irq_comm.o assigned-dev.o)
diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
index 0591038735af..d27df1d45da7 100644
--- a/arch/ia64/sn/kernel/Makefile
+++ b/arch/ia64/sn/kernel/Makefile
@@ -7,7 +7,7 @@
 # Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc.  All Rights Reserved.
 #
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y                           += setup.o bte.o bte_error.o irq.o mca.o idle.o \
                                   huberror.o io_acpi_init.o io_common.o \
diff --git a/arch/ia64/sn/kernel/sn2/Makefile b/arch/ia64/sn/kernel/sn2/Makefile
index 08e6565dc908..3d09108d4277 100644
--- a/arch/ia64/sn/kernel/sn2/Makefile
+++ b/arch/ia64/sn/kernel/sn2/Makefile
@@ -9,7 +9,7 @@
 # sn2 specific kernel files
 #
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
         prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o
diff --git a/arch/ia64/sn/pci/Makefile b/arch/ia64/sn/pci/Makefile
index ad4ef34dfe26..df2a90145426 100644
--- a/arch/ia64/sn/pci/Makefile
+++ b/arch/ia64/sn/pci/Makefile
@@ -7,6 +7,6 @@
 #
 # Makefile for the sn pci general routines.
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/
diff --git a/arch/ia64/sn/pci/pcibr/Makefile b/arch/ia64/sn/pci/pcibr/Makefile
index 01192d3247dd..396bcae36309 100644
--- a/arch/ia64/sn/pci/pcibr/Makefile
+++ b/arch/ia64/sn/pci/pcibr/Makefile
@@ -7,7 +7,7 @@
 #
 # Makefile for the sn2 io routines.
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y                           +=  pcibr_dma.o pcibr_reg.o \
                                    pcibr_ate.o pcibr_provider.o
diff --git a/arch/ia64/uv/kernel/Makefile b/arch/ia64/uv/kernel/Makefile
index 8d92b4684d8e..124e441d383d 100644
--- a/arch/ia64/uv/kernel/Makefile
+++ b/arch/ia64/uv/kernel/Makefile
@@ -7,7 +7,7 @@
 # Copyright (C) 2008 Silicon Graphics, Inc.  All Rights Reserved.
 #
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y                           += setup.o
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
diff --git a/arch/microblaze/kernel/cpu/Makefile b/arch/microblaze/kernel/cpu/Makefile
index 59cc7bceaf8c..fceed4edea41 100644
--- a/arch/microblaze/kernel/cpu/Makefile
+++ b/arch/microblaze/kernel/cpu/Makefile
@@ -6,7 +6,7 @@ ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_cache.o = -pg
 endif
-EXTRA_CFLAGS += -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
+ccflags-y := -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
                -DCPU_REV=$(CPU_REV)
 obj-y += cache.o cpuinfo.o cpuinfo-pvr-full.o cpuinfo-static.o mb.o pvr.o
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 7c1102e41fe2..ac1d5b611a27 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -286,11 +286,11 @@ CLEAN_FILES += vmlinux.32 vmlinux.64
 archprepare:
 ifdef CONFIG_MIPS32_N32
        @echo '  Checking missing-syscalls for N32'
-        $(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=n32"
+        $(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=n32"
 endif
 ifdef CONFIG_MIPS32_O32
        @echo '  Checking missing-syscalls for O32'
-        $(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=32"
+        $(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=32"
 endif
 install:
diff --git a/arch/mips/bcm63xx/boards/Makefile b/arch/mips/bcm63xx/boards/Makefile
index e5cc86dc1da8..9f64fb414077 100644
--- a/arch/mips/bcm63xx/boards/Makefile
+++ b/arch/mips/bcm63xx/boards/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_BOARD_BCM963XX)            += board_bcm963xx.o
-EXTRA_CFLAGS += -Werror
+ccflags-y := -Werror
diff --git a/arch/mips/fw/arc/Makefile b/arch/mips/fw/arc/Makefile
index e0aaad482b0e..5314b37aff2c 100644
--- a/arch/mips/fw/arc/Makefile
+++ b/arch/mips/fw/arc/Makefile
@@ -9,4 +9,4 @@ lib-$(CONFIG_ARC_MEMORY)	+= memory.o
 lib-$(CONFIG_ARC_CONSOLE)       += arc_con.o
 lib-$(CONFIG_ARC_PROMLIB)       += promlib.o
-EXTRA_CFLAGS                    += -Werror
+ccflags-y                       := -Werror
diff --git a/arch/mips/jz4740/Makefile b/arch/mips/jz4740/Makefile
index a604eaeb6c08..a9dff3321251 100644
--- a/arch/mips/jz4740/Makefile
+++ b/arch/mips/jz4740/Makefile
@@ -17,4 +17,4 @@ obj-$(CONFIG_JZ4740_QI_LB60)	+= board-qi_lb60.o
 obj-$(CONFIG_PM) += pm.o
-EXTRA_CFLAGS += -Werror -Wall
+ccflags-y := -Werror -Wall
diff --git a/arch/mips/oprofile/Makefile b/arch/mips/oprofile/Makefile
index 02cc65e52d11..4b9d7044e26c 100644
--- a/arch/mips/oprofile/Makefile
+++ b/arch/mips/oprofile/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS := -Werror
+ccflags-y := -Werror
 obj-$(CONFIG_OPROFILE) += oprofile.o
diff --git a/arch/mips/pmc-sierra/yosemite/Makefile b/arch/mips/pmc-sierra/yosemite/Makefile
index b16f95c3df65..02f5fb94ea28 100644
--- a/arch/mips/pmc-sierra/yosemite/Makefile
+++ b/arch/mips/pmc-sierra/yosemite/Makefile
@@ -6,4 +6,4 @@ obj-y    += irq.o prom.o py-console.o setup.o
 obj-$(CONFIG_SMP)               += smp.o
-EXTRA_CFLAGS += -Werror
+ccflags-y := -Werror
diff --git a/arch/mips/powertv/Makefile b/arch/mips/powertv/Makefile
index baf6e9092a9f..348d2e850ef5 100644
--- a/arch/mips/powertv/Makefile
+++ b/arch/mips/powertv/Makefile
@@ -28,4 +28,4 @@ obj-y += init.o ioremap.o memory.o powertv_setup.o reset.o time.o \
 obj-$(CONFIG_USB) += powertv-usb.o
-EXTRA_CFLAGS += -Wall
+ccflags-y := -Wall
diff --git a/arch/mips/powertv/asic/Makefile b/arch/mips/powertv/asic/Makefile
index f0e95dc0ac97..d810a33182a4 100644
--- a/arch/mips/powertv/asic/Makefile
+++ b/arch/mips/powertv/asic/Makefile
@@ -20,4 +20,4 @@ obj-y += asic-calliope.o asic-cronus.o asic-gaia.o asic-zeus.o \
        asic_devices.o asic_int.o irq_asic.o prealloc-calliope.o \
        prealloc-cronus.o prealloc-cronuslite.o prealloc-gaia.o prealloc-zeus.o
-EXTRA_CFLAGS += -Wall -Werror
+ccflags-y := -Wall -Werror
diff --git a/arch/mips/powertv/pci/Makefile b/arch/mips/powertv/pci/Makefile
index f5c62462fc9d..5783201cd2c8 100644
--- a/arch/mips/powertv/pci/Makefile
+++ b/arch/mips/powertv/pci/Makefile
@@ -18,4 +18,4 @@
 obj-$(CONFIG_PCI)       += fixup-powertv.o
-EXTRA_CFLAGS += -Wall -Werror
+ccflags-y := -Wall -Werror
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 8800cf090694..635d677d3281 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -6,7 +6,7 @@ COMPILE_VERSION := __linux_compile_version_id__`hostname |  \
                        tr -c '[0-9A-Za-z]' '_'`__`date | \
                        tr -c '[0-9A-Za-z]' '_'`_t
-EXTRA_CFLAGS  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
+ccflags-y  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
 targets := image
 targets += bzImage
diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile
index e5221ec0b8e3..860d26514c08 100644
--- a/arch/s390/kvm/Makefile
+++ b/arch/s390/kvm/Makefile
@@ -8,7 +8,7 @@
 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
-EXTRA_CFLAGS += -Ivirt/kvm -Iarch/s390/kvm
+ccflags-y := -Ivirt/kvm -Iarch/s390/kvm
 kvm-objs := $(common-objs) kvm-s390.o sie64a.o intercept.o interrupt.o priv.o sigp.o diag.o
 obj-$(CONFIG_KVM) += kvm.o
diff --git a/arch/s390/math-emu/Makefile b/arch/s390/math-emu/Makefile
index c84890341052..51d399549f60 100644
--- a/arch/s390/math-emu/Makefile
+++ b/arch/s390/math-emu/Makefile
@@ -4,4 +4,4 @@
 obj-$(CONFIG_MATHEMU) := math.o
-EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w
+ccflags-y := -I$(src) -Iinclude/math-emu -w
diff --git a/arch/um/sys-ppc/Makefile b/arch/um/sys-ppc/Makefile
index b8bc844fd2c4..20d363bd7004 100644
--- a/arch/um/sys-ppc/Makefile
+++ b/arch/um/sys-ppc/Makefile
@@ -6,7 +6,7 @@ OBJ = built-in.o
 OBJS = ptrace.o sigcontext.o checksum.o miscthings.o misc.o \
        ptrace_user.o sysrq.o
-EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
+asflags-y := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
 all: $(OBJ)
@@ -15,10 +15,10 @@ $(OBJ): $(OBJS)
        $(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
 ptrace_user.o: ptrace_user.c
-        $(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+        $(CC) -D__KERNEL__ $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
 sigcontext.o: sigcontext.c
-        $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+        $(CC) $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
 checksum.S:
        rm -f $@
@@ -53,13 +53,13 @@ ppc_defs.h: mk_defs.c ppc_defs.head \
 checksum.o: checksum.S
        rm -f asm
        ln -s $(srctree)/include/asm-ppc asm
-        $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
+        $(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
        rm -f asm
 misc.o: misc.S ppc_defs.h
        rm -f asm
        ln -s $(srctree)/include/asm-ppc asm
-        $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
+        $(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
        rm -f asm
 clean-files := $(OBJS) ppc_defs.h checksum.S mk_defs.c
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
index 40aa55b485be..70fd1453e172 100644
--- a/arch/xtensa/boot/Makefile
+++ b/arch/xtensa/boot/Makefile
@@ -14,7 +14,7 @@ HOSTFLAGS	+= -Iarch/$(ARCH)/boot/include
 BIG_ENDIAN      := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
-export EXTRA_CFLAGS
+export ccflags-y
 export BIG_ENDIAN
 subdir-y        := lib
diff --git a/arch/xtensa/boot/lib/Makefile b/arch/xtensa/boot/lib/Makefile
index d3d2aa2d883a..ad8952e8a07f 100644
--- a/arch/xtensa/boot/lib/Makefile
+++ b/arch/xtensa/boot/lib/Makefile
@@ -6,7 +6,7 @@ zlib	:= inffast.c inflate.c inftrees.c
 lib-y   += $(zlib:.c=.o) zmem.o
-EXTRA_CFLAGS    += -Ilib/zlib_inflate
+ccflags-y       := -Ilib/zlib_inflate
 quiet_cmd_copy_zlib = COPY    $@
      cmd_copy_zlib = cat $< > $@
author	Linus Torvalds <torvalds@linux-foundation.org>	2011-03-20 21:14:55 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2011-03-20 21:14:55 -0400
commit	a44f99c7efdb88fa41128065c9a9445c19894e34 (patch)
tree	9d9dc6026b2c0409eca05e360c98b8a688ccdb1e /arch
parent	b87a2d3e3147bd140da2eae584772c353d11421b (diff)
parent	22942c00a6ad6e9e93b53811a6de72c821c15d22 (diff)

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index f9f77c65dff3..8ebbb511c783 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile
@@ -95,8 +95,8 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
95	KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))	95	KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
96	endif	96	endif
97		97
98	EXTRA_CFLAGS := -fpic -fno-builtin	98	ccflags-y := -fpic -fno-builtin
99	EXTRA_AFLAGS := -Wa,-march=all	99	asflags-y := -Wa,-march=all
100		100
101	# Provide size of uncompressed kernel to the decompressor via a linker symbol.	101	# Provide size of uncompressed kernel to the decompressor via a linker symbol.
102	LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)	102	LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)


diff --git a/arch/arm/vfp/Makefile b/arch/arm/vfp/Makefile index 39f6d8e1af73..6de73aab0195 100644 --- a/arch/arm/vfp/Makefile +++ b/arch/arm/vfp/Makefile
@@ -4,8 +4,8 @@
4	# Copyright (C) 2001 ARM Limited	4	# Copyright (C) 2001 ARM Limited
5	#	5	#
6		6
7	# EXTRA_CFLAGS := -DDEBUG	7	# ccflags-y := -DDEBUG
8	# EXTRA_AFLAGS := -DDEBUG	8	# asflags-y := -DDEBUG
9		9
10	KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp)	10	KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp)
11	LDFLAGS +=--no-warn-mismatch	11	LDFLAGS +=--no-warn-mismatch


diff --git a/arch/h8300/boot/compressed/Makefile b/arch/h8300/boot/compressed/Makefile index d6189e057ed3..6745cb1ffb4f 100644 --- a/arch/h8300/boot/compressed/Makefile +++ b/arch/h8300/boot/compressed/Makefile
@@ -5,7 +5,7 @@
5	#	5	#
6		6
7	targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o	7	targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
8	EXTRA_AFLAGS := -traditional	8	asflags-y := -traditional
9		9
10	OBJECTS = $(obj)/head.o $(obj)/misc.o	10	OBJECTS = $(obj)/head.o $(obj)/misc.o
11		11


diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 1089b3e918ac..db3d7c5d1071 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile
@@ -45,8 +45,8 @@ FORCE : $(obj)/$(offsets-file)
45	# Makefile for Kernel-based Virtual Machine module	45	# Makefile for Kernel-based Virtual Machine module
46	#	46	#
47		47
48	EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/	48	ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
49	EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/	49	asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
50		50
51	common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \	51	common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
52	coalesced_mmio.o irq_comm.o assigned-dev.o)	52	coalesced_mmio.o irq_comm.o assigned-dev.o)


diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile index 0591038735af..d27df1d45da7 100644 --- a/arch/ia64/sn/kernel/Makefile +++ b/arch/ia64/sn/kernel/Makefile
@@ -7,7 +7,7 @@
7	# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc. All Rights Reserved.	7	# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc. All Rights Reserved.
8	#	8	#
9		9
10	EXTRA_CFLAGS += -Iarch/ia64/sn/include	10	ccflags-y := -Iarch/ia64/sn/include
11		11
12	obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \	12	obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \
13	huberror.o io_acpi_init.o io_common.o \	13	huberror.o io_acpi_init.o io_common.o \


diff --git a/arch/ia64/sn/kernel/sn2/Makefile b/arch/ia64/sn/kernel/sn2/Makefile index 08e6565dc908..3d09108d4277 100644 --- a/arch/ia64/sn/kernel/sn2/Makefile +++ b/arch/ia64/sn/kernel/sn2/Makefile
@@ -9,7 +9,7 @@
9	# sn2 specific kernel files	9	# sn2 specific kernel files
10	#	10	#
11		11
12	EXTRA_CFLAGS += -Iarch/ia64/sn/include	12	ccflags-y := -Iarch/ia64/sn/include
13		13
14	obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \	14	obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
15	prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o	15	prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o


diff --git a/arch/ia64/sn/pci/Makefile b/arch/ia64/sn/pci/Makefile index ad4ef34dfe26..df2a90145426 100644 --- a/arch/ia64/sn/pci/Makefile +++ b/arch/ia64/sn/pci/Makefile
@@ -7,6 +7,6 @@
7	#	7	#
8	# Makefile for the sn pci general routines.	8	# Makefile for the sn pci general routines.
9		9
10	EXTRA_CFLAGS += -Iarch/ia64/sn/include	10	ccflags-y := -Iarch/ia64/sn/include
11		11
12	obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/	12	obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/


diff --git a/arch/ia64/sn/pci/pcibr/Makefile b/arch/ia64/sn/pci/pcibr/Makefile index 01192d3247dd..396bcae36309 100644 --- a/arch/ia64/sn/pci/pcibr/Makefile +++ b/arch/ia64/sn/pci/pcibr/Makefile
@@ -7,7 +7,7 @@
7	#	7	#
8	# Makefile for the sn2 io routines.	8	# Makefile for the sn2 io routines.
9		9
10	EXTRA_CFLAGS += -Iarch/ia64/sn/include	10	ccflags-y := -Iarch/ia64/sn/include
11		11
12	obj-y += pcibr_dma.o pcibr_reg.o \	12	obj-y += pcibr_dma.o pcibr_reg.o \
13	pcibr_ate.o pcibr_provider.o	13	pcibr_ate.o pcibr_provider.o


diff --git a/arch/ia64/uv/kernel/Makefile b/arch/ia64/uv/kernel/Makefile index 8d92b4684d8e..124e441d383d 100644 --- a/arch/ia64/uv/kernel/Makefile +++ b/arch/ia64/uv/kernel/Makefile
@@ -7,7 +7,7 @@
7	# Copyright (C) 2008 Silicon Graphics, Inc. All Rights Reserved.	7	# Copyright (C) 2008 Silicon Graphics, Inc. All Rights Reserved.
8	#	8	#
9		9
10	EXTRA_CFLAGS += -Iarch/ia64/sn/include	10	ccflags-y := -Iarch/ia64/sn/include
11		11
12	obj-y += setup.o	12	obj-y += setup.o
13	obj-$(CONFIG_IA64_GENERIC) += machvec.o	13	obj-$(CONFIG_IA64_GENERIC) += machvec.o


diff --git a/arch/microblaze/kernel/cpu/Makefile b/arch/microblaze/kernel/cpu/Makefile index 59cc7bceaf8c..fceed4edea41 100644 --- a/arch/microblaze/kernel/cpu/Makefile +++ b/arch/microblaze/kernel/cpu/Makefile
@@ -6,7 +6,7 @@ ifdef CONFIG_FUNCTION_TRACER
6	CFLAGS_REMOVE_cache.o = -pg	6	CFLAGS_REMOVE_cache.o = -pg
7	endif	7	endif
8		8
9	EXTRA_CFLAGS += -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \	9	ccflags-y := -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
10	-DCPU_REV=$(CPU_REV)	10	-DCPU_REV=$(CPU_REV)
11		11
12	obj-y += cache.o cpuinfo.o cpuinfo-pvr-full.o cpuinfo-static.o mb.o pvr.o	12	obj-y += cache.o cpuinfo.o cpuinfo-pvr-full.o cpuinfo-static.o mb.o pvr.o


diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 7c1102e41fe2..ac1d5b611a27 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile
@@ -286,11 +286,11 @@ CLEAN_FILES += vmlinux.32 vmlinux.64
286	archprepare:	286	archprepare:
287	ifdef CONFIG_MIPS32_N32	287	ifdef CONFIG_MIPS32_N32
288	@echo ' Checking missing-syscalls for N32'	288	@echo ' Checking missing-syscalls for N32'
289	$(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=n32"	289	$(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=n32"
290	endif	290	endif
291	ifdef CONFIG_MIPS32_O32	291	ifdef CONFIG_MIPS32_O32
292	@echo ' Checking missing-syscalls for O32'	292	@echo ' Checking missing-syscalls for O32'
293	$(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=32"	293	$(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=32"
294	endif	294	endif
295		295
296	install:	296	install:


diff --git a/arch/mips/bcm63xx/boards/Makefile b/arch/mips/bcm63xx/boards/Makefile index e5cc86dc1da8..9f64fb414077 100644 --- a/arch/mips/bcm63xx/boards/Makefile +++ b/arch/mips/bcm63xx/boards/Makefile
@@ -1,3 +1,3 @@
1	obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o	1	obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
2		2
3	EXTRA_CFLAGS += -Werror	3	ccflags-y := -Werror


diff --git a/arch/mips/fw/arc/Makefile b/arch/mips/fw/arc/Makefile index e0aaad482b0e..5314b37aff2c 100644 --- a/arch/mips/fw/arc/Makefile +++ b/arch/mips/fw/arc/Makefile
@@ -9,4 +9,4 @@ lib-$(CONFIG_ARC_MEMORY) += memory.o
9	lib-$(CONFIG_ARC_CONSOLE) += arc_con.o	9	lib-$(CONFIG_ARC_CONSOLE) += arc_con.o
10	lib-$(CONFIG_ARC_PROMLIB) += promlib.o	10	lib-$(CONFIG_ARC_PROMLIB) += promlib.o
11		11
12	EXTRA_CFLAGS += -Werror	12	ccflags-y := -Werror


diff --git a/arch/mips/jz4740/Makefile b/arch/mips/jz4740/Makefile index a604eaeb6c08..a9dff3321251 100644 --- a/arch/mips/jz4740/Makefile +++ b/arch/mips/jz4740/Makefile
@@ -17,4 +17,4 @@ obj-$(CONFIG_JZ4740_QI_LB60) += board-qi_lb60.o
17		17
18	obj-$(CONFIG_PM) += pm.o	18	obj-$(CONFIG_PM) += pm.o
19		19
20	EXTRA_CFLAGS += -Werror -Wall	20	ccflags-y := -Werror -Wall


diff --git a/arch/mips/oprofile/Makefile b/arch/mips/oprofile/Makefile index 02cc65e52d11..4b9d7044e26c 100644 --- a/arch/mips/oprofile/Makefile +++ b/arch/mips/oprofile/Makefile
@@ -1,4 +1,4 @@
1	EXTRA_CFLAGS := -Werror	1	ccflags-y := -Werror
2		2
3	obj-$(CONFIG_OPROFILE) += oprofile.o	3	obj-$(CONFIG_OPROFILE) += oprofile.o
4		4


diff --git a/arch/mips/pmc-sierra/yosemite/Makefile b/arch/mips/pmc-sierra/yosemite/Makefile index b16f95c3df65..02f5fb94ea28 100644 --- a/arch/mips/pmc-sierra/yosemite/Makefile +++ b/arch/mips/pmc-sierra/yosemite/Makefile
@@ -6,4 +6,4 @@ obj-y += irq.o prom.o py-console.o setup.o
6		6
7	obj-$(CONFIG_SMP) += smp.o	7	obj-$(CONFIG_SMP) += smp.o
8		8
9	EXTRA_CFLAGS += -Werror	9	ccflags-y := -Werror


diff --git a/arch/mips/powertv/Makefile b/arch/mips/powertv/Makefile index baf6e9092a9f..348d2e850ef5 100644 --- a/arch/mips/powertv/Makefile +++ b/arch/mips/powertv/Makefile
@@ -28,4 +28,4 @@ obj-y += init.o ioremap.o memory.o powertv_setup.o reset.o time.o \
28		28
29	obj-$(CONFIG_USB) += powertv-usb.o	29	obj-$(CONFIG_USB) += powertv-usb.o
30		30
31	EXTRA_CFLAGS += -Wall	31	ccflags-y := -Wall


diff --git a/arch/mips/powertv/asic/Makefile b/arch/mips/powertv/asic/Makefile index f0e95dc0ac97..d810a33182a4 100644 --- a/arch/mips/powertv/asic/Makefile +++ b/arch/mips/powertv/asic/Makefile
@@ -20,4 +20,4 @@ obj-y += asic-calliope.o asic-cronus.o asic-gaia.o asic-zeus.o \
20	asic_devices.o asic_int.o irq_asic.o prealloc-calliope.o \	20	asic_devices.o asic_int.o irq_asic.o prealloc-calliope.o \
21	prealloc-cronus.o prealloc-cronuslite.o prealloc-gaia.o prealloc-zeus.o	21	prealloc-cronus.o prealloc-cronuslite.o prealloc-gaia.o prealloc-zeus.o
22		22
23	EXTRA_CFLAGS += -Wall -Werror	23	ccflags-y := -Wall -Werror


diff --git a/arch/mips/powertv/pci/Makefile b/arch/mips/powertv/pci/Makefile index f5c62462fc9d..5783201cd2c8 100644 --- a/arch/mips/powertv/pci/Makefile +++ b/arch/mips/powertv/pci/Makefile
@@ -18,4 +18,4 @@
18		18
19	obj-$(CONFIG_PCI) += fixup-powertv.o	19	obj-$(CONFIG_PCI) += fixup-powertv.o
20		20
21	EXTRA_CFLAGS += -Wall -Werror	21	ccflags-y := -Wall -Werror


diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile index 8800cf090694..635d677d3281 100644 --- a/arch/s390/boot/Makefile +++ b/arch/s390/boot/Makefile
@@ -6,7 +6,7 @@ COMPILE_VERSION := __linux_compile_version_id__`hostname \| \
6	tr -c '[0-9A-Za-z]' '_'`__`date \| \	6	tr -c '[0-9A-Za-z]' '_'`__`date \| \
7	tr -c '[0-9A-Za-z]' '_'`_t	7	tr -c '[0-9A-Za-z]' '_'`_t
8		8
9	EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.	9	ccflags-y := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
10		10
11	targets := image	11	targets := image
12	targets += bzImage	12	targets += bzImage


diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index e5221ec0b8e3..860d26514c08 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile
@@ -8,7 +8,7 @@
8		8
9	common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)	9	common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
10		10
11	EXTRA_CFLAGS += -Ivirt/kvm -Iarch/s390/kvm	11	ccflags-y := -Ivirt/kvm -Iarch/s390/kvm
12		12
13	kvm-objs := $(common-objs) kvm-s390.o sie64a.o intercept.o interrupt.o priv.o sigp.o diag.o	13	kvm-objs := $(common-objs) kvm-s390.o sie64a.o intercept.o interrupt.o priv.o sigp.o diag.o
14	obj-$(CONFIG_KVM) += kvm.o	14	obj-$(CONFIG_KVM) += kvm.o


diff --git a/arch/s390/math-emu/Makefile b/arch/s390/math-emu/Makefile index c84890341052..51d399549f60 100644 --- a/arch/s390/math-emu/Makefile +++ b/arch/s390/math-emu/Makefile
@@ -4,4 +4,4 @@
4		4
5	obj-$(CONFIG_MATHEMU) := math.o	5	obj-$(CONFIG_MATHEMU) := math.o
6		6
7	EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w	7	ccflags-y := -I$(src) -Iinclude/math-emu -w


diff --git a/arch/um/sys-ppc/Makefile b/arch/um/sys-ppc/Makefile index b8bc844fd2c4..20d363bd7004 100644 --- a/arch/um/sys-ppc/Makefile +++ b/arch/um/sys-ppc/Makefile
@@ -6,7 +6,7 @@ OBJ = built-in.o
6	OBJS = ptrace.o sigcontext.o checksum.o miscthings.o misc.o \	6	OBJS = ptrace.o sigcontext.o checksum.o miscthings.o misc.o \
7	ptrace_user.o sysrq.o	7	ptrace_user.o sysrq.o
8		8
9	EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel	9	asflags-y := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
10		10
11	all: $(OBJ)	11	all: $(OBJ)
12		12
@@ -15,10 +15,10 @@ $(OBJ): $(OBJS)
15	$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@	15	$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
16		16
17	ptrace_user.o: ptrace_user.c	17	ptrace_user.o: ptrace_user.c
18	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<	18	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
19		19
20	sigcontext.o: sigcontext.c	20	sigcontext.o: sigcontext.c
21	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<	21	$(CC) $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
22		22
23	checksum.S:	23	checksum.S:
24	rm -f $@	24	rm -f $@
@@ -53,13 +53,13 @@ ppc_defs.h: mk_defs.c ppc_defs.head \
53	checksum.o: checksum.S	53	checksum.o: checksum.S
54	rm -f asm	54	rm -f asm
55	ln -s $(srctree)/include/asm-ppc asm	55	ln -s $(srctree)/include/asm-ppc asm
56	$(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o	56	$(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
57	rm -f asm	57	rm -f asm
58		58
59	misc.o: misc.S ppc_defs.h	59	misc.o: misc.S ppc_defs.h
60	rm -f asm	60	rm -f asm
61	ln -s $(srctree)/include/asm-ppc asm	61	ln -s $(srctree)/include/asm-ppc asm
62	$(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o	62	$(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
63	rm -f asm	63	rm -f asm
64		64
65	clean-files := $(OBJS) ppc_defs.h checksum.S mk_defs.c	65	clean-files := $(OBJS) ppc_defs.h checksum.S mk_defs.c


diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 40aa55b485be..70fd1453e172 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile
@@ -14,7 +14,7 @@ HOSTFLAGS += -Iarch/$(ARCH)/boot/include
14		14
15	BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ \| $(CC) -E - \| grep -v "\#")	15	BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ \| $(CC) -E - \| grep -v "\#")
16		16
17	export EXTRA_CFLAGS	17	export ccflags-y
18	export BIG_ENDIAN	18	export BIG_ENDIAN
19		19
20	subdir-y := lib	20	subdir-y := lib


diff --git a/arch/xtensa/boot/lib/Makefile b/arch/xtensa/boot/lib/Makefile index d3d2aa2d883a..ad8952e8a07f 100644 --- a/arch/xtensa/boot/lib/Makefile +++ b/arch/xtensa/boot/lib/Makefile
@@ -6,7 +6,7 @@ zlib := inffast.c inflate.c inftrees.c
6		6
7	lib-y += $(zlib:.c=.o) zmem.o	7	lib-y += $(zlib:.c=.o) zmem.o
8		8
9	EXTRA_CFLAGS += -Ilib/zlib_inflate	9	ccflags-y := -Ilib/zlib_inflate
10		10
11	quiet_cmd_copy_zlib = COPY $@	11	quiet_cmd_copy_zlib = COPY $@
12	cmd_copy_zlib = cat $< > $@	12	cmd_copy_zlib = cat $< > $@