From 43d223b5430a93dc0d777276471128800b9887cf Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 4 Jan 2016 23:16:45 +0000 Subject: [PATCH] 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'. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-mips.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cea56477586..85b56a3b624 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-01-04 Maciej W. Rozycki + + * elfxx-mips.c (mips_elf_merge_obj_attributes): Propagate the + return status from `_bfd_elf_merge_object_attributes'. + 2016-01-04 Maciej W. Rozycki * elfxx-mips.c (mips_elf_merge_obj_e_flags): New function, diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index f71be498bab..a5d47d69e1e 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 -- 2.30.2