[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241009182709.GA3274931@thelio-3990X>
Date: Wed, 9 Oct 2024 11:27:09 -0700
From: Nathan Chancellor <nathan@...nel.org>
To: Masahiro Yamada <masahiroy@...nel.org>
Cc: linux-kbuild@...r.kernel.org, Miguel Ojeda <ojeda@...nel.org>,
Matthew Maurer <mmaurer@...gle.com>,
Alice Ryhl <aliceryhl@...gle.com>, rust-for-linux@...r.kernel.org,
Alex Gaynor <alex.gaynor@...il.com>,
Andreas Hindborg <a.hindborg@...nel.org>,
Benno Lossin <benno.lossin@...ton.me>,
Björn Roy Baron <bjorn3_gh@...tonmail.com>,
Boqun Feng <boqun.feng@...il.com>, Gary Guo <gary@...yguo.net>,
Nicolas Schier <nicolas@...sle.eu>,
Trevor Gross <tmgross@...ch.edu>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] kbuild: refactor cc-option-yn, cc-disable-warning,
rust-option-yn macros
On Wed, Oct 09, 2024 at 07:27:37PM +0900, Masahiro Yamada wrote:
> cc-option-yn and cc-disable-warning duplicate the compile command seen
> a few lines above. These can be defined based on cc-option.
>
> I also refactored rustc-option-yn in the same way, although there are
> currently no users of it.
>
> Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>
Neat!
Reviewed-by: Nathan Chancellor <nathan@...nel.org>
> ---
>
> This avoids applying similar fixes to rustc-option and rustc-option-yn.
>
> scripts/Makefile.compiler | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/Makefile.compiler b/scripts/Makefile.compiler
> index 057305eae85c..73d611d383b2 100644
> --- a/scripts/Makefile.compiler
> +++ b/scripts/Makefile.compiler
> @@ -53,13 +53,11 @@ cc-option = $(call __cc-option, $(CC),\
>
> # cc-option-yn
> # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
> -cc-option-yn = $(call try-run,\
> - $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
> +cc-option-yn = $(if $(call cc-option,$1),y,n)
>
> # cc-disable-warning
> # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
> -cc-disable-warning = $(call try-run,\
> - $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
> +cc-disable-warning = $(if $(call cc-option,-W$(strip $1)),-Wno-$(strip $1))
>
> # gcc-min-version
> # Usage: cflags-$(call gcc-min-version, 70100) += -foo
> @@ -85,5 +83,4 @@ rustc-option = $(call __rustc-option, $(RUSTC),\
>
> # rustc-option-yn
> # Usage: flag := $(call rustc-option-yn,-Cinstrument-coverage)
> -rustc-option-yn = $(call try-run,\
> - $(RUSTC) $(KBUILD_RUSTFLAGS) $(1) --crate-type=rlib /dev/null --out-dir=$$TMPOUT -o "$$TMP",y,n)
> +rustc-option-yn = $(if $(call rustc-option,$1),y,n)
> --
> 2.43.0
>
Powered by blists - more mailing lists