On Thu, Mar 25, 2021 at 03:38:14PM -0400, Steven Rostedt wrote: > On Sat, 13 Mar 2021 14:41:44 +0800 > Huang Pei <huangpei@xxxxxxxxxxx> wrote: > > > Even simple changes require change logs. For example: > > "Enabling ftrace may require more than just the -pg flags today. As ftrace > enables more flags, use the $(CC_FLAGS_FTRACE) in the make file instead of > hard coding "-pg"." > > Other than that: > > Acked-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> > > -- Steve > Got it, much better than mine, thank you > > > Signed-off-by: Huang Pei <huangpei@xxxxxxxxxxx> > > --- > > arch/mips/boot/compressed/Makefile | 2 +- > > arch/mips/kernel/Makefile | 8 ++++---- > > arch/mips/vdso/Makefile | 4 ++-- > > 3 files changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile > > index d66511825fe1..8fc9ceeec709 100644 > > --- a/arch/mips/boot/compressed/Makefile > > +++ b/arch/mips/boot/compressed/Makefile > > @@ -18,7 +18,7 @@ include $(srctree)/arch/mips/Kbuild.platforms > > BOOT_HEAP_SIZE := 0x400000 > > > > # Disable Function Tracer > > -KBUILD_CFLAGS := $(filter-out -pg, $(KBUILD_CFLAGS)) > > +KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_FTRACE), $(KBUILD_CFLAGS)) > > > > KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS)) > > > > diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile > > index 2a05b923f579..33e31ea10234 100644 > > --- a/arch/mips/kernel/Makefile > > +++ b/arch/mips/kernel/Makefile > > @@ -17,10 +17,10 @@ obj-y += cpu-probe.o > > endif > > > > ifdef CONFIG_FUNCTION_TRACER > > -CFLAGS_REMOVE_ftrace.o = -pg > > -CFLAGS_REMOVE_early_printk.o = -pg > > -CFLAGS_REMOVE_perf_event.o = -pg > > -CFLAGS_REMOVE_perf_event_mipsxx.o = -pg > > +CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) > > +CFLAGS_REMOVE_early_printk.o = $(CC_FLAGS_FTRACE) > > +CFLAGS_REMOVE_perf_event.o = $(CC_FLAGS_FTRACE) > > +CFLAGS_REMOVE_perf_event_mipsxx.o = $(CC_FLAGS_FTRACE) > > endif > > > > obj-$(CONFIG_CEVT_BCM1480) += cevt-bcm1480.o > > diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile > > index 5810cc12bc1d..f21cf88f7ae3 100644 > > --- a/arch/mips/vdso/Makefile > > +++ b/arch/mips/vdso/Makefile > > @@ -49,7 +49,7 @@ CFLAGS_vgettimeofday-o32.o = -include $(srctree)/$(src)/config-n32-o32-env.c -in > > CFLAGS_vgettimeofday-n32.o = -include $(srctree)/$(src)/config-n32-o32-env.c -include $(c-gettimeofday-y) > > endif > > > > -CFLAGS_REMOVE_vgettimeofday.o = -pg > > +CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) > > > > ifdef CONFIG_MIPS_DISABLE_VDSO > > ifndef CONFIG_MIPS_LD_CAN_LINK_VDSO > > @@ -63,7 +63,7 @@ ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ > > $(filter -E%,$(KBUILD_CFLAGS)) -nostdlib -shared \ > > -G 0 --eh-frame-hdr --hash-style=sysv --build-id=sha1 -T > > > > -CFLAGS_REMOVE_vdso.o = -pg > > +CFLAGS_REMOVE_vdso.o = $(CC_FLAGS_FTRACE) > > > > GCOV_PROFILE := n > > UBSAN_SANITIZE := n
