aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index d845c2a1aa68..3fdfde2c1b7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1VERSION = 3 1VERSION = 3
2PATCHLEVEL = 5 2PATCHLEVEL = 5
3SUBLEVEL = 0 3SUBLEVEL = 0
4EXTRAVERSION = -rc2 4EXTRAVERSION = -rc4
5NAME = Saber-toothed Squirrel 5NAME = Saber-toothed Squirrel
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*
@@ -561,6 +561,8 @@ else
561KBUILD_CFLAGS += -O2 561KBUILD_CFLAGS += -O2
562endif 562endif
563 563
564include $(srctree)/arch/$(SRCARCH)/Makefile
565
564ifdef CONFIG_READABLE_ASM 566ifdef CONFIG_READABLE_ASM
565# Disable optimizations that make assembler listings hard to read. 567# Disable optimizations that make assembler listings hard to read.
566# reorder blocks reorders the control in the function 568# reorder blocks reorders the control in the function
@@ -571,8 +573,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-reorder-blocks,) \
571 $(call cc-option,-fno-partial-inlining) 573 $(call cc-option,-fno-partial-inlining)
572endif 574endif
573 575
574include $(srctree)/arch/$(SRCARCH)/Makefile
575
576ifneq ($(CONFIG_FRAME_WARN),0) 576ifneq ($(CONFIG_FRAME_WARN),0)
577KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN}) 577KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
578endif 578endif