]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
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)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Tue, 19 Jul 2022 19:13:22 +0000 (16:13 -0300)
commite8a4d1adb1c6b7bd42a91b4c51a31337c7b95a4e
tree07efedf512774d3f7b8880edfcb482b5417659b5
parent4d9ea168e4f8470f44510026567f5ed4451cb90d
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>
CVE-2022-29900
CVE-2022-29901
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
scripts/Makefile.build
scripts/Makefile.lib