summaryrefslogtreecommitdiffstats
path: root/binutils-2.22/bfd/elf32-arm.c
diff options
context:
space:
mode:
Diffstat (limited to 'binutils-2.22/bfd/elf32-arm.c')
-rw-r--r--binutils-2.22/bfd/elf32-arm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/binutils-2.22/bfd/elf32-arm.c b/binutils-2.22/bfd/elf32-arm.c
index 4f2d00e..20dfb69 100644
--- a/binutils-2.22/bfd/elf32-arm.c
+++ b/binutils-2.22/bfd/elf32-arm.c
@@ -11731,7 +11731,9 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
nothing. */
else if (in_attr[i].i == 0)
{
- BFD_ASSERT (in_attr[Tag_ABI_HardFP_use].i == 0);
+ /* When linking against earlier version of object file, Tag_FP_arch may not
+ even exist, while Tag_ABI_HardFP_use is non-zero. */
+ BFD_ASSERT (!ATTR_TYPE_EXIST(in_attr[i].type) || in_attr[Tag_ABI_HardFP_use].i == 0);
break;
}