[PATCH v3 36/64] objtool: Simplify special symbol handling in elf_update_symbol()

[Josh Poimboeuf]

!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.

Signed-off-by: Josh Poimboeuf <jpoim...@kernel.org>
---
 tools/objtool/elf.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 1bb86151243a..4e274197bcd6 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -634,7 +634,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;
@@ -642,8 +642,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) {
-- 
2.49.0