Commit 1b6bc35a authored Apr 20, 2021 by zhaoxiao Committed by Thomas Bogendoerfer Apr 21, 2021

MIPS: Makefile: Replace -pg with CC_FLAGS_FTRACE



This patch replaces the "open-coded" -pg compile flag with a CC_FLAGS_FTRACE
makefile variable which architectures can override if a different option
should be used for code generation.

Signed-off-by: zhaoxiao <zhaoxiao@uniontech.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

parent 987b4207

arch/mips/boot/compressed/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

arch/mips/kernel/Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -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

arch/mips/vdso/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,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
		@@ -60,7 +60,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