From: Maciej W. Rozycki Date: Mon, 4 Jan 2016 23:16:45 +0000 (+0000) Subject: MIPS/BFD: Propagate the return status in attribute merging X-Git-Tag: binutils-2_26~31 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a33aeff0aebfb505760b0acb73d617b1c76fa1bc;p=thirdparty%2Fbinutils-gdb.git 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 f6ff2e5997c..c28f812e465 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2016-01-06 Maciej W. Rozycki + + Apply from master. + 2016-01-04 Maciej W. Rozycki + * elfxx-mips.c (mips_elf_merge_obj_attributes): Propagate the + return status from `_bfd_elf_merge_object_attributes'. + 2015-12-11 Andreas Krebbel Apply from master. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 57e1b6d9cf5..1f2f4a3d99b 100644 --- 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