Skip to content

Commit 764d956

Browse files
jpoimboePeter Zijlstra
authored andcommitted
objtool: Remove --unret dependency on --rethunk
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 <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lore.kernel.org/r/c6f5635784a28ed4b10ac4307b1858e015e6eff0.1741975349.git.jpoimboe@kernel.org
1 parent 0a7fb6f commit 764d956

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

tools/objtool/builtin-check.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,6 @@ static bool opts_valid(void)
151151
return true;
152152
}
153153

154-
if (opts.unret && !opts.rethunk) {
155-
ERROR("--unret requires --rethunk");
156-
return false;
157-
}
158-
159154
if (opts.dump_orc)
160155
return true;
161156

0 commit comments

Comments
 (0)