kbuild: move objtool_args back to scripts/Makefile.build
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 31 Aug 2021 07:39:52 +0000 (16:39 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 15 May 2022 18:18:50 +0000 (20:18 +0200)
commitd11f96d0c0c30e6ed73049c752a1ca7621e7062f
treee32f704d5b25079ca31388539bb80e16bbad9023
parentf835241fdb0f018e8d796e0151697e8431b6631b
kbuild: move objtool_args back to scripts/Makefile.build

[ Upstream commit 8f0c32c788fffa8e88f995372415864039347c8a ]

Commit b1a1a1a09b46 ("kbuild: lto: postpone objtool") moved objtool_args
to Makefile.lib, so the arguments can be used in Makefile.modfinal as
well as Makefile.build.

With commit 850ded46c642 ("kbuild: Fix TRIM_UNUSED_KSYMS with
LTO_CLANG"), module LTO linking came back to scripts/Makefile.build
again.

So, there is no more reason to keep objtool_args in a separate file.

Get it back to the original place, close to the objtool command.

Remove the stale comment too.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
scripts/Makefile.build
scripts/Makefile.lib