diff options
| author | Maciej W. Rozycki <macro@imgtec.com> | 2016-01-04 23:16:45 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@imgtec.com> | 2016-01-04 23:16:45 +0000 |
| commit | 43d223b5430a93dc0d777276471128800b9887cf (patch) | |
| tree | 562eafc4e6e6f93971fc3f197df83b9798779d1f /bfd | |
| parent | b2e9744f80a002c06504ac1ef41ae1f7e48167c8 (diff) | |
| download | gdb-43d223b5430a93dc0d777276471128800b9887cf.zip gdb-43d223b5430a93dc0d777276471128800b9887cf.tar.gz gdb-43d223b5430a93dc0d777276471128800b9887cf.tar.bz2 | |
MIPS/BFD: Propagate the return status in attribute merging
Fix the issue of any failure from `_bfd_elf_merge_object_attributes' not
being propagated by `mips_elf_merge_obj_attributes'.
bfd/
* elfxx-mips.c (mips_elf_merge_obj_attributes): Propagate the
return status from `_bfd_elf_merge_object_attributes'.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfxx-mips.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cea5647..85b56a3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2016-01-04 Maciej W. Rozycki <macro@imgtec.com> + * elfxx-mips.c (mips_elf_merge_obj_attributes): Propagate the + return status from `_bfd_elf_merge_object_attributes'. + +2016-01-04 Maciej W. Rozycki <macro@imgtec.com> + * elfxx-mips.c (mips_elf_merge_obj_e_flags): New function, factored out from... (_bfd_mips_elf_merge_private_bfd_data): ... here. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index f71be49..a5d47d6 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -15206,9 +15206,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd) } /* Merge Tag_compatibility attributes and any common GNU ones. */ - _bfd_elf_merge_object_attributes (ibfd, obfd); - - return TRUE; + return _bfd_elf_merge_object_attributes (ibfd, obfd); } /* Merge backend specific data from an object file to the output |