File tree 3 files changed +14
-1
lines changed
3 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -1935,7 +1935,7 @@ config RUST
1935
1935
depends on !MODVERSIONS
1936
1936
depends on !GCC_PLUGINS
1937
1937
depends on !RANDSTRUCT
1938
- depends on !DEBUG_INFO_BTF
1938
+ depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
1939
1939
select CONSTRUCTORS
1940
1940
help
1941
1941
Enables Rust support in the kernel.
Original file line number Diff line number Diff line change @@ -389,6 +389,15 @@ config PAHOLE_HAS_BTF_TAG
389
389
btf_decl_tag) or not. Currently only clang compiler implements
390
390
these attributes, so make the config depend on CC_IS_CLANG.
391
391
392
+ config PAHOLE_HAS_LANG_EXCLUDE
393
+ def_bool PAHOLE_VERSION >= 124
394
+ help
395
+ Support for the --lang_exclude flag which makes pahole exclude
396
+ compilation units from the supplied language. Used in Kbuild to
397
+ omit Rust CUs which are not supported in version 1.24 of pahole,
398
+ otherwise it would emit malformed kernel and module binaries when
399
+ using DEBUG_INFO_BTF_MODULES.
400
+
392
401
config DEBUG_INFO_BTF_MODULES
393
402
def_bool y
394
403
depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
Original file line number Diff line number Diff line change 19
19
if [ " ${pahole_ver} " -ge " 122" ]; then
20
20
extra_paholeopt=" ${extra_paholeopt} -j"
21
21
fi
22
+ if [ " ${pahole_ver} " -ge " 124" ]; then
23
+ # see PAHOLE_HAS_LANG_EXCLUDE
24
+ extra_paholeopt=" ${extra_paholeopt} --lang_exclude=rust"
25
+ fi
22
26
23
27
echo ${extra_paholeopt}
You can’t perform that action at this time.
0 commit comments