From e598d9628f2bb689b4cf879f8d20093339ba15e0 Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf Date: Wed, 8 Nov 2017 12:15:39 -0600 Subject: [PATCH] create-diff-object: simplify is_gcc6_localentry_bundled_sym() The STT_FUNC and SHN_UNDEF checks aren't needed because they're already implied by the localentry check. Signed-off-by: Josh Poimboeuf --- kpatch-build/create-diff-object.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c index 20a8f3e..4f677fe 100644 --- a/kpatch-build/create-diff-object.c +++ b/kpatch-build/create-diff-object.c @@ -137,16 +137,8 @@ static int is_bundleable(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; - - if (sym->sym.st_value != 0x8) - return 0; - - if (!PPC64_LOCAL_ENTRY_OFFSET(sym->sym.st_other)) - return 0; - - return 1; + return (PPC64_LOCAL_ENTRY_OFFSET(sym->sym.st_other) && + sym->sym.st_value == 8); } #else static int is_gcc6_localentry_bundled_sym(struct symbol *sym)