summaryrefslogtreecommitdiff
path: root/tools/objtool/elf.c
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2022-05-16 11:06:36 -0400
committerBorislav Petkov <bp@suse.de>2022-05-20 12:45:30 +0200
commit22682a07acc308ef78681572e19502ce8893c4d4 (patch)
tree3b1e6bd91995a8548dc16c4d4e8aabe9f59a89d6 /tools/objtool/elf.c
parentead165fa1042247b033afad7be4be9b815d04ade (diff)
downloadlinux-rpi-22682a07acc308ef78681572e19502ce8893c4d4.tar.gz
linux-rpi-22682a07acc308ef78681572e19502ce8893c4d4.tar.bz2
linux-rpi-22682a07acc308ef78681572e19502ce8893c4d4.zip
objtool: Fix objtool regression on x32 systems
Commit c087c6e7b551 ("objtool: Fix type of reloc::addend") failed to appreciate cross building from ILP32 hosts, where 'int' == 'long' and the issue persists. As such, use s64/int64_t/Elf64_Sxword for this field and suffer the pain that is ISO C99 printf formats for it. Fixes: c087c6e7b551 ("objtool: Fix type of reloc::addend") Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> [peterz: reword changelog, s/long long/s64/] Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: <stable@vger.kernel.org> Link: https://lkml.kernel.org/r/alpine.LRH.2.02.2205161041260.11556@file01.intranet.prod.int.rdu2.redhat.com
Diffstat (limited to 'tools/objtool/elf.c')
-rw-r--r--tools/objtool/elf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 7fb6720e510b..c25e957c1e52 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -550,7 +550,7 @@ static struct section *elf_create_reloc_section(struct elf *elf,
int reltype);
int elf_add_reloc(struct elf *elf, struct section *sec, unsigned long offset,
- unsigned int type, struct symbol *sym, long addend)
+ unsigned int type, struct symbol *sym, s64 addend)
{
struct reloc *reloc;