espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 11:39:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elflink.h (elf_gc_record_vtentry): Revert last change. Correct

Browse Source 
size calculation from addend.  Round size up.
This commit is contained in:
Alan Modra
2003-06-18 05:18:06 +00:00
parent 3dab95d324
commit 64c456e1a1
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2003-06-18 Alan Modra <amodra@bigpond.net.au>
* elflink.h (elf_gc_record_vtentry): Revert last change. Correct
size calculation from addend. Round size up.
2003-06-18 Hans-Peter Nilsson <hp@axis.com> 2003-06-18 Hans-Peter Nilsson <hp@axis.com>
* elf32-cris.c (cris_elf_relocate_section) <case * elf32-cris.c (cris_elf_relocate_section) <case

17
bfd/elflink.h
View File

@ -6301,30 +6301,31 @@ elf_gc_record_vtentry (abfd, sec, h, addend)
struct elf_backend_data *bed = get_elf_backend_data (abfd); struct elf_backend_data *bed = get_elf_backend_data (abfd);
unsigned int log_file_align = bed->s->log_file_align; unsigned int log_file_align = bed->s->log_file_align;
if (addend > h->vtable_entries_size) if (addend >= h->vtable_entries_size)
{ {
size_t size, bytes; size_t size, bytes, file_align;
bfd_boolean *ptr = h->vtable_entries_used; bfd_boolean *ptr = h->vtable_entries_used;
/* While the symbol is undefined, we have to be prepared to handle /* While the symbol is undefined, we have to be prepared to handle
a zero size. */ a zero size. */
file_align = 1 << log_file_align;
if (h->root.type == bfd_link_hash_undefined) if (h->root.type == bfd_link_hash_undefined)
size = addend; size = addend + file_align;
else else
{ {
size = h->size; size = h->size;
if (size < addend) if (addend >= size)
{ {
/* Oops! We've got a reference past the defined end of /* Oops! We've got a reference past the defined end of
the table. This is probably a bug -- shall we warn? */ the table. This is probably a bug -- shall we warn? */
size = addend; size = addend + file_align;
} }
} }
size = (size + file_align - 1) & -file_align;
/* Allocate one extra entry for use as a "done" flag for the /* Allocate one extra entry for use as a "done" flag for the
consolidation pass and another extra entry because we are consolidation pass. */
going to write up to and including 'size' entries. */ bytes = ((size >> log_file_align) + 1) * sizeof (bfd_boolean);
bytes = ((size >> log_file_align) + 2) * sizeof (bfd_boolean);
if (ptr) if (ptr)
{ {