diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2018-09-14 15:08:53 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-13 09:51:05 +0100 |
| commit | 24e26062b90efe03e6f1cca51bd880353ae87d99 (patch) | |
| tree | c9e2cec34237e916c6718f7d58bdbbdcfff8de9a /arch/powerpc/Makefile | |
| parent | 5b59eeba6b00ddceae41e06f363d63bb77b53d7e (diff) | |
| download | linux-stable-24e26062b90efe03e6f1cca51bd880353ae87d99.tar.gz linux-stable-24e26062b90efe03e6f1cca51bd880353ae87d99.tar.bz2 linux-stable-24e26062b90efe03e6f1cca51bd880353ae87d99.zip | |
powerpc: consolidate -mno-sched-epilog into FTRACE flags
commit 2a056f58fd33ccc6a0261b552b0f17e7fa4a12f3 upstream.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/Makefile')
| -rw-r--r-- | arch/powerpc/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index b2f6e078a357..5fcec0e09668 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -160,8 +160,13 @@ else CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 endif +ifdef CONFIG_FUNCTION_TRACER +CC_FLAGS_FTRACE := -pg ifdef CONFIG_MPROFILE_KERNEL - CC_FLAGS_FTRACE := -pg -mprofile-kernel +CC_FLAGS_FTRACE += -mprofile-kernel +endif +# Work around a gcc code-gen bug with -fno-omit-frame-pointer. +CC_FLAGS_FTRACE += -mno-sched-epilog endif CFLAGS-$(CONFIG_TARGET_CPU_BOOL) += $(call cc-option,-mcpu=$(CONFIG_TARGET_CPU)) @@ -229,11 +234,6 @@ ifdef CONFIG_6xx KBUILD_CFLAGS += -mcpu=powerpc endif -# Work around a gcc code-gen bug with -fno-omit-frame-pointer. -ifdef CONFIG_FUNCTION_TRACER -KBUILD_CFLAGS += -mno-sched-epilog -endif - cpu-as-$(CONFIG_4xx) += -Wa,-m405 cpu-as-$(CONFIG_ALTIVEC) += $(call as-option,-Wa$(comma)-maltivec) cpu-as-$(CONFIG_E200) += -Wa,-me200 |