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

[mirror_ubuntu-artful-kernel.git] / arch / s390 / Makefile

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 68441e0e74b642d4d704e1b42b29c8307c938442..62a0da42c7fdee6b9198a277421ae9d0f61016d7 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -15,15 +15,15 @@
 
 ifndef CONFIG_64BIT
 LDFLAGS                := -m elf_s390
-CFLAGS         += -m31
+KBUILD_CFLAGS  += -m31
 AFLAGS         += -m31
 UTS_MACHINE    := s390
 STACK_SIZE     := 8192
-CHECKFLAGS     += -D__s390__
+CHECKFLAGS     += -D__s390__ -msize-long
 else
 LDFLAGS                := -m elf64_s390
 MODFLAGS       += -fpic -D__PIC__
-CFLAGS         += -m64
+KBUILD_CFLAGS  += -m64
 AFLAGS         += -m64
 UTS_MACHINE    := s390x
 STACK_SIZE     := 16384
@@ -77,8 +77,8 @@ cflags-$(CONFIG_WARN_STACK) += -mwarn-dynamicstack
 cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE)
 endif
 
-CFLAGS         += -mbackchain -msoft-float $(cflags-y)
-CFLAGS                 += -pipe -fno-strength-reduce -Wno-sign-compare 
+KBUILD_CFLAGS  += -mbackchain -msoft-float $(cflags-y)
+KBUILD_CFLAGS  += -pipe -fno-strength-reduce -Wno-sign-compare
 AFLAGS         += $(aflags-y)
 
 OBJCOPYFLAGS   := -O binary