diff options
| author | Matthew Gretton-Dann <matthew.gretton-dann@arm.com> | 2010-03-02 11:40:24 +0000 |
|---|---|---|
| committer | Matthew Gretton-Dann <matthew.gretton-dann@arm.com> | 2010-03-02 11:40:24 +0000 |
| commit | 5488d830ec018f8528fe806eeeaa39ce5ff7ffb1 (patch) | |
| tree | f498316cfcb8162ce81f46f9ae8f65958ff80ff0 /bfd | |
| parent | 772657e99586665e8465ad0bb3c722a0af7a76ad (diff) | |
| download | gdb-5488d830ec018f8528fe806eeeaa39ce5ff7ffb1.zip gdb-5488d830ec018f8528fe806eeeaa39ce5ff7ffb1.tar.gz gdb-5488d830ec018f8528fe806eeeaa39ce5ff7ffb1.tar.bz2 | |
* 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')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1c08054..d1ce00c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2010-03-02 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> + + * elf32-arm.c (elf32_arm_merge_eabi_attributes): Add a check of the + return value from the call to _bfd_elf_merge_object_attributes. + 2010-03-02 Christophe Lyon <christophe.lyon@st.com> Alan Modra <amodra@gmail.com> diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index fd40315..29fb295 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); |