diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cef68c6f62..a57684db5c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2013-03-22 David S. Miller + + * elfxx-sparc.c (_bfd_sparc_elf_merge_private_bfd_data): Set type of + hwcaps attribute. + 2013-03-22 Achille Fouilleul PR ld/14902 diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 9684ffd7a4..596c8384bb 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -4905,6 +4905,7 @@ _bfd_sparc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) out_attr = &out_attrs[Tag_GNU_Sparc_HWCAPS]; out_attr->i |= in_attr->i; + out_attr->type = 1; /* Merge Tag_compatibility attributes and any common GNU ones. */ _bfd_elf_merge_object_attributes (ibfd, obfd);