kbuild: enable 'make CFLAGS=...' to add additional options to CC

[linux-3.10.git] / arch / m32r / Makefile

diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile
index 229f66fc8e5eb4c1501b5a89815fbf792cfbbb09..c80618ab60ea82bb480441a30ab0d570dd561580 100644 (file)
--- a/arch/m32r/Makefile
+++ b/arch/m32r/Makefile
@@ -7,36 +7,37 @@
 
 LDFLAGS                :=
 OBJCOPYFLAGS   := -O binary -R .note -R .comment -S
-LDFLAGS_vmlinux        := -e startup_32
+LDFLAGS_vmlinux        :=
 
-CFLAGS += -pipe -fno-schedule-insns
+KBUILD_CFLAGS += -pipe -fno-schedule-insns
 CFLAGS_KERNEL += -mmodel=medium
 CFLAGS_MODULE += -mmodel=large
 
 ifdef CONFIG_CHIP_VDEC2
 cflags-$(CONFIG_ISA_M32R2)     += -DNO_FPU -Wa,-bitinst
-aflags-$(CONFIG_ISA_M32R2)     += -DNO_FPU -Wa,-bitinst
+aflags-$(CONFIG_ISA_M32R2)     += -DNO_FPU -O2 -Wa,-bitinst -Wa,-no-parallel
 else
 cflags-$(CONFIG_ISA_M32R2)     += -DNO_FPU -m32r2
-aflags-$(CONFIG_ISA_M32R2)     += -DNO_FPU -m32r2
+aflags-$(CONFIG_ISA_M32R2)     += -DNO_FPU -m32r2 -O2
 endif
 
 cflags-$(CONFIG_ISA_M32R)      += -DNO_FPU
-aflags-$(CONFIG_ISA_M32R)      += -DNO_FPU -Wa,-no-bitinst
+aflags-$(CONFIG_ISA_M32R)      += -DNO_FPU -O2 -Wa,-no-bitinst
 
-CFLAGS += $(cflags-y)
+KBUILD_CFLAGS += $(cflags-y)
 AFLAGS += $(aflags-y)
 
 CHECKFLAGS     += -D__m32r__ -D__BIG_ENDIAN__=1
 
 head-y := arch/m32r/kernel/head.o arch/m32r/kernel/init_task.o
 
-LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
 libs-y += arch/m32r/lib/ $(LIBGCC)
 core-y += arch/m32r/kernel/    \
           arch/m32r/mm/        \
-          arch/m32r/boot/
+          arch/m32r/boot/      \
+          arch/m32r/platforms/
 
 drivers-$(CONFIG_OPROFILE)     += arch/m32r/oprofile/