diff options
| author | Alan Modra <amodra@gmail.com> | 2011-04-20 07:00:46 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2011-04-20 07:00:46 +0000 |
| commit | 595213d4408b3608441bb78fd5ee49efb5b8b97f (patch) | |
| tree | 084ff76cc95b7c3688e18ec93ddd98c2a9a55ea5 | |
| parent | 02d002477b60cff9f0f5abbd5fc27e2889b13421 (diff) | |
| download | gdb-595213d4408b3608441bb78fd5ee49efb5b8b97f.zip gdb-595213d4408b3608441bb78fd5ee49efb5b8b97f.tar.gz gdb-595213d4408b3608441bb78fd5ee49efb5b8b97f.tar.bz2 | |
* archive.c (_bfd_get_elt_at_filepos): Don't release n_nfd.
* elflink.c (elf_link_add_object_symbols): Delete redundant code.
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/archive.c | 4 | ||||
| -rw-r--r-- | bfd/elflink.c | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 582e98f..afa1cf2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2011-04-20 Alan Modra <amodra@gmail.com> + * archive.c (_bfd_get_elt_at_filepos): Don't release n_nfd. + * elflink.c (elf_link_add_object_symbols): Delete redundant code. + +2011-04-20 Alan Modra <amodra@gmail.com> + PR ld/12365 * elfcode.h (elf_slurp_symbol_table): Put common plugin IR symbols in their own common section. diff --git a/bfd/archive.c b/bfd/archive.c index 86d07e9..5de7a3e 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -661,10 +661,6 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos) if (_bfd_add_bfd_to_archive_cache (archive, filepos, n_nfd)) return n_nfd; - /* Huh? */ - /* FIXME: n_nfd isn't allocated in the archive's memory pool. - If we reach this point, I think bfd_release will abort. */ - bfd_release (archive, n_nfd); bfd_release (archive, new_areldata); return NULL; } diff --git a/bfd/elflink.c b/bfd/elflink.c index 110bb66..3c95b57 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -4237,10 +4237,7 @@ error_free_dyn: We need to get the alignment from the section. */ align = new_sec->alignment_power; } - if (align > old_alignment - /* Permit an alignment power of zero if an alignment of one - is specified and no other alignments have been specified. */ - || (isym->st_value == 1 && old_alignment == 0)) + if (align > old_alignment) h->root.u.c.p->alignment_power = align; else h->root.u.c.p->alignment_power = old_alignment; |