Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edf072d3 authored Feb 08, 2019 by Torsten Duwe Committed by Will Deacon Apr 09, 2019

arm64: Makefile: Replace -pg with CC_FLAGS_FTRACE



In preparation for arm64 supporting ftrace built on other compiler
options, let's have the arm64 Makefiles remove the $(CC_FLAGS_FTRACE)
flags, whatever these may be, rather than assuming '-pg'.

There should be no functional change as a result of this patch.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Torsten Duwe <duwe@suse.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent f6e56435

arch/arm64/kernel/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,9 +7,9 @@ CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
		AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
		CFLAGS_armv8_deprecated.o := -I$(src)

		CFLAGS_REMOVE_ftrace.o = -pg
		CFLAGS_REMOVE_insn.o = -pg
		CFLAGS_REMOVE_return_address.o = -pg
		CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)
		CFLAGS_REMOVE_insn.o = $(CC_FLAGS_FTRACE)
		CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE)

		# Object file lists.
		obj-y := debug-monitors.o entry.o irq.o fpsimd.o \

arch/arm64/lib/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ CFLAGS_atomic_ll_sc.o := -ffixed-x1 -ffixed-x2 \
		-fcall-saved-x10 -fcall-saved-x11 -fcall-saved-x12 \
		-fcall-saved-x13 -fcall-saved-x14 -fcall-saved-x15 \
		-fcall-saved-x18 -fomit-frame-pointer
		CFLAGS_REMOVE_atomic_ll_sc.o := -pg
		CFLAGS_REMOVE_atomic_ll_sc.o := $(CC_FLAGS_FTRACE)
		GCOV_PROFILE_atomic_ll_sc.o := n
		KASAN_SANITIZE_atomic_ll_sc.o := n
		KCOV_INSTRUMENT_atomic_ll_sc.o := n