objtool: Simplify special symbol handling in elf_update_symbol()

!sym->sec isn't actually a thing: even STT_UNDEF and other special
symbol types belong to NULL section 0.

Simplify the initialization of 'shndx' accordingly.

Acked-by: Petr Mladek <pmladek@suse.com>
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 775d017b1b79b0c7557d4734b5a0cd74ad0698dc..c35726a47c07c7f9b7cc00418bf4904871295f4d 100644 (file)
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -637,7 +637,7 @@ static int elf_update_sym_relocs(struct elf *elf, struct symbol *sym)
 static int elf_update_symbol(struct elf *elf, struct section *symtab,
                             struct section *symtab_shndx, struct symbol *sym)
 {
-       Elf32_Word shndx = sym->sec ? sym->sec->idx : SHN_UNDEF;
+       Elf32_Word shndx;
        Elf_Data *symtab_data = NULL, *shndx_data = NULL;
        Elf64_Xword entsize = symtab->sh.sh_entsize;
        int max_idx, idx = sym->idx;
@@ -645,8 +645,7 @@ static int elf_update_symbol(struct elf *elf, struct section *symtab,
        bool is_special_shndx = sym->sym.st_shndx >= SHN_LORESERVE &&
                                sym->sym.st_shndx != SHN_XINDEX;
 
-       if (is_special_shndx)
-               shndx = sym->sym.st_shndx;
+       shndx = is_special_shndx ? sym->sym.st_shndx : sym->sec->idx;
 
        s = elf_getscn(elf->elf, symtab->idx);
        if (!s) {