Commit 02cf323a authored by Josh Poimboeuf's avatar Josh Poimboeuf
Browse files

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: default avatarPetr Mladek <pmladek@suse.com>
Tested-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
parent a05de0a7

tools/objtool/elf.c

+2 −3
Original line number Diff line number Diff line
@@ -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) {