diff options
| author | Julien Thierry <jthierry@redhat.com> | 2020-08-25 13:47:40 +0100 |
|---|---|---|
| committer | Josh Poimboeuf <jpoimboe@redhat.com> | 2020-09-01 17:19:11 -0500 |
| commit | d44becb9decf4438d1e555b1428634964d2e5764 (patch) | |
| tree | 51216eb474b58554435a0790ac60305a3ce7d85a /tools/objtool/builtin-orc.c | |
| parent | 6545eb030e6f14cef8793a86312483c788eaee46 (diff) | |
| download | lwn-d44becb9decf4438d1e555b1428634964d2e5764.tar.gz lwn-d44becb9decf4438d1e555b1428634964d2e5764.zip | |
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/builtin-orc.c')
| -rw-r--r-- | tools/objtool/builtin-orc.c | 21 |
1 files changed, 20 insertions, 1 deletions
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")) { |