summaryrefslogtreecommitdiff
path: root/bfd/elflink.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2011-04-20 07:00:44 +0000
committerAlan Modra <amodra@bigpond.net.au>2011-04-20 07:00:44 +0000
commite0c38aa8a069ac3367bc3531055ad0c508bac518 (patch)
treee7699b02e641223a31640d3f17cf0c8beda358c1 /bfd/elflink.c
parent33240c08520befe8483f59d93a0629f282617798 (diff)
downloadbinutils-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/elflink.c')
-rw-r--r--bfd/elflink.c5
1 files changed, 1 insertions, 4 deletions
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;