* ld/testsuite/ld-arm/arm-merge-incompatible.d: New test.
authorMatthew Gretton-Dann <matthew.gretton-dann@arm.com>
Tue, 2 Mar 2010 11:40:24 +0000 (11:40 +0000)
committerMatthew Gretton-Dann <matthew.gretton-dann@arm.com>
Tue, 2 Mar 2010 11:40:24 +0000 (11:40 +0000)
commit5488d830ec018f8528fe806eeeaa39ce5ff7ffb1
treef498316cfcb8162ce81f46f9ae8f65958ff80ff0
parent772657e99586665e8465ad0bb3c722a0af7a76ad
* 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.
bfd/ChangeLog
bfd/elf32-arm.c
ld/testsuite/ChangeLog
ld/testsuite/ld-arm/arm-elf.exp
ld/testsuite/ld-arm/attr-merge-incompatible.d [new file with mode: 0644]
ld/testsuite/ld-arm/attr-merge-incompatiblea.s [new file with mode: 0644]
ld/testsuite/ld-arm/attr-merge-incompatibleb.s [new file with mode: 0644]