summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@au.ibm.com>2006-03-14 23:58:07 +0000
committerBen Elliston <bje@au.ibm.com>2006-03-14 23:58:07 +0000
commiteb111b1f4eb78fe9584a09db267c85a4002a87d0 (patch)
tree9223ae7bcc5aafdc35485c808831468bde1ac83a
parente08a6eb3b3362841e09bc28e5cda415ffb881abe (diff)
downloadbinutils-gdb-eb111b1f4eb78fe9584a09db267c85a4002a87d0.tar.gz
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Iterate over all
in_list elements, not just the first.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.c10
2 files changed, 11 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5ede2eaa7fd..cc0093edb1e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-15 Ben Elliston <bje@au.ibm.com>
+
+ * elf32-arm.c (elf32_arm_merge_eabi_attributes): Iterate over all
+ in_list elements, not just the first.
+
2006-03-14 Richard Sandiford <richard@codesourcery.com>
* elf32-mips.c (mips_elf_adjust_addend): New function, mostly split
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 784160a2634..3f560dfec13 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -5146,10 +5146,12 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
for (; in_list; in_list = in_list->next)
{
if ((in_list->tag & 128) < 64)
- _bfd_error_handler
- (_("Warning: %B: Unknown EABI object attribute %d"),
- ibfd, in_list->tag);
- break;
+ {
+ _bfd_error_handler
+ (_("Warning: %B: Unknown EABI object attribute %d"),
+ ibfd, in_list->tag);
+ break;
+ }
}
return TRUE;
}