aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-06-18 13:48:08 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-18 11:10:58 -0700
commita1f42beb8e287482d1a802731d4fb7e2bdc2c703 (patch)
tree30c23c1eee0428da0aa6391874f9c9712b96c0c2 /Makefile
parentMerge branch 'hfsplus' (diff)
downloadlinux-dev-a1f42beb8e287482d1a802731d4fb7e2bdc2c703.tar.xz
linux-dev-a1f42beb8e287482d1a802731d4fb7e2bdc2c703.zip
Makefile: fix up CROSS_COMPILE and READABLE_ASM interaction.
When the READABLE_ASM cc-option tests were added they were done so prior to the arch Makefile include, resulting in cc-option being run on the host cc instead of the factoring in the cross prefix set up by the architecture. This bumps the include back up so that cc-option actually runs on the compiler that we're building with. Cc: Andi Kleen <andi@firstfloor.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b771af583389..462a0b4794b6 100644
--- a/Makefile
+++ b/Makefile
@@ -561,6 +561,8 @@ else
KBUILD_CFLAGS += -O2
endif
+include $(srctree)/arch/$(SRCARCH)/Makefile
+
ifdef CONFIG_READABLE_ASM
# Disable optimizations that make assembler listings hard to read.
# reorder blocks reorders the control in the function
@@ -571,8 +573,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-reorder-blocks,) \
$(call cc-option,-fno-partial-inlining)
endif
-include $(srctree)/arch/$(SRCARCH)/Makefile
-
ifneq ($(CONFIG_FRAME_WARN),0)
KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
endif