On Wed, Feb 22, 2023 at 11:21:45AM +0000, maennich@xxxxxxxxxx wrote: > From: Nathan Chancellor <nathan@xxxxxxxxxx> > > 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. > > Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx> > Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx> > Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx> > Link: https://lore.kernel.org/bpf/20220201205624.652313-5-nathan@xxxxxxxxxx > Signed-off-by: Matthias Maennich <maennich@xxxxxxxxxx> > --- > lib/Kconfig.debug | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug > index f71db0cc3bf1..0743c9567d7e 100644 > --- a/lib/Kconfig.debug > +++ b/lib/Kconfig.debug > @@ -328,7 +328,15 @@ 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 PAHOLE_HAS_BTF_TAG > + def_bool PAHOLE_VERSION >= 123 > + depends on CC_IS_CLANG > + help > + Decide whether pahole emits btf_tag attributes (btf_type_tag and > + btf_decl_tag) or not. Currently only clang compiler implements > + these attributes, so make the config depend on CC_IS_CLANG. Note, this is very different from the original commit, are you sure this is correct? You took a MAINTAINERS file update in patch 1/5 to make a later patch simpler, but yet you massively changed this commit and included stuff from a different one and did not mention it anywhere? Please fix this commit up, and resubmit the whole series with the git commit ids in the commits to make it easier for me to review and apply properly. thanks, greg k-h
