redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

objtool: Define 'struct orc_entry' only when needed 

Implementation of ORC requires some definitions that are currently
provided by the target architecture headers. Do not depend on these
definitions when the orc subcommand is not implemented.

This avoid requiring arches with no orc implementation to provide dummy
orc definitions.

Signed-off-by: Julien Thierry <jthierry@redhat.com>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
zero-sugar-mainline-defconfig
Julien Thierry 2020-08-25 13:47:42 +01:00 committed by Josh Poimboeuf
parent 3eaecac88a
commit 66734e3246
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/objtool/Makefile
View File

@ -55,6 +55,10 @@ ifeq ($(SRCARCH),x86)
SUBCMD_ORC := y
endif
ifeq ($(SUBCMD_ORC),y)
CFLAGS += -DINSN_USE_ORC
endif
export SUBCMD_CHECK SUBCMD_ORC
export srctree OUTPUT CFLAGS SRCARCH AWK
include $(srctree)/tools/build/Makefile.include

2
tools/objtool/arch.h
View File

@ -11,7 +11,9 @@
#include "objtool.h"
#include "cfi.h"
#ifdef INSN_USE_ORC
#include <asm/orc_types.h>
#endif
enum insn_type {
INSN_JUMP_CONDITIONAL,

2
tools/objtool/check.h
View File

@ -43,7 +43,9 @@ struct instruction {
struct symbol *func;
struct list_head stack_ops;
struct cfi_state cfi;
#ifdef INSN_USE_ORC
struct orc_entry orc;
#endif
};
struct instruction *find_insn(struct objtool_file *file,