aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickhu <nickhu@andestech.com>2018-10-18 16:37:55 +0800
committerGreentime Hu <greentime@andestech.com>2018-11-06 18:01:39 +0800
commit4c3d6174e0e17599549f636ec48ddf78627a17fe (patch)
tree55fd42a26bc0be95d14f48d4aa1445594421cd75
parentnds32: Fill all TLB entries with kernel image mapping (diff)
downloadlinux-dev-4c3d6174e0e17599549f636ec48ddf78627a17fe.tar.xz
linux-dev-4c3d6174e0e17599549f636ec48ddf78627a17fe.zip
nds32: Fix gcc 8.0 compiler option incompatible.
When the kernel configs of ftrace and frame pointer options are choosed, the compiler option of kernel will incompatible. Error message: nds32le-linux-gcc: error: -pg and -fomit-frame-pointer are incompatible Signed-off-by: Nickhu <nickhu@andestech.com> Signed-off-by: Zong Li <zong@andestech.com> Acked-by: Greentime Hu <greentime@andestech.com> Signed-off-by: Greentime Hu <greentime@andestech.com>
-rw-r--r--arch/nds32/mm/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/nds32/mm/Makefile b/arch/nds32/mm/Makefile
index 6b6855852223..7c5c15ad854a 100644
--- a/arch/nds32/mm/Makefile
+++ b/arch/nds32/mm/Makefile
@@ -4,4 +4,8 @@ obj-y := extable.o tlb.o \
obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o
obj-$(CONFIG_HIGHMEM) += highmem.o
-CFLAGS_proc-n13.o += -fomit-frame-pointer
+
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_proc.o = $(CC_FLAGS_FTRACE)
+endif
+CFLAGS_proc.o += -fomit-frame-pointer