]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
objtool: Remove --unret dependency on --rethunk
authorJosh Poimboeuf <jpoimboe@kernel.org>
Fri, 14 Mar 2025 19:29:04 +0000 (12:29 -0700)
committerPeter Zijlstra <peterz@infradead.org>
Mon, 17 Mar 2025 10:36:00 +0000 (11:36 +0100)
With unret validation enabled and IBT/LTO disabled, objtool runs on TUs
with --rethunk and on vmlinux.o with --unret.  So this dependency isn't
valid as they don't always run on the same object.

This error never triggered before because --unret is always coupled with
--noinstr, so the first conditional in opts_valid() returns early due to
opts.noinstr being true.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/c6f5635784a28ed4b10ac4307b1858e015e6eff0.1741975349.git.jpoimboe@kernel.org
tools/objtool/builtin-check.c

index 387d56a7f5fb8da8435d0a3f5c05eeee66932c9b..c7275cf7641b0a26b9296ae0ea3bed595e3923e9 100644 (file)
@@ -151,11 +151,6 @@ static bool opts_valid(void)
                return true;
        }
 
-       if (opts.unret && !opts.rethunk) {
-               ERROR("--unret requires --rethunk");
-               return false;
-       }
-
        if (opts.dump_orc)
                return true;