summaryrefslogtreecommitdiff
path: root/tools/objtool
diff options
context:
space:
mode:
authorJulien Thierry <jthierry@redhat.com>2020-08-25 13:47:40 +0100
committerJosh Poimboeuf <jpoimboe@redhat.com>2020-09-01 17:19:11 -0500
commitd44becb9decf4438d1e555b1428634964d2e5764 (patch)
tree51216eb474b58554435a0790ac60305a3ce7d85a /tools/objtool
parent6545eb030e6f14cef8793a86312483c788eaee46 (diff)
objtool: Move ORC logic out of check()
Now that the objtool_file can be obtained outside of the check function, orc generation builtin no longer requires check to explicitly call its orc related functions. Signed-off-by: Julien Thierry <jthierry@redhat.com> Reviewed-by: Miroslav Benes <mbenes@suse.cz> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Diffstat (limited to 'tools/objtool')
-rw-r--r--tools/objtool/builtin-check.c10
-rw-r--r--tools/objtool/builtin-orc.c21
-rw-r--r--tools/objtool/check.c18
-rw-r--r--tools/objtool/objtool.h2
-rw-r--r--tools/objtool/weak.c2
5 files changed, 32 insertions, 21 deletions
diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
index 0126ec3bb6c9..c6d199bfd0ae 100644
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -42,6 +42,7 @@ int cmd_check(int argc, const char **argv)
{
const char *objname, *s;
struct objtool_file *file;
+ int ret;
argc = parse_options(argc, argv, check_options, check_usage, 0);
@@ -58,5 +59,12 @@ int cmd_check(int argc, const char **argv)
if (!file)
return 1;
- return check(file, false);
+ ret = check(file);
+ if (ret)
+ return ret;
+
+ if (file->elf->changed)
+ return elf_write(file->elf);
+
+ return 0;
}
diff --git a/tools/objtool/builtin-orc.c b/tools/objtool/builtin-orc.c
index 3979f275a775..7b31121fa60b 100644
--- a/tools/objtool/builtin-orc.c
+++ b/tools/objtool/builtin-orc.c
@@ -32,6 +32,7 @@ int cmd_orc(int argc, const char **argv)
if (!strncmp(argv[0], "gen", 3)) {
struct objtool_file *file;
+ int ret;
argc = parse_options(argc, argv, check_options, orc_usage, 0);
if (argc != 1)
@@ -43,7 +44,25 @@ int cmd_orc(int argc, const char **argv)
if (!file)
return 1;
- return check(file, true);
+ ret = check(file);
+ if (ret)
+ return ret;
+
+ if (list_empty(&file->insn_list))
+ return 0;
+
+ ret = create_orc(file);
+ if (ret)
+ return ret;
+
+ ret = create_orc_sections(file);
+ if (ret)
+ return ret;
+
+ if (!file->elf->changed)
+ return 0;
+
+ return elf_write(file->elf);
}
if (!strcmp(argv[0], "dump")) {
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 9d4efa3b12ba..4afc2d5465b9 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2908,7 +2908,7 @@ static int validate_reachable_instructions(struct objtool_file *file)
return 0;
}
-int check(struct objtool_file *file, bool orc)
+int check(struct objtool_file *file)
{
int ret, warnings = 0;
@@ -2960,22 +2960,6 @@ int check(struct objtool_file *file, bool orc)
goto out;
warnings += ret;
- if (orc) {
- ret = create_orc(file);
- if (ret < 0)
- goto out;
-
- ret = create_orc_sections(file);
- if (ret < 0)
- goto out;
- }
-
- if (file->elf->changed) {
- ret = elf_write(file->elf);
- if (ret < 0)
- goto out;
- }
-
out:
if (ret < 0) {
/*
diff --git a/tools/objtool/objtool.h b/tools/objtool/objtool.h
index 7efc43f22174..a635f68a9b09 100644
--- a/tools/objtool/objtool.h
+++ b/tools/objtool/objtool.h
@@ -22,7 +22,7 @@ struct objtool_file {
struct objtool_file *objtool_open_read(const char *_objname);
-int check(struct objtool_file *file, bool orc);
+int check(struct objtool_file *file);
int orc_dump(const char *objname);
int create_orc(struct objtool_file *file);
int create_orc_sections(struct objtool_file *file);
diff --git a/tools/objtool/weak.c b/tools/objtool/weak.c
index 82698319f008..29180d599b08 100644
--- a/tools/objtool/weak.c
+++ b/tools/objtool/weak.c
@@ -17,7 +17,7 @@
return ENOSYS; \
})
-int __weak check(struct objtool_file *file, bool orc)
+int __weak check(struct objtool_file *file)
{
UNSUPPORTED("check subcommand");
}