Skip to content

Commit af81595

Browse files
committed
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
2 parents 1bc9743 + 49c98f3 commit af81595

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tools/objtool/check.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ static bool is_rust_noreturn(const struct symbol *func)
217217
* these come from the Rust standard library).
218218
*/
219219
return str_ends_with(func->name, "_4core5sliceSp15copy_from_slice17len_mismatch_fail") ||
220+
str_ends_with(func->name, "_4core6option13expect_failed") ||
220221
str_ends_with(func->name, "_4core6option13unwrap_failed") ||
221222
str_ends_with(func->name, "_4core6result13unwrap_failed") ||
222223
str_ends_with(func->name, "_4core9panicking5panic") ||
@@ -4710,8 +4711,8 @@ static int check_abs_references(struct objtool_file *file)
47104711

47114712
for_each_reloc(sec->rsec, reloc) {
47124713
if (arch_absolute_reloc(file->elf, reloc)) {
4713-
WARN("section %s has absolute relocation at offset 0x%lx",
4714-
sec->name, reloc_offset(reloc));
4714+
WARN("section %s has absolute relocation at offset 0x%llx",
4715+
sec->name, (unsigned long long)reloc_offset(reloc));
47154716
ret++;
47164717
}
47174718
}

0 commit comments

Comments
 (0)