RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-02-19 11:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

create-diff-object: is_localentry_sym -> is_gcc6_localentry_bundled_sym

Browse Source 
is_localentry_sym() isn't quite the right name, because it also checks
for the 8-byte gap introduced by GCC 6, and also checks that the
function is otherwise at the beginning of the section.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
This commit is contained in:
Josh Poimboeuf 2017-11-08 12:08:14 -06:00
parent d6bcffe954
commit 1eac193bfc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kpatch-build/create-diff-object.c
View File

@ -135,7 +135,7 @@ static int is_bundleable(struct symbol *sym)
* the object file. The local entry point is 8 bytes after the global entry
* point.
*/
static int is_localentry_sym(struct symbol *sym)
static int is_gcc6_localentry_bundled_sym(struct symbol *sym)
{
if (sym->type != STT_FUNC || sym->sym.st_shndx == SHN_UNDEF)
return 0;
@ -149,7 +149,7 @@ static int is_localentry_sym(struct symbol *sym)
return 1;
}
#else
static int is_localentry_sym(struct symbol *sym)
static int is_gcc6_localentry_bundled_sym(struct symbol *sym)
{
return 0;
}
@ -166,7 +166,8 @@ static void kpatch_bundle_symbols(struct kpatch_elf *kelf)
list_for_each_entry(sym, &kelf->symbols, list) {
if (is_bundleable(sym)) {
if (sym->sym.st_value != 0 && !is_localentry_sym(sym)) {
if (sym->sym.st_value != 0 &&
!is_gcc6_localentry_bundled_sym(sym)) {
ERROR("symbol %s at offset %lu within section %s, expected 0",
sym->name, sym->sym.st_value,
sym->sec->name);