The following commit has been merged into the objtool/core branch of tip:
Commit-ID: a040ab73dfd1bc8198848a438f77497d8d03fba9
Gitweb: https://git.kernel.org/tip/a040ab73dfd1bc8198848a438f77497d8d03fba9
Author: Josh Poimboeuf <jpoimboe@kernel.org>
AuthorDate: Wed, 17 Sep 2025 09:03:40 -07:00
Committer: Josh Poimboeuf <jpoimboe@kernel.org>
CommitterDate: Tue, 14 Oct 2025 14:46:47 -07:00
objtool: Simplify reloc offset calculation in unwind_read_hints()
Simplify the relocation offset calculation in unwind_read_hints(),
similar to other conversions which have already been done.
Acked-by: Petr Mladek <pmladek@suse.com>
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
tools/objtool/check.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 46b425f..473e737 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2200,14 +2200,7 @@ static int read_unwind_hints(struct objtool_file *file)
return -1;
}
- if (is_sec_sym(reloc->sym)) {
- offset = reloc_addend(reloc);
- } else if (reloc->sym->local_label) {
- offset = reloc->sym->offset;
- } else {
- ERROR("unexpected relocation symbol type in %s", sec->rsec->name);
- return -1;
- }
+ offset = reloc->sym->offset + reloc_addend(reloc);
insn = find_insn(file, reloc->sym->sec, offset);
if (!insn) {