diff options
| -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); |