Skip to content

create-diff-object: don't mark prefix symbols as changed #1512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Zinkelburger wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Draft

create-diff-object: don't mark prefix symbols as changed #1512

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions kpatch-build/create-diff-object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,14 +1048,18 @@ static void kpatch_compare_correlated_symbol(struct symbol *sym)
* If two symbols are correlated but their sections are not, then the
* symbol has changed sections. This is only allowed if the symbol is
* moving out of an ignored section, or moving between normal/hot/unlikely
* subsections.
* subsections. A prefix symbol moves along with its parent function,
* but it's padding rather than a patchable function, so leave its status
* alone; it's included via the parent's sym->pfx link.
*/
if (sym1->sec && sym2->sec && sym1->sec->twin != sym2->sec) {
if ((sym2->sec->twin && sym2->sec->twin->ignore) ||
kpatch_subsection_changed(sym1->sec, sym2->sec))
sym->status = CHANGED;
else
kpatch_subsection_changed(sym1->sec, sym2->sec)) {
if (!sym->is_pfx)
sym->status = CHANGED;
} else {
DIFF_FATAL("symbol changed sections: %s", sym1->name);
}
}

if (sym1->type == STT_OBJECT &&
Expand Down
Loading