From d97b0fdf991082116be3600630666dcb26b875e8 Mon Sep 17 00:00:00 2001 From: Torsten Duwe Date: Fri, 8 Feb 2019 16:10:14 +0100 Subject: [PATCH 0530/2944] kasan: Makefile: Replace -pg with CC_FLAGS_FTRACE commit e2092740b72384e95b9c8a418536b35d628a1642 upstream. In preparation for arm64 supporting ftrace built on other compiler options, let's have 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 Acked-by: Andrey Ryabinin Signed-off-by: Torsten Duwe Signed-off-by: Will Deacon Signed-off-by: Zou Cao Acked-by: Baoyou Xie --- mm/kasan/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/kasan/Makefile b/mm/kasan/Makefile index 3289db3..a7abd7c 100644 --- a/mm/kasan/Makefile +++ b/mm/kasan/Makefile @@ -3,7 +3,7 @@ KASAN_SANITIZE := n UBSAN_SANITIZE_kasan.o := n KCOV_INSTRUMENT := n -CFLAGS_REMOVE_kasan.o = -pg +CFLAGS_REMOVE_kasan.o = $(CC_FLAGS_FTRACE) # Function splitter causes unnecessary splits in __asan_load1/__asan_store1 # see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63533 CFLAGS_kasan.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -- 1.8.3.1