From: Sergei Shtylyov <sergei.shtylyov@gmail.com>
To: zhaoxiao <zhaoxiao@uniontech.com>,
tsbogend@alpha.franken.de, jiaxun.yang@flygoat.com,
chenhuacai@kernel.org, viro@zeniv.linux.org.uk, morbo@google.com
Cc: paul@crapouillou.net, alobakin@pm.me, suxingxing@loongson.cn,
tangyouling@loongson.cn, yangtiezhu@loongson.cn,
ralf@linux-mips.org, nathan@kernel.org, masahiroy@kernel.org,
keescook@chromium.org, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] MIPS: Makefile: Replace -pg with CC_FLAGS_FTRACE
Date: Mon, 19 Apr 2021 12:18:21 +0300 [thread overview]
Message-ID: <167b7021-d471-89f0-4446-b1d022bdf6c9@gmail.com> (raw)
In-Reply-To: <20210419055156.22195-1-zhaoxiao@uniontech.com>
Hello!
On 19.04.2021 8:51, zhaoxiao wrote:
> In preparation for mips supporting ftrace built on other compiler
> options, let's have the mips Makefiles remove the $(CC_FLAGS_FTRACE)
> flags, whatever these may be, rather than assuming '-pg'.
But your patch is adding 'em, not removing?
> Signed-off-by: zhaoxiao <zhaoxiao@uniontech.com>
> ---
> v2:add this same change be appropriate to all of the below Makefile.
> 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 f93f72bcba97..e4b7839293e1 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 b4a57f1de772..814b3da30501 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 2131d3fd7333..1b2ea34c3d3b 100644
> --- a/arch/mips/vdso/Makefile
> +++ b/arch/mips/vdso/Makefile
> @@ -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
MBR, Sergei
prev parent reply other threads:[~2021-04-19 9:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 5:51 zhaoxiao
2021-04-19 9:18 ` Sergei Shtylyov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=167b7021-d471-89f0-4446-b1d022bdf6c9@gmail.com \
--to=sergei.shtylyov@gmail.com \
--cc=alobakin@pm.me \
--cc=chenhuacai@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=paul@crapouillou.net \
--cc=ralf@linux-mips.org \
--cc=suxingxing@loongson.cn \
--cc=tangyouling@loongson.cn \
--cc=tsbogend@alpha.franken.de \
--cc=viro@zeniv.linux.org.uk \
--cc=yangtiezhu@loongson.cn \
--cc=zhaoxiao@uniontech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®