diff options
| author | Alexandre Chartre <alexandre.chartre@oracle.com> | 2025-11-21 10:53:28 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2025-11-21 15:30:12 +0100 |
| commit | 7ad7a4a72050a74f8927719272075d07d2f7777f (patch) | |
| tree | 55377db1a4479cdb619beba3af3e71a26937ca08 | |
| parent | 5f326c88973691232c0e56ced83c199d53d86766 (diff) | |
objtool: Preserve alternatives order
Preserve the order in which alternatives are defined. Currently
objtool stores alternatives in a list in reverse order.
Signed-off-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Link: https://patch.msgid.link/20251121095340.464045-19-alexandre.chartre@oracle.com
| -rw-r--r-- | tools/objtool/check.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 9cd9f9d4f656..f75364f20bf1 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1921,6 +1921,7 @@ static int add_special_section_alts(struct objtool_file *file) struct special_alt *special_alt, *tmp; enum alternative_type alt_type; struct alternative *alt; + struct alternative *a; if (special_get_alts(file->elf, &special_alts)) return -1; @@ -1973,9 +1974,20 @@ static int add_special_section_alts(struct objtool_file *file) } alt->insn = new_insn; - alt->next = orig_insn->alts; alt->type = alt_type; - orig_insn->alts = alt; + alt->next = NULL; + + /* + * Store alternatives in the same order they have been + * defined. + */ + if (!orig_insn->alts) { + orig_insn->alts = alt; + } else { + for (a = orig_insn->alts; a->next; a = a->next) + ; + a->next = alt; + } list_del(&special_alt->list); free(special_alt); |