objtool: Fix standalone --hacks=jump_label

[ Upstream commit be8374a5ba7cbab6b97df94b4ffe0b92f5c8a6d2 ]

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>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 59ca5b0c093d8cf7a2006c97eada915d2bb53d4b..4adb3f3d9aed8eeea3b1d9811f13e4250f32f80f 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2671,7 +2671,8 @@ 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;