arm64: Makefile: Replace -pg with CC_FLAGS_FTRACE

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Torsten Duwe and committed by

Will Deacon 7 years ago edf072d3 f6e56435

+4 -4

2 changed files

expand all

arch

arm64

kernel

Makefile

lib

Makefile

+3 -3

arch/arm64/kernel/Makefile

··· 7 7 AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) 8 8 CFLAGS_armv8_deprecated.o := -I$(src) 9 9 10 - CFLAGS_REMOVE_ftrace.o = -pg 11 - CFLAGS_REMOVE_insn.o = -pg 12 - CFLAGS_REMOVE_return_address.o = -pg 10 + CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) 11 + CFLAGS_REMOVE_insn.o = $(CC_FLAGS_FTRACE) 12 + CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE) 13 13 14 14 # Object file lists. 15 15 obj-y := debug-monitors.o entry.o irq.o fpsimd.o \

+1 -1

arch/arm64/lib/Makefile

··· 24 24 -fcall-saved-x10 -fcall-saved-x11 -fcall-saved-x12 \ 25 25 -fcall-saved-x13 -fcall-saved-x14 -fcall-saved-x15 \ 26 26 -fcall-saved-x18 -fomit-frame-pointer 27 - CFLAGS_REMOVE_atomic_ll_sc.o := -pg 27 + CFLAGS_REMOVE_atomic_ll_sc.o := $(CC_FLAGS_FTRACE) 28 28 GCOV_PROFILE_atomic_ll_sc.o := n 29 29 KASAN_SANITIZE_atomic_ll_sc.o := n 30 30 KCOV_INSTRUMENT_atomic_ll_sc.o := n