Commit 3b92486f authored by Josh Poimboeuf's avatar Josh Poimboeuf
Browse files

objtool: Add annotype() helper 



... for reading annotation types.

Acked-by: default avatarPetr Mladek <pmladek@suse.com>
Tested-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
parent 03c19a99

tools/objtool/arch/loongarch/orc.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <objtool/check.h>

#include <objtool/orc.h>

#include <objtool/warn.h>

#include <objtool/endianness.h>



int init_orc_entry(struct orc_entry *orc, struct cfi_state *cfi, struct instruction *insn)

{

tools/objtool/arch/powerpc/decode.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <objtool/arch.h>

#include <objtool/warn.h>

#include <objtool/builtin.h>

#include <objtool/endianness.h>



int arch_ftrace_match(const char *name)

{

tools/objtool/arch/x86/decode.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <objtool/elf.h>

#include <objtool/arch.h>

#include <objtool/warn.h>

#include <objtool/endianness.h>

#include <objtool/builtin.h>

#include <arch/elf.h>

tools/objtool/arch/x86/orc.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <objtool/check.h>

#include <objtool/orc.h>

#include <objtool/warn.h>

#include <objtool/endianness.h>



int init_orc_entry(struct orc_entry *orc, struct cfi_state *cfi, struct instruction *insn)

{

tools/objtool/check.c

+1 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <objtool/check.h>

#include <objtool/special.h>

#include <objtool/warn.h>

#include <objtool/endianness.h>



#include <linux/objtool_types.h>

#include <linux/hashtable.h>
@@ -2273,9 +2272,7 @@ static int read_annotate(struct objtool_file *file, 
	}



	for_each_reloc(sec->rsec, reloc) {

		type = *(u32 *)(sec->data->d_buf + (reloc_idx(reloc) * sec->sh.sh_entsize) + 4);

		type = bswap_if_needed(file->elf, type);



		type = annotype(file->elf, sec, reloc);

		offset = reloc->sym->offset + reloc_addend(reloc);

		insn = find_insn(file, reloc->sym->sec, offset);