OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* elflink.c (elf_link_add_object_symbols): Add assertion for 

common override alignment check code.  Formatting.
This commit is contained in:
Alan Modra 2013-03-26 06:08:14 +00:00
parent 9f9e404c04
commit 3a81e8251e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2013-03-26 Alan Modra <amodra@gmail.com>
* elflink.c (elf_link_add_object_symbols): Add assertion for
common override alignment check code. Formatting.
2013-03-25 Alan Modra <amodra@gmail.com>
* elflink.c (_bfd_elf_merge_symbol): Set old_alignment for

6
bfd/elflink.c
View File

@ -4255,6 +4255,9 @@ error_free_dyn:
bfd *normal_bfd;
bfd *common_bfd;
BFD_ASSERT (h->root.type == bfd_link_hash_defined
|| h->root.type == bfd_link_hash_defweak);
symbol_align = ffs (h->root.u.def.value) - 1;
if (h->root.u.def.section->owner != NULL
&& (h->root.u.def.section->owner->flags & DYNAMIC) == 0)
@ -4298,7 +4301,8 @@ error_free_dyn:
}
/* Remember the symbol size if it isn't undefined. */
if ((isym->st_size != 0 && isym->st_shndx != SHN_UNDEF)
if (isym->st_size != 0
&& isym->st_shndx != SHN_UNDEF
&& (definition || h->size == 0))
{
if (h->size != 0