objtool: Define 'struct orc_entry' only when needed (66734e32) · Commits · 戴 / test

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>

tools/objtool/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -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

tools/objtool/arch.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,

tools/objtool/check.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,

Admin message