diff options
| author | Alan Modra <amodra@gmail.com> | 2021-09-02 09:56:11 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2021-09-02 13:48:21 +0930 |
| commit | b03b65e2aa3243bc0224ba3f933a3e94f1eed8a1 (patch) | |
| tree | a2bc19c802d9ae973d9af4a0203bbe4594759c5f /bfd/elflink.c | |
| parent | 36f61bf2ad936edfb76eda706eb3b081a61d5a5a (diff) | |
| download | gdb-b03b65e2aa3243bc0224ba3f933a3e94f1eed8a1.zip gdb-b03b65e2aa3243bc0224ba3f933a3e94f1eed8a1.tar.gz gdb-b03b65e2aa3243bc0224ba3f933a3e94f1eed8a1.tar.bz2 | |
SHT_SYMTAB_SHNDX handling
.symtab_shndx section contents is an array, one entry for each symbol
in .symtab, present when the number of symbols exceeds a little less
than 64k. Since the mapping is 1-1 with symbols there is no need to
keep both dest_index and destshndx_index in elf_sym_strtab. Instead,
just make sure that the shndx pointers to the swap functions are kept
NULL when .symtab_shndx does not exist. Also, strtabcount in the
linker's elf hash table is incremented in lock-step with the output
symcount, so that can disappear too.
Diffstat (limited to 'bfd/elflink.c')
| -rw-r--r-- | bfd/elflink.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/bfd/elflink.c b/bfd/elflink.c index 354cebb..77450c8 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -9916,7 +9916,7 @@ elf_link_output_symstrtab (void *finf, hash_table = elf_hash_table (flinfo->info); strtabsize = hash_table->strtabsize; - if (strtabsize <= hash_table->strtabcount) + if (strtabsize <= flinfo->output_bfd->symcount) { strtabsize += strtabsize; hash_table->strtabsize = strtabsize; @@ -9927,14 +9927,10 @@ elf_link_output_symstrtab (void *finf, if (hash_table->strtab == NULL) return 0; } - hash_table->strtab[hash_table->strtabcount].sym = *elfsym; - hash_table->strtab[hash_table->strtabcount].dest_index - = hash_table->strtabcount; - hash_table->strtab[hash_table->strtabcount].destshndx_index - = flinfo->symshndxbuf ? bfd_get_symcount (flinfo->output_bfd) : 0; - + hash_table->strtab[flinfo->output_bfd->symcount].sym = *elfsym; + hash_table->strtab[flinfo->output_bfd->symcount].dest_index + = flinfo->output_bfd->symcount; flinfo->output_bfd->symcount += 1; - hash_table->strtabcount += 1; return 1; } @@ -9954,14 +9950,14 @@ elf_link_swap_symbols_out (struct elf_final_link_info *flinfo) file_ptr pos; bool ret; - if (!hash_table->strtabcount) + if (flinfo->output_bfd->symcount == 0) return true; BFD_ASSERT (elf_onesymtab (flinfo->output_bfd)); bed = get_elf_backend_data (flinfo->output_bfd); - amt = bed->s->sizeof_sym * hash_table->strtabcount; + amt = bed->s->sizeof_sym * flinfo->output_bfd->symcount; symbuf = (bfd_byte *) bfd_malloc (amt); if (symbuf == NULL) return false; @@ -9979,7 +9975,7 @@ elf_link_swap_symbols_out (struct elf_final_link_info *flinfo) } /* Now swap out the symbols. */ - for (i = 0; i < hash_table->strtabcount; i++) + for (i = 0; i < flinfo->output_bfd->symcount; i++) { struct elf_sym_strtab *elfsym = &hash_table->strtab[i]; if (elfsym->sym.st_name == (unsigned long) -1) @@ -9999,13 +9995,13 @@ elf_link_swap_symbols_out (struct elf_final_link_info *flinfo) ((bfd_byte *) symbuf + (elfsym->dest_index * bed->s->sizeof_sym)), - (flinfo->symshndxbuf - + elfsym->destshndx_index)); + NPTR_ADD (flinfo->symshndxbuf, + elfsym->dest_index)); } hdr = &elf_tdata (flinfo->output_bfd)->symtab_hdr; pos = hdr->sh_offset + hdr->sh_size; - amt = hash_table->strtabcount * bed->s->sizeof_sym; + amt = bed->s->sizeof_sym * flinfo->output_bfd->symcount; if (bfd_seek (flinfo->output_bfd, pos, SEEK_SET) == 0 && bfd_bwrite (symbuf, amt, flinfo->output_bfd) == amt) { |