diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2011-04-20 07:00:44 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2011-04-20 07:00:44 +0000 |
| commit | e0c38aa8a069ac3367bc3531055ad0c508bac518 (patch) | |
| tree | e7699b02e641223a31640d3f17cf0c8beda358c1 /bfd | |
| parent | 33240c08520befe8483f59d93a0629f282617798 (diff) | |
| download | binutils-redhat-e0c38aa8a069ac3367bc3531055ad0c508bac518.tar.gz | |
* archive.c (_bfd_get_elt_at_filepos): Don't release n_nfd.
* elflink.c (elf_link_add_object_symbols): Delete redundant code.
Diffstat (limited to 'bfd')
| -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 582e98f85b..afa1cf269d 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 86d07e9f4a..5de7a3e656 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 110bb663aa..3c95b57215 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; |