summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMatt Helsley <mhelsley@vmware.com>2020-05-19 23:55:32 +0300
committerJosh Poimboeuf <jpoimboe@redhat.com>2020-05-20 16:35:20 +0300
commitd37c90d47fc4657423d2ff1c3ed3fd70612a9b43 (patch)
tree7fcd0a59833b9898c9c6a38a5185b61de6c38182 /tools
parentf15c648f202cd0232d4a9c98627bc08bcd6d11ee (diff)
downloadlinux-d37c90d47fc4657423d2ff1c3ed3fd70612a9b43.tar.xz
objtool: Move struct objtool_file into arch-independent header
The objtool_file structure describes the files objtool works on, is used by the check subcommand, and the check.h header is included by the orc subcommands so it's presently used by all subcommands. Since the structure will be useful in all subcommands besides check, and some subcommands may not want to include check.h to get the definition, split the structure out into a new header meant for use by all objtool subcommands. Signed-off-by: Matt Helsley <mhelsley@vmware.com> Reviewed-by: Julien Thierry <jthierry@redhat.com> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/objtool/check.h10
-rw-r--r--tools/objtool/objtool.h22
2 files changed, 23 insertions, 9 deletions
diff --git a/tools/objtool/check.h b/tools/objtool/check.h
index 24280227ef21..3b59a1cbcff5 100644
--- a/tools/objtool/check.h
+++ b/tools/objtool/check.h
@@ -7,11 +7,10 @@
#define _CHECK_H
#include <stdbool.h>
-#include "elf.h"
+#include "objtool.h"
#include "cfi.h"
#include "arch.h"
#include "orc.h"
-#include <linux/hashtable.h>
struct insn_state {
struct cfi_state cfi;
@@ -48,13 +47,6 @@ struct instruction {
struct orc_entry orc;
};
-struct objtool_file {
- struct elf *elf;
- struct list_head insn_list;
- DECLARE_HASHTABLE(insn_hash, 20);
- bool ignore_unreachables, c_file, hints, rodata;
-};
-
int check(const char *objname, bool orc);
struct instruction *find_insn(struct objtool_file *file,
diff --git a/tools/objtool/objtool.h b/tools/objtool/objtool.h
new file mode 100644
index 000000000000..d89616b2ca39
--- /dev/null
+++ b/tools/objtool/objtool.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2020 Matt Helsley <mhelsley@vmware.com>
+ */
+
+#ifndef _OBJTOOL_H
+#define _OBJTOOL_H
+
+#include <stdbool.h>
+#include <linux/list.h>
+#include <linux/hashtable.h>
+
+#include "elf.h"
+
+struct objtool_file {
+ struct elf *elf;
+ struct list_head insn_list;
+ DECLARE_HASHTABLE(insn_hash, 20);
+ bool ignore_unreachables, c_file, hints, rodata;
+};
+
+#endif /* _OBJTOOL_H */