projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mfd: rk8xx: add pm_shutdown callback in rk8xx_power_data
[firefly-linux-kernel-4.4.55.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 8f12571bd64fbd947bb2b3865a6fc17d2a51d06e..1207c3a1b47268fa724211392035cc7b2609ac68 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,6
@@
VERSION = 4
PATCHLEVEL = 4
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL =
6
+SUBLEVEL =
14
EXTRAVERSION =
NAME = Blurry Fish Butt
EXTRAVERSION =
NAME = Blurry Fish Butt
@@
-10,8
+10,6
@@
NAME = Blurry Fish Butt
# Comments in this file are targeted only to the developer, do not
# expect to learn how to build the kernel reading this file.
# Comments in this file are targeted only to the developer, do not
# expect to learn how to build the kernel reading this file.
-SUBLEVEL = 0
-
# o Do not use make's built-in rules and variables
# (this increases performance and avoids hard-to-debug behaviour);
# o Look for make include files relative to root of kernel src
# o Do not use make's built-in rules and variables
# (this increases performance and avoids hard-to-debug behaviour);
# o Look for make include files relative to root of kernel src
@@
-378,7
+376,7
@@
AFLAGS_MODULE =
LDFLAGS_MODULE =
CFLAGS_KERNEL =
AFLAGS_KERNEL =
LDFLAGS_MODULE =
CFLAGS_KERNEL =
AFLAGS_KERNEL =
-CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
+CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
-fno-tree-loop-im
# Use USERINCLUDE when you must reference the UAPI directories only.
# Use USERINCLUDE when you must reference the UAPI directories only.
@@
-696,9
+694,10
@@
KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
else
KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
else
-# Th
is warning
generated too much noise in a regular build.
-# Use make W=1 to enable th
is warning
(see scripts/Makefile.build)
+# Th
ese warnings
generated too much noise in a regular build.
+# Use make W=1 to enable th
em
(see scripts/Makefile.build)
KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
+KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
endif
ifdef CONFIG_FRAME_POINTER
endif
ifdef CONFIG_FRAME_POINTER
@@
-788,6
+787,11
@@
KBUILD_ARFLAGS := $(call ar-option,D)
ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)
KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)
KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
+else ifneq ($(findstring aarch64-linux-android, $(CROSS_COMPILE)),)
+# It seems than android gcc can't pass gcc-goto.sh check, but asm goto work.
+# So let's active it.
+ KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
+ KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
endif
include scripts/Makefile.kasan
endif
include scripts/Makefile.kasan