Skip to content

Commit 9dee868

Browse files
committed
Merge tag 'objtool-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool updates from Ingo Molnar: - Add support for non-rela relocations, in preparation to merge 'recordmcount' functionality into objtool - Fix assumption that broke under --ffunction-sections (LTO) builds - Misc cleanups * tag 'objtool-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Add support for relocations without addends objtool: Rename rela to reloc objtool: Use sh_info to find the base for .rela sections objtool: Do not assume order of parent/child functions
2 parents 9ba19cc + d832c00 commit 9dee868

File tree

8 files changed

+375
-244
lines changed

8 files changed

+375
-244
lines changed

tools/objtool/arch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ bool arch_callee_saved_reg(unsigned char reg);
8282

8383
unsigned long arch_jump_destination(struct instruction *insn);
8484

85-
unsigned long arch_dest_rela_offset(int addend);
85+
unsigned long arch_dest_reloc_offset(int addend);
8686

8787
const char *arch_nop_insn(int len);
8888

tools/objtool/arch/x86/decode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ bool arch_callee_saved_reg(unsigned char reg)
6767
}
6868
}
6969

70-
unsigned long arch_dest_rela_offset(int addend)
70+
unsigned long arch_dest_reloc_offset(int addend)
7171
{
7272
return addend + 4;
7373
}

0 commit comments

Comments
 (0)