From: Nick Desaulniers <ndesaulniers@google.com>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org,
Michal Marek <michal.lkml@markovi.net>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 02/13] kbuild: rename __objtool_obj to objtool
Date: Tue, 31 Aug 2021 10:16:45 -0700 [thread overview]
Message-ID: <CAKwvOdn9661=wg3ErhaHM=QS4=zOqjK7_f7VqpTgUoGTGnzHsA@mail.gmail.com> (raw)
In-Reply-To: <20210831074004.3195284-3-masahiroy@kernel.org>
On Tue, Aug 31, 2021 at 12:40 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Rename __objtool_obj to objtool, and move it out of the
> 'ifndef CONFIG_LTO_CLANG' conditional, so it can be used for
> cmd_cc_lto_link_modules as well.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
>
> scripts/Makefile.build | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index 17508c0e4358..e78096cd396b 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -225,6 +225,8 @@ endif # CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
>
> ifdef CONFIG_STACK_VALIDATION
>
> +objtool := $(objtree)/tools/objtool/objtool
> +
> objtool_args = \
> $(if $(CONFIG_UNWINDER_ORC),orc generate,check) \
> $(if $(part-of-module), --module) \
> @@ -236,17 +238,15 @@ objtool_args = \
>
> ifndef CONFIG_LTO_CLANG
>
> -__objtool_obj := $(objtree)/tools/objtool/objtool
> -
> # 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory
> # 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file
> # 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file
> cmd_objtool = $(if $(patsubst y%,, \
> $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
> - $(__objtool_obj) $(objtool_args) $@)
> + $(objtool) $(objtool_args) $@)
> objtool_obj = $(if $(patsubst y%,, \
> $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
> - $(__objtool_obj))
> + $(objtool))
>
> endif # CONFIG_LTO_CLANG
> endif # CONFIG_STACK_VALIDATION
> @@ -300,8 +300,7 @@ cmd_cc_lto_link_modules = \
> ifdef CONFIG_STACK_VALIDATION
> # objtool was skipped for LLVM bitcode, run it now that we have compiled
> # modules into native code
> -cmd_cc_lto_link_modules += ; \
> - $(objtree)/tools/objtool/objtool $(objtool_args) --module $@
> +cmd_cc_lto_link_modules += ; $(objtool) $(objtool_args) --module $@
> endif
>
> $(obj)/%.lto.o: $(obj)/%.o FORCE
> --
> 2.30.2
>
--
Thanks,
~Nick Desaulniers
next prev parent reply other threads:[~2021-08-31 17:17 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 7:39 [PATCH v2 00/13] kbuild: second round of Clang LTO refactoring Masahiro Yamada
2021-08-31 7:39 ` [PATCH v2 01/13] kbuild: move objtool_args back to scripts/Makefile.build Masahiro Yamada
2021-09-04 18:18 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 02/13] kbuild: rename __objtool_obj to objtool Masahiro Yamada
2021-08-31 17:16 ` Nick Desaulniers [this message]
2021-08-31 17:29 ` Kees Cook
2021-09-04 18:19 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 03/13] kbuild: store the objtool command in *.cmd files Masahiro Yamada
2021-08-31 17:23 ` Nick Desaulniers
2021-08-31 17:30 ` Kees Cook
2021-09-04 18:04 ` Josh Poimboeuf
2021-09-04 18:45 ` Josh Poimboeuf
2021-09-08 16:12 ` Masahiro Yamada
2021-08-31 7:39 ` [PATCH v2 04/13] kbuild: factor out OBJECT_FILES_NON_STANDARD check into a macro Masahiro Yamada
2021-08-31 17:25 ` Nick Desaulniers
2021-08-31 17:31 ` Kees Cook
2021-09-04 18:59 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 05/13] kbuild: detect objtool update without using .SECONDEXPANSION Masahiro Yamada
2021-08-31 17:32 ` Kees Cook
2021-09-03 0:43 ` Masahiro Yamada
2021-08-31 17:33 ` Nick Desaulniers
2021-09-02 23:42 ` Masahiro Yamada
2021-09-04 19:04 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 06/13] kbuild: reuse $(cmd_objtool) for cmd_cc_lto_link_modules Masahiro Yamada
2021-08-31 17:35 ` Kees Cook
2021-09-03 0:39 ` Masahiro Yamada
2021-09-03 1:49 ` Kees Cook
2021-09-04 19:11 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 07/13] kbuild: do not create built-in.a.symversions or lib.a.symversions Masahiro Yamada
2021-08-31 17:36 ` Kees Cook
2021-08-31 7:39 ` [PATCH v2 08/13] kbuild: build modules in the same way with/without Clang LTO Masahiro Yamada
2021-08-31 17:39 ` Kees Cook
2021-08-31 17:46 ` Nick Desaulniers
2021-08-31 7:40 ` [PATCH v2 09/13] kbuild: add cmd_and_savecmd macro Masahiro Yamada
2021-08-31 17:39 ` Kees Cook
2021-08-31 7:40 ` [PATCH v2 10/13] kbuild: rebuild modules when objtool is updated for CONFIG_LTO_CLANG Masahiro Yamada
2021-08-31 17:40 ` Kees Cook
2021-09-04 19:13 ` Josh Poimboeuf
2021-08-31 7:40 ` [PATCH v2 11/13] kbuild: always postpone CRC links for module versioning Masahiro Yamada
2021-08-31 7:40 ` [PATCH v2 12/13] kbuild: merge cmd_modversions_c and cmd_modversions_S Masahiro Yamada
2021-08-31 7:40 ` [PATCH v2 13/13] kbuild: merge cmd_ar_builtin and cmd_ar_module Masahiro Yamada
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='CAKwvOdn9661=wg3ErhaHM=QS4=zOqjK7_f7VqpTgUoGTGnzHsA@mail.gmail.com' \
--to=ndesaulniers@google.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
/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;
as well as URLs for NNTP newsgroup(s).