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:
Родитель
cb9010f87d
Коммит
53f7109ef9
|
@ -115,7 +115,7 @@ objtool_link()
|
|||
objtoolcmd="orc generate"
|
||||
fi
|
||||
|
||||
objtoolopt="${objtoolopt} --duplicate"
|
||||
objtoolopt="${objtoolopt} --lto"
|
||||
|
||||
if is_enabled CONFIG_FTRACE_MCOUNT_USE_OBJTOOL; then
|
||||
objtoolopt="${objtoolopt} --mcount"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <objtool/objtool.h>
|
||||
|
||||
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[] = {
|
||||
"objtool check [<options>] file.o",
|
||||
|
@ -40,7 +40,7 @@ const struct option check_options[] = {
|
|||
OPT_BOOLEAN('b', "backtrace", &backtrace, "unwind on error"),
|
||||
OPT_BOOLEAN('a', "uaccess", &uaccess, "enable uaccess checking"),
|
||||
OPT_BOOLEAN('s', "stats", &stats, "print statistics"),
|
||||
OPT_BOOLEAN('d', "duplicate", &validate_dup, "duplicate validation for vmlinux.o"),
|
||||
OPT_BOOLEAN(0, "lto", <o, "whole-archive like runs"),
|
||||
OPT_BOOLEAN('n', "noinstr", &noinstr, "noinstr validation for vmlinux.o"),
|
||||
OPT_BOOLEAN('l', "vmlinux", &vmlinux, "vmlinux.o validation"),
|
||||
OPT_BOOLEAN('M', "mcount", &mcount, "generate __mcount_loc"),
|
||||
|
|
|
@ -3499,6 +3499,11 @@ int check(struct objtool_file *file)
|
|||
{
|
||||
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);
|
||||
init_cfi_state(&init_cfi);
|
||||
init_cfi_state(&func_cfi);
|
||||
|
@ -3519,7 +3524,7 @@ int check(struct objtool_file *file)
|
|||
if (list_empty(&file->insn_list))
|
||||
goto out;
|
||||
|
||||
if (vmlinux && !validate_dup) {
|
||||
if (vmlinux && !lto) {
|
||||
ret = validate_vmlinux_functions(file);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
extern const struct option check_options[];
|
||||
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[]);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче