diff options
| author | Vincent Wiemann <webmaster@codefetch.de> | 2018-06-09 22:56:47 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-06-18 21:21:56 +0200 |
| commit | b85e150182258739a14d3625605766775a939977 (patch) | |
| tree | 25b8221b198122396d86e724b9873a121b5b013c /target | |
| parent | b3b81d9d2a33dcf50ced5d42357a82b2555600bd (diff) | |
| download | upstream-b85e150182258739a14d3625605766775a939977.tar.gz upstream-b85e150182258739a14d3625605766775a939977.tar.bz2 upstream-b85e150182258739a14d3625605766775a939977.zip | |
mips: fix dynamic ftrace
The kernel patch *-mips_module_reloc.patch breaks dynamic ftrace as
dynamic ftrace depends on -mlong-calls.
See http://patchwork.linux-mips.org/patch/675/
Thus we always set -mlong-calls if the kernel is being
compiled with dynamic ftrace support.
Signed-off-by: Vincent Wiemann <webmaster@codefetch.de>
(cherry picked from commit 076d2ea6829855ee14ebd65230146eb27ee16750)
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/pending-4.9/305-mips_module_reloc.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.9/305-mips_module_reloc.patch b/target/linux/generic/pending-4.9/305-mips_module_reloc.patch index fc8015b5f6..10d9f0bdd5 100644 --- a/target/linux/generic/pending-4.9/305-mips_module_reloc.patch +++ b/target/linux/generic/pending-4.9/305-mips_module_reloc.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -93,8 +93,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin +@@ -93,8 +93,18 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely cflags-y += -msoft-float LDFLAGS_vmlinux += -G 0 -static -n -nostdlib @@ -19,8 +19,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> KBUILD_AFLAGS_MODULE += -mlong-calls KBUILD_CFLAGS_MODULE += -mlong-calls +else -+KBUILD_AFLAGS_MODULE += -mno-long-calls -+KBUILD_CFLAGS_MODULE += -mno-long-calls ++ ifdef CONFIG_DYNAMIC_FTRACE ++ KBUILD_AFLAGS_MODULE += -mlong-calls ++ KBUILD_CFLAGS_MODULE += -mlong-calls ++ else ++ KBUILD_AFLAGS_MODULE += -mno-long-calls ++ KBUILD_CFLAGS_MODULE += -mno-long-calls ++ endif +endif ifeq ($(CONFIG_RELOCATABLE),y) |