From: Josh Poimboeuf <jpoimboe@kernel.org>
Date: Wed, 17 Sep 2025 16:03:40 +0000 (-0700)
Subject: objtool: Simplify reloc offset calculation in unwind_read_hints()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a040ab73dfd1bc8198848a438f77497d8d03fba9;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 46b425fade4f0..473e73722d5c1 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) {