* archive.c (_bfd_get_elt_at_filepos): Don't release n_nfd.

	* elflink.c (elf_link_add_object_symbols): Delete redundant code.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 582e98f85b97bece469e6fd4abffec425bbdc583..afa1cf269d84218b517a22114d34136a6bdfb396 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/bfd/archive.c b/bfd/archive.c
index 86d07e9f4a1af2efd4b77e37e05445bfe5df0ddb..5de7a3e656024381365486aa50b40e351c7289d8 100644 (file)
--- 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 110bb663aa13cd01ef4de24ea21b13b359173a86..3c95b572151f2b3527e3e3698b0fdef5aba14bbd 100644 (file)
--- 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;