summaryrefslogtreecommitdiffstats
path: root/tools/objtool
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2021-05-06 21:34:03 +0200
committerIngo Molnar <mingo@kernel.org>2021-05-12 14:54:56 +0200
commit6d37b83c5d79ef5996cc49c3e3ac3d8ecd8c7050 (patch)
tree1432c860d584cab33eb9d9c253bd7a819c108c1a /tools/objtool
parentcbf82a3dc241aea82b941a872ed5c52f6af527ea (diff)
downloadlinux-6d37b83c5d79ef5996cc49c3e3ac3d8ecd8c7050.tar.bz2
objtool: Rewrite jump_label instructions
When a jump_entry::key has bit1 set, rewrite the instruction to be a NOP. This allows the compiler/assembler to emit JMP (and thus decide on which encoding to use). Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20210506194158.091028792@infradead.org
Diffstat (limited to 'tools/objtool')
-rw-r--r--tools/objtool/check.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 9ed1a4cd00dc..98cf87f2c501 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1234,6 +1234,20 @@ static int handle_jump_alt(struct objtool_file *file,
return -1;
}
+ if (special_alt->key_addend & 2) {
+ struct reloc *reloc = insn_reloc(file, orig_insn);
+
+ if (reloc) {
+ reloc->type = R_NONE;
+ elf_write_reloc(file->elf, reloc);
+ }
+ elf_write_insn(file->elf, orig_insn->sec,
+ orig_insn->offset, orig_insn->len,
+ arch_nop_insn(orig_insn->len));
+ orig_insn->type = INSN_NOP;
+ return 0;
+ }
+
*new_insn = list_next_entry(orig_insn, list);
return 0;
}