diff options
| author | Jose E. Marchesi <jose.marchesi@oracle.com> | 2014-10-09 13:16:53 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2014-10-09 13:16:53 +0100 |
| commit | 3d68f91c0fb05b426e554004cabd3ded4c91f9c8 (patch) | |
| tree | 0297b29c1d0d20a3d36868c0357e23a0db4f6efd /bfd | |
| parent | fcbdedf866d777b3598cf8703737eb0f987c2aca (diff) | |
| download | gdb-3d68f91c0fb05b426e554004cabd3ded4c91f9c8.zip gdb-3d68f91c0fb05b426e554004cabd3ded4c91f9c8.tar.gz gdb-3d68f91c0fb05b426e554004cabd3ded4c91f9c8.tar.bz2 | |
This is a series of patches that add support for the SPARC M7 cpu to
binutils. They were discussed and approved here:
https://sourceware.org/ml/binutils/2014-10/msg00038.html
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfxx-sparc.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index dd59324..aa2f3ef 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2014-10-09 Jose E. Marchesi <jose.marchesi@oracle.com> + + * elfxx-sparc.c (_bfd_sparc_elf_merge_private_bfd_data): Handle + the hwcaps2 object attribute. + 2014-10-04 Alan Modra <amodra@gmail.com> PR 17447 diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 2a5eb01..d5f92d4 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -4908,10 +4908,17 @@ _bfd_sparc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) in_attr = &in_attrs[Tag_GNU_Sparc_HWCAPS]; out_attr = &out_attrs[Tag_GNU_Sparc_HWCAPS]; + + out_attr->i |= in_attr->i; + out_attr->type = 1; + in_attr = &in_attrs[Tag_GNU_Sparc_HWCAPS2]; + out_attr = &out_attrs[Tag_GNU_Sparc_HWCAPS2]; + 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); |