From: Nathan Chancellor nathan@kernel.org

[ Upstream commit 6323c81350b73a4569cf52df85f80273faa64071 ]

Now that CONFIG_PAHOLE_VERSION exists, use it in the definition of CONFIG_PAHOLE_HAS_SPLIT_BTF and CONFIG_PAHOLE_HAS_BTF_TAG to reduce the amount of duplication across the tree.

Change-Id: Ie5ba17d96688dbcc385a9804ed96a59bda7a40df Signed-off-by: Nathan Chancellor nathan@kernel.org Signed-off-by: Daniel Borkmann daniel@iogearbox.net Acked-by: Andrii Nakryiko andrii@kernel.org Link: https://lore.kernel.org/bpf/20220201205624.652313-5-nathan@kernel.org [maennich: omitted patching non-existing config PAHOLE_HAS_BTF_TAG] Signed-off-by: Matthias Maennich maennich@google.com --- lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index f71db0cc3bf1..944fd2ae756b 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -328,7 +328,7 @@ config DEBUG_INFO_BTF DWARF type info into equivalent deduplicated BTF type info.

config PAHOLE_HAS_SPLIT_BTF - def_bool $(success, test `$(PAHOLE) --version | sed -E 's/v([0-9]+).([0-9]+)/\1\2/'` -ge "119") + def_bool PAHOLE_VERSION >= 119

config DEBUG_INFO_BTF_MODULES def_bool y