The objtool command line 'objtool --hacks=jump_label foo.o' on its own
should be expected to rewrite jump labels to NOPs. This means the
add_special_section_alts() code path needs to run when only this option
is provided.

This is mainly relevant in certain debugging situations, but could
potentially also fix kernel builds in which objtool is run with
--hacks=jump_label but without --orc, --stackval, --uaccess, or
--hacks=noinstr.

Fixes: de6fbcedf5ab ("objtool: Read special sections with alts only when specific options are selected")
Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
---
 tools/objtool/check.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index d14f20ef1db1..1b4b4bd7dc90 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2562,7 +2562,7 @@ static int decode_sections(struct objtool_file *file)
 	 * Must be before add_jump_destinations(), which depends on 'func'
 	 * being set for alternatives, to enable proper sibling call detection.
 	 */
-	if (opts.stackval || opts.orc || opts.uaccess || opts.noinstr) {
+	if (opts.stackval || opts.orc || opts.uaccess || opts.noinstr || opts.hack_jump_label) {
 		ret = add_special_section_alts(file);
 		if (ret)
 			return ret;
-- 
2.51.0.534.gc79095c0ca-goog

On Tue, Sep 23, 2025 at 12:49:41AM +0000, Dylan Hatch wrote:
> The objtool command line 'objtool --hacks=jump_label foo.o' on its own
> should be expected to rewrite jump labels to NOPs. This means the
> add_special_section_alts() code path needs to run when only this option
> is provided.
> 
> This is mainly relevant in certain debugging situations, but could
> potentially also fix kernel builds in which objtool is run with
> --hacks=jump_label but without --orc, --stackval, --uaccess, or
> --hacks=noinstr.
> 
> Fixes: de6fbcedf5ab ("objtool: Read special sections with alts only when specific options are selected")
> Signed-off-by: Dylan Hatch <dylanbhatch@google.com>

Queued, thanks!

-- 
Josh