UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

objtool: Rename --duplicate to --lto 

In order to prepare for LTO like objtool runs for modules, rename the
duplicate argument to lto.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20220308154319.172584233@infradead.org
This commit is contained in:
Peter Zijlstra 2022-03-08 16:30:45 +01:00
parent cb9010f87d
commit 53f7109ef9
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/link-vmlinux.sh
View File

@ -115,7 +115,7 @@ objtool_link()
objtoolcmd="orc generate" objtoolcmd="orc generate"
fi fi
objtoolopt="${objtoolopt} --duplicate" objtoolopt="${objtoolopt} --lto"
if is_enabled CONFIG_FTRACE_MCOUNT_USE_OBJTOOL; then if is_enabled CONFIG_FTRACE_MCOUNT_USE_OBJTOOL; then
objtoolopt="${objtoolopt} --mcount" objtoolopt="${objtoolopt} --mcount"

4
tools/objtool/builtin-check.c
View File

@ -20,7 +20,7 @@
#include <objtool/objtool.h> #include <objtool/objtool.h>
bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats,
validate_dup, vmlinux, mcount, noinstr, backup, sls, dryrun; lto, vmlinux, mcount, noinstr, backup, sls, dryrun;
static const char * const check_usage[] = { static const char * const check_usage[] = {
"objtool check [<options>] file.o", "objtool check [<options>] file.o",
@ -40,7 +40,7 @@ const struct option check_options[] = {
OPT_BOOLEAN('b', "backtrace", &backtrace, "unwind on error"), OPT_BOOLEAN('b', "backtrace", &backtrace, "unwind on error"),
OPT_BOOLEAN('a', "uaccess", &uaccess, "enable uaccess checking"), OPT_BOOLEAN('a', "uaccess", &uaccess, "enable uaccess checking"),
OPT_BOOLEAN('s', "stats", &stats, "print statistics"), OPT_BOOLEAN('s', "stats", &stats, "print statistics"),
OPT_BOOLEAN('d', "duplicate", &validate_dup, "duplicate validation for vmlinux.o"), OPT_BOOLEAN(0, "lto", &lto, "whole-archive like runs"),
OPT_BOOLEAN('n', "noinstr", &noinstr, "noinstr validation for vmlinux.o"), OPT_BOOLEAN('n', "noinstr", &noinstr, "noinstr validation for vmlinux.o"),
OPT_BOOLEAN('l', "vmlinux", &vmlinux, "vmlinux.o validation"), OPT_BOOLEAN('l', "vmlinux", &vmlinux, "vmlinux.o validation"),
OPT_BOOLEAN('M', "mcount", &mcount, "generate __mcount_loc"), OPT_BOOLEAN('M', "mcount", &mcount, "generate __mcount_loc"),

7
tools/objtool/check.c
View File

@ -3499,6 +3499,11 @@ int check(struct objtool_file *file)
{ {
int ret, warnings = 0; int ret, warnings = 0;
if (lto && !(vmlinux || module)) {
fprintf(stderr, "--lto requires: --vmlinux or --module\n");
return 1;
}
arch_initial_func_cfi_state(&initial_func_cfi); arch_initial_func_cfi_state(&initial_func_cfi);
init_cfi_state(&init_cfi); init_cfi_state(&init_cfi);
init_cfi_state(&func_cfi); init_cfi_state(&func_cfi);
@ -3519,7 +3524,7 @@ int check(struct objtool_file *file)
if (list_empty(&file->insn_list)) if (list_empty(&file->insn_list))
goto out; goto out;
if (vmlinux && !validate_dup) { if (vmlinux && !lto) {
ret = validate_vmlinux_functions(file); ret = validate_vmlinux_functions(file);
if (ret < 0) if (ret < 0)
goto out; goto out;

2
tools/objtool/include/objtool/builtin.h
View File

@ -9,7 +9,7 @@
extern const struct option check_options[]; extern const struct option check_options[];
extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats,
validate_dup, vmlinux, mcount, noinstr, backup, sls, dryrun; lto, vmlinux, mcount, noinstr, backup, sls, dryrun;
extern int cmd_parse_options(int argc, const char **argv, const char * const usage[]); extern int cmd_parse_options(int argc, const char **argv, const char * const usage[]);