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'.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cea5647..85b56a3 100644 (file)
--- 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 (file)
--- 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