Commit a2f605f9 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

objtool: Collate parse_options() users 



Ensure there's a single place that parses check_options, in
preparation for extending where to get options from.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Link: https://lkml.kernel.org/r/20210226110004.193108106@infradead.org
parent 8ad15c69

tools/objtool/builtin-check.c

+9 −5
Original line number Diff line number Diff line
@@ -42,17 +42,21 @@ const struct option check_options[] = { 
	OPT_END(),

};



int cmd_parse_options(int argc, const char **argv, const char * const usage[])

{

	argc = parse_options(argc, argv, check_options, usage, 0);

	if (argc != 1)

		usage_with_options(usage, check_options);

	return argc;

}



int cmd_check(int argc, const char **argv)

{

	const char *objname;

	struct objtool_file *file;

	int ret;



	argc = parse_options(argc, argv, check_options, check_usage, 0);



	if (argc != 1)

		usage_with_options(check_usage, check_options);



	argc = cmd_parse_options(argc, argv, check_usage);

	objname = argv[0];



	file = objtool_open_read(objname);

tools/objtool/builtin-orc.c

+1 −4
Original line number Diff line number Diff line
@@ -34,10 +34,7 @@ int cmd_orc(int argc, const char **argv) 
		struct objtool_file *file;

		int ret;



		argc = parse_options(argc, argv, check_options, orc_usage, 0);

		if (argc != 1)

			usage_with_options(orc_usage, check_options);



		argc = cmd_parse_options(argc, argv, orc_usage);

		objname = argv[0];



		file = objtool_open_read(objname);

tools/objtool/include/objtool/builtin.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ extern const struct option check_options[]; 
extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats,

            validate_dup, vmlinux, mcount, noinstr, backup;



extern int cmd_parse_options(int argc, const char **argv, const char * const usage[]);



extern int cmd_check(int argc, const char **argv);

extern int cmd_orc(int argc, const char **argv);