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 f6ff2e5997c992ca2f0bcbda342d3e8abf7f6cc3..c28f812e4658763d6e133b19578ab98000e04e07 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-06  Maciej W. Rozycki  <macro@imgtec.com>
+
+       Apply from master.
+       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'.
+
 2015-12-11  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
 
        Apply from master.

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 57e1b6d9cf554c9fd327271f39c150fcd0f09359..1f2f4a3d99b75b42dc6732dc7e6a429949b1303c 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -15013,9 +15013,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