Skip to content

Commit a951884

Browse files
arndbmasahir0y
authored andcommitted
kallsyms: ignore ARMv4 thunks along with others
lld is now able to build ARMv4 and ARMv4T kernels, which means it can generate thunks for those (__ARMv4PILongThunk_*, __ARMv4PILongBXThunk_*) that can interfere with kallsyms table generation since they do not get ignore like the corresponding ARMv5+ ones are: Inconsistent kallsyms data Try "make KALLSYMS_EXTRA_PASS=1" as a workaround Replace the hardcoded list of thunk symbols with a more general regex that covers this one along with future symbols that follow the same pattern. Fixes: 5eb6e28 ("ARM: 9289/1: Allow pre-ARMv5 builds with ld.lld 16.0.0 and newer") Fixes: efe6e30 ("kallsyms: fix nonconverging kallsyms table with lld") Suggested-by: Masahiro Yamada <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 5d9a16b commit a951884

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

scripts/mksysmap

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,8 @@ ${NM} -n ${1} | sed >${2} -e "
4848
/ __kvm_nvhe_\\$/d
4949
/ __kvm_nvhe_\.L/d
5050
51-
# arm64 lld
52-
/ __AArch64ADRPThunk_/d
53-
54-
# arm lld
55-
/ __ARMV5PILongThunk_/d
56-
/ __ARMV7PILongThunk_/d
57-
/ __ThumbV7PILongThunk_/d
58-
59-
# mips lld
60-
/ __LA25Thunk_/d
61-
/ __microLA25Thunk_/d
51+
# lld arm/aarch64/mips thunks
52+
/ __[[:alnum:]]*Thunk_/d
6253
6354
# CFI type identifiers
6455
/ __kcfi_typeid_/d

0 commit comments

Comments
 (0)