From: Milton Miller Date: Sat, 20 Oct 2007 08:58:03 +0000 (-0500) Subject: kbuild: restore arch/{ppc/xtensa}/boot cflags X-Git-Tag: v2.6.24-rc1~119^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=437374e9a95062fe310b901e48585691edaf5dd0;p=linux-2.6-omap-h63xx.git kbuild: restore arch/{ppc/xtensa}/boot cflags Commit 9a39e273d4df0560c724c5fe71f6314a0583ca2b removed the boot directory addition to CFLAGS that was being used by the subdirectory builds. For the other files, that patch set EXTRA_CFLAGS, but Makefile.build explicitly sets that to empty as it is explicitly for a single directory only. Append to KBUILD_CFLAGS instead. Signed-off-by: Milton Miller Signed-off-by: Sam Ravnborg --- diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile index 487dc66dcc7..500497e3c72 100644 --- a/arch/ppc/boot/Makefile +++ b/arch/ppc/boot/Makefile @@ -13,6 +13,8 @@ # modified by Cort (cort@cs.nmt.edu) # +# KBUILD_CFLAGS used when building rest of boot (takes effect recursively) +KBUILD_CFLAGS += -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include HOSTCFLAGS += -Iarch/$(ARCH)/boot/include BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 9c5185f605b..40aa55b485b 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile @@ -8,7 +8,8 @@ # -EXTRA_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include +# KBUILD_CFLAGS used when building rest of boot (takes effect recursively) +KBUILD_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include HOSTFLAGS += -Iarch/$(ARCH)/boot/include BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")