bfd:
authorJoseph Myers <joseph@codesourcery.com>
Tue, 3 Jul 2007 15:21:30 +0000 (15:21 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Tue, 3 Jul 2007 15:21:30 +0000 (15:21 +0000)
commit3cfad14c4a2b29ed8939e8e749b2a1c2f2b15f9e
treeaf6a721dc80507ad8a9cd765e9a0a1cc4b2f0ab3
parentcd123cb70c845b890eed231a84e6e84c92c2ef92
bfd:
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Copy type from
input attributes if value has been copied.

ld/testsuite:
* ld-arm/attr-merge-2a.s, ld-arm/attr-merge-2b.s,
ld-arm/attr-merge-2.attr: New.
* ld-arm/arm-elf.exp (armelftests): Add new test.
bfd/ChangeLog
bfd/elf32-arm.c
ld/testsuite/ChangeLog
ld/testsuite/ld-arm/arm-elf.exp
ld/testsuite/ld-arm/attr-merge-2.attr [new file with mode: 0644]
ld/testsuite/ld-arm/attr-merge-2a.s [new file with mode: 0644]
ld/testsuite/ld-arm/attr-merge-2b.s [new file with mode: 0644]