This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_26-branch] MIPS/BFD: Propagate the return status in attribute merging
- From: Maciej W.Rozycki <macro at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 6 Jan 2016 19:13:50 -0000
- Subject: [binutils-gdb/binutils-2_26-branch] MIPS/BFD: Propagate the return status in attribute merging
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a33aeff0aebfb505760b0acb73d617b1c76fa1bc
commit a33aeff0aebfb505760b0acb73d617b1c76fa1bc
Author: Maciej W. Rozycki <macro@imgtec.com>
Date: Mon Jan 4 23:16:45 2016 +0000
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:
---
bfd/ChangeLog | 7 +++++++
bfd/elfxx-mips.c | 4 +---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f6ff2e5..c28f812 100644
--- 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 57e1b6d..1f2f4a3 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