diff options
| author | mgretton <mgretton> | 2010-03-02 11:40:22 +0000 |
|---|---|---|
| committer | mgretton <mgretton> | 2010-03-02 11:40:22 +0000 |
| commit | 6affa6cc3786e4dabdf47f11ce12a3a9dfe65812 (patch) | |
| tree | 4d32e08754d489e0d6e3d5ff4fbc86c30b977dfb /bfd/elf32-arm.c | |
| parent | eb158d4725689240197822a48dce21bcc01e0cfd (diff) | |
| download | binutils-redhat-6affa6cc3786e4dabdf47f11ce12a3a9dfe65812.tar.gz | |
* ld/testsuite/ld-arm/arm-merge-incompatible.d: New test.
* ld/testsuite/ld-arm/arm-merge-incompatiblea.s: Likewise.
* ld/testsuite/ld-arm/arm-merge-incompatibleb.s: Likewise.
* ld/testsuite/ld-arm/arm-elf.exp: Run the new test.
* bfd/elf32-arm.c (elf32_arm_merge_eabi_attributes): Add a check of the
return value from the call to _bfd_elf_merge_object_attributes.
Diffstat (limited to 'bfd/elf32-arm.c')
| -rw-r--r-- | bfd/elf32-arm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index fd4031568d..29fb29580f 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -10340,7 +10340,8 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) } /* Merge Tag_compatibility attributes and any common GNU ones. */ - _bfd_elf_merge_object_attributes (ibfd, obfd); + if (!_bfd_elf_merge_object_attributes (ibfd, obfd)) + return FALSE; /* Check for any attributes not known on ARM. */ in_list = elf_other_obj_attributes_proc (ibfd); |