Skip to content

Commit

Permalink
Merge tag 'objtool-core-2020-08-03' of git://git.kernel.org/pub/scm/l…
Browse files Browse the repository at this point in the history
…inux/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
  • Loading branch information
torvalds committed Aug 3, 2020
2 parents 9ba19cc + d832c00 commit 9dee868
Show file tree
Hide file tree
Showing 8 changed files with 375 additions and 244 deletions.
2 changes: 1 addition & 1 deletion tools/objtool/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ bool arch_callee_saved_reg(unsigned char reg);

unsigned long arch_jump_destination(struct instruction *insn);

unsigned long arch_dest_rela_offset(int addend);
unsigned long arch_dest_reloc_offset(int addend);

const char *arch_nop_insn(int len);

Expand Down
2 changes: 1 addition & 1 deletion tools/objtool/arch/x86/decode.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ bool arch_callee_saved_reg(unsigned char reg)
}
}

unsigned long arch_dest_rela_offset(int addend)
unsigned long arch_dest_reloc_offset(int addend)
{
return addend + 4;
}
Expand Down
Loading

0 comments on commit 9dee868

Please sign in to comment.