diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfxx-sparc.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cef68c6..a57684d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2013-03-22 David S. Miller <davem@davemloft.net> + + * elfxx-sparc.c (_bfd_sparc_elf_merge_private_bfd_data): Set type of + hwcaps attribute. + 2013-03-22 Achille Fouilleul <achille.fouilleul+binutils@gadz.org> PR ld/14902 diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 9684ffd..596c838 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); |