Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f42beb authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 39a50b42

Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -561,6 +561,8 @@ else 
KBUILD_CFLAGS	+= -O2

KBUILD_CFLAGS	+= -O2

endif

endif





include $(srctree)/arch/$(SRCARCH)/Makefile



ifdef CONFIG_READABLE_ASM

ifdef CONFIG_READABLE_ASM

# Disable optimizations that make assembler listings hard to read.

# Disable optimizations that make assembler listings hard to read.

# reorder blocks reorders the control in the function

# 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)

                 $(call cc-option,-fno-partial-inlining)

endif

endif





include $(srctree)/arch/$(SRCARCH)/Makefile



ifneq ($(CONFIG_FRAME_WARN),0)

ifneq ($(CONFIG_FRAME_WARN),0)

KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})

KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})

endif

endif