diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-26 09:44:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-26 09:44:36 -0700 |
| commit | af8159515fe16070aefa3ff56a44a5e7fb179dd2 (patch) | |
| tree | 8bbcf84fde2ea73c881f23ca4d080ccdff4a4286 | |
| parent | 1bc9743b6452cb5a4d09944bd3d6e33b074bb22d (diff) | |
| parent | 49c98f30f4021b560676a336f8a46a4f642eee2b (diff) | |
| download | linux-af8159515fe16070aefa3ff56a44a5e7fb179dd2.tar.gz linux-af8159515fe16070aefa3ff56a44a5e7fb179dd2.tar.bz2 linux-af8159515fe16070aefa3ff56a44a5e7fb179dd2.zip | |
Merge tag 'objtool_urgent_for_v6.18_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fixes from Borislav Petkov:
- Fix x32 build due to wrong format specifier on that sub-arch
- Add one more Rust noreturn function to objtool's list
* tag 'objtool_urgent_for_v6.18_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Fix failure when being compiled on x32 system
objtool/rust: add one more `noreturn` Rust function
| -rw-r--r-- | tools/objtool/check.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index a5770570b106..620854fdaaf6 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -217,6 +217,7 @@ static bool is_rust_noreturn(const struct symbol *func) * these come from the Rust standard library). */ return str_ends_with(func->name, "_4core5sliceSp15copy_from_slice17len_mismatch_fail") || + str_ends_with(func->name, "_4core6option13expect_failed") || str_ends_with(func->name, "_4core6option13unwrap_failed") || str_ends_with(func->name, "_4core6result13unwrap_failed") || str_ends_with(func->name, "_4core9panicking5panic") || @@ -4710,8 +4711,8 @@ static int check_abs_references(struct objtool_file *file) for_each_reloc(sec->rsec, reloc) { if (arch_absolute_reloc(file->elf, reloc)) { - WARN("section %s has absolute relocation at offset 0x%lx", - sec->name, reloc_offset(reloc)); + WARN("section %s has absolute relocation at offset 0x%llx", + sec->name, (unsigned long long)reloc_offset(reloc)); ret++; } } |